合并分支 'xiaotong-working' 到 'master'

Xiaotong working

查看合并请求 NiuTrans/NiuTrans.Tensor!6

source/XName.h

@@ -44,8 +44,6 @@ namespace nts { // namespace nts(NiuTrans.Tensor)
 #define MATH_TOPK "M_TOPK"
 #define MATH_UNSQUEEZE "M_UNSQUEEZE"
 
-
-
 } // namespace nts(NiuTrans.Tensor)
 
 #endif // __XNAME_H__
\ No newline at end of file

source/core/CHeader.h

@@ -45,6 +45,7 @@
 #include "Multiply.h"
 #include "Negate.h"
 #include "Normalize.h"
+#include "Permute.h"
 #include "Power.h"
 #include "ReduceMax.h"
 #include "ReduceMean.h"

NiuTrans.Tensor/core/Permute.h → source/core/Permute.h

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

NiuTrans.Tensor/core/Transpose.h → source/core/Transpose.h

@@ -27,12 +27,20 @@
 
 namespace nts { // namespace nts(NiuTrans.Tensor)
 
-/* transpose a 1D/2D tensor on site: a = transposed(a) */
-void Transpose_(XTensor * a);
+#define transpose _Transpose_
 
 /* generate a transposed 1D/2D tensor: b = transposed(a) */
 void Transpose(XTensor * a, XTensor * b);
-    
+
+/* transpose a 1D/2D tensor on site: a = transposed(a) */
+void Transpose_(XTensor * a);
+
+/* make a transposed 1D/2D tensor: b = transposed(a) and return its pointer */
+XTensor * _Transpose(XTensor * a);
+
+/* make a transposed 1D/2D tensor: b = transposed(a) and return its body */
+XTensor & _Transpose_(XTensor & a);
+
 } // namespace nts(NiuTrans.Tensor)
 
 #endif // __TRANSPOSE_H__