CPU code bug fixes

source/XMem.h

@@ -24,6 +24,8 @@
 #ifndef __XMEM_H__
 #ifndef __XMEM_H__
 #define __XMEM_H__
 #define __XMEM_H__
 
 
+#include <stdlib.h>
+
 #ifdef CUDA_BLAS
 #ifdef CUDA_BLAS
 #define USE_CUDA
 #define USE_CUDA
 #endif
 #endif

source/core/shape/Permute.h

@@ -29,19 +29,15 @@ namespace nts { // namespace nts(NiuTrans.Tensor)
 #define permute _Permute_
 #define permute _Permute_
 
 
 /* generate the tensor with permuted dimensions: b = permuted(a) */
 /* generate the tensor with permuted dimensions: b = permuted(a) */
-extern "C"
 void Permute(XTensor * a, XTensor * b, int * dimPermute);
 void Permute(XTensor * a, XTensor * b, int * dimPermute);
     
     
 /* permute the tensor dimensions on site: a = permuted(a) */
 /* permute the tensor dimensions on site: a = permuted(a) */
-extern "C"
 void Permute_(XTensor * a, int * dimPermute);
 void Permute_(XTensor * a, int * dimPermute);
 
 
 /* make a tensor with permuted dimensions: b = permuted(a) and return its pointer */
 /* make a tensor with permuted dimensions: b = permuted(a) and return its pointer */
-extern "C"
 XTensor * _Permute(XTensor *a, int * dimPermute);
 XTensor * _Permute(XTensor *a, int * dimPermute);
 
 
 /* make a tensor with permuted dimensions: b = permuted(a) and return its body */
 /* make a tensor with permuted dimensions: b = permuted(a) and return its body */
-extern "C"
 XTensor&  _Permute_(XTensor &a, int * dimPermute);
 XTensor&  _Permute_(XTensor &a, int * dimPermute);
 
 
     
     

source/test/TLogSoftmax.cpp

@@ -92,7 +92,6 @@ bool TestLogSoftmax1()
     /* destroy variables */
     /* destroy variables */
     delete x;
     delete x;
     delete y;
     delete y;
-    delete z;
     delete[] sDimSize;
     delete[] sDimSize;
 
 
     return cpuTest;
     return cpuTest;

source/test/TMerge.cpp

@@ -331,8 +331,7 @@ bool TestMerge3()
     delete s1;
     delete s1;
     delete s2;
     delete s2;
     delete t;
     delete t;
-    delete[] sDimSize1;
-    delete[] sDimSize2;
+    delete[] sDimSize;
     delete[] tDimSize;
     delete[] tDimSize;
     delete smallList;
     delete smallList;
 
 
@@ -444,8 +443,7 @@ bool TestMerge4()
     delete s1;
     delete s1;
     delete s2;
     delete s2;
     delete t;
     delete t;
-    delete[] sDimSize1;
-    delete[] sDimSize2;
+    delete[] sDimSize;
     delete[] tDimSize;
     delete[] tDimSize;
     delete smallList;
     delete smallList;