full code of SumDim

source/network/Main.cpp

@@ -181,11 +181,9 @@ void SumDimTest()
     int b = 7;
     int b = 7;
     int c = 3;
     int c = 3;
 
 
-    XDevice::SetGPUDevice(0);
-
-    InitTensor3D(&x, a, b, c, X_FLOAT, 0);
-    InitTensor1D(&y, c, X_FLOAT, 0);
-    InitTensor3D(&z, a, b, c, X_FLOAT, 0);
+    InitTensor3D(&x, a, b, c, X_FLOAT, -1);
+    InitTensor1D(&y, c, X_FLOAT, -1);
+    InitTensor3D(&z, a, b, c, X_FLOAT, -1);
 
 
     x.SetZeroAll();
     x.SetZeroAll();
     y.SetZeroAll();
     y.SetZeroAll();

source/tensor/XName.h

@@ -37,8 +37,9 @@ namespace nts { // namespace nts(NiuTrans.Tensor)
 #define MATH_NEGATE             MATH_MULTIPLY + 1
 #define MATH_NEGATE             MATH_MULTIPLY + 1
 #define MATH_SIGN               MATH_NEGATE + 1
 #define MATH_SIGN               MATH_NEGATE + 1
 #define MATH_SUM                MATH_SIGN + 1
 #define MATH_SUM                MATH_SIGN + 1
+#define MATH_SUMDIM             MATH_SUM + 1
 
 
-#define MATH_LOG                MATH_SUM + 1
+#define MATH_LOG                MATH_SUMDIM + 1
 #define MATH_NORMALIZE          MATH_LOG + 1
 #define MATH_NORMALIZE          MATH_LOG + 1
 #define MATH_POWER              MATH_NORMALIZE + 1
 #define MATH_POWER              MATH_NORMALIZE + 1
 #define MATH_SCALEANDSHIFT      MATH_POWER + 1
 #define MATH_SCALEANDSHIFT      MATH_POWER + 1

source/tensor/core/arithmetic/SumDim.cpp

@@ -22,6 +22,7 @@
 #include "Sum.h"
 #include "Sum.h"
 #include "SumDim.h"
 #include "SumDim.h"
 #include "SumDim.cuh"
 #include "SumDim.cuh"
+#include "../../XName.h"
 #include "../movement/CopyValues.h"
 #include "../movement/CopyValues.h"
 
 
 namespace nts { // namespace nts(NiuTrans.Tensor)
 namespace nts { // namespace nts(NiuTrans.Tensor)
@@ -60,7 +61,11 @@ void _SumDim(const XTensor * a, const XTensor * b, XTensor * c, int n, DTYPE bet
     }
     }
 
 
     if(a->devID >= 0 || b->devID >= 0 || c->devID >= 0){
     if(a->devID >= 0 || b->devID >= 0 || c->devID >= 0){
+#ifdef USE_CUDA
         _CudaSumDim(a, b, c, n, beta);
         _CudaSumDim(a, b, c, n, beta);
+#else
+        ShowNTErrors("Please specify USE_CUDA and recompile the code!");
+#endif
     }
     }
     else{
     else{
         int stride = 1;
         int stride = 1;
@@ -110,4 +115,50 @@ void _SumDim(const XTensor * a, const XTensor * b, XTensor * c, int n, DTYPE bet
     }
     }
 }
 }
     
     
+/*
+tensor summation (on site)
+
+a = a + b * \beta
+where the size of b is equal to the n-th dimension of a,
+i.e., a is summed with b by broadcasting
+
+>> a - a tensor
+>> b - another tensor whose size is equal to that of dimension n of a
+>> n - the dimension index
+>> beta - the scaling factor
+*/
+void _SumDim(XTensor * a, const XTensor * b, int n, DTYPE beta)
+{
+    _SumDim(a, b, a, n, beta);
+}
+    
+/*
+tensor summation (return a structure and make tensor connections)
+
+c = a + b * \beta
+where the size of b is equal to the n-th dimension of a,
+i.e., a is summed with b by broadcasting
+
+>> a - a tensor
+>> b - another tensor whose size is equal to that of dimension n of a
+>> c - where we put a+b*\beta. we save it in a if c is NULL
+>> n - the dimension index
+>> beta - the scaling factor
+*/
+XTensor SumDim(const XTensor &a, const XTensor &b, int n, DTYPE beta)
+{
+    XTensor c(&a);
+    c.SetTMP();
+    
+    /* call _Sum function */
+    _Sum(&a, &b, &c, beta);
+    
+    /* tensor connections */
+    XLink::MakeLink(&a, &b, &c, MATH_SUMDIM);
+    XLink::AddParamToHeadInt(&c, n);
+    XLink::AddParamToHead(&c, beta);
+    
+    return c;
+}
+    
 }
 }

source/tensor/core/arithmetic/SumDim.cu

@@ -24,6 +24,8 @@
 
 
 namespace nts { // namespace nts(NiuTrans.Tensor)
 namespace nts { // namespace nts(NiuTrans.Tensor)
 
 
+#ifdef USE_CUDA
+
 /* 
 /* 
 tensor summation of a tensor and a row vector
 tensor summation of a tensor and a row vector
 c = a + b * \beta 
 c = a + b * \beta 
@@ -168,5 +170,7 @@ void _CudaSumDim(const XTensor * a, const XTensor * b, XTensor * c, int n, DTYPE
     }
     }
 }
 }
 
 
+#endif
+
 } // namespace nts(NiuTrans.Tensor)
 } // namespace nts(NiuTrans.Tensor)
 
 

source/tensor/core/arithmetic/SumDim.cuh

@@ -26,10 +26,14 @@
 
 
 namespace nts { // namespace nts(NiuTrans.Tensor)
 namespace nts { // namespace nts(NiuTrans.Tensor)
 
 
+#ifdef USE_CUDA
+
 /* tensor summation c = a + b * \beta where the size of b is equal to the n-th dimension of a, 
 /* tensor summation c = a + b * \beta where the size of b is equal to the n-th dimension of a, 
    i.e., a is summed with b by broadcasting (cuda version) */
    i.e., a is summed with b by broadcasting (cuda version) */
 void _CudaSumDim(const XTensor * a, const XTensor * b, XTensor * c, int n, DTYPE beta = (DTYPE)1.0);
 void _CudaSumDim(const XTensor * a, const XTensor * b, XTensor * c, int n, DTYPE beta = (DTYPE)1.0);
 
 
+#endif
+
 } // namespace nts(NiuTrans.Tensor)
 } // namespace nts(NiuTrans.Tensor)
 
 
 #endif // __SUMDIM_CUH__
 #endif // __SUMDIM_CUH__