comments and inferface improvement

source/tensor/core/movement/CopyIndexed.cpp

@@ -33,8 +33,8 @@ copy indexed sub-tensors
 >> s - the source tensor
 >> t - the target tensor
 >> dim - the leading dimension to define "sub-tensors"
-         e.g., for a tensor of size (3, 2, 4) and dim = 2, 
-         we have 4 sub-tensors of size (3, 2)
+         e.g., for a tensor of size (4, 2, 3) and dim = 0, 
+         we have 4 sub-tensors of size (2, 3)
 >> srcIndex - index of the source sub-tensors
 >> indexSize - length of srcIndex (and tgtIndex)
 >> tgtIndex - index of the target sub-tensors
@@ -46,11 +46,11 @@ void _CopyIndexed(const XTensor * s, XTensor * t, int dim,
                   int * srcIndex, int indexSize, int * tgtIndex, 
                   int copyNum)
 {
-    CheckNTErrors((s && t), "Invalid tensors!");
-    CheckNTErrors((s->devID == t->devID || (s->devID < 0 && t->devID < 0)),
+    CheckNTErrors(s && t, "Invalid tensors!");
+    CheckNTErrors(s->devID == t->devID || (s->devID < 0 && t->devID < 0),
                   "the data must be kept on the same device!");
-    CheckNTErrors((dim < s->order && dim < t->order), "A too larget dimension specified!");
-    CheckNTErrors((s->unitSize == t->unitSize), "Unmatched tensors!");
+    CheckNTErrors(dim < s->order && dim < t->order, "A too larget dimension specified!");
+    CheckNTErrors(s->unitSize == t->unitSize, "Unmatched tensors!");
 
     int dimRDI = s->order - dim - 1;
     int blockSizeSrc = 1;
@@ -108,8 +108,8 @@ copy selected sub-tensors where indeces are kept in tensors
 >> s - the source tensor
 >> t - the target tensor
 >> dim - the leading dimension to define "sub-tensors"
-         e.g., for a tensor of size (3, 2, 4) and dim = 2, 
-         we have 4 sub-tensors of size (3, 2)
+         e.g., for a tensor of size (4, 2, 3) and dim = 0, 
+         we have 4 sub-tensors of size (2, 3)
 >> srcIndex - the tensor to save the index of the source sub-tensors
 >> tgtIndex - the tensor to save the index of the target sub-tensors
 >> copyNum - number of the sub-tensors we copy for each source index, 
@@ -124,17 +124,17 @@ void _CopyIndexed(const XTensor * s, XTensor * t, int dim,
     int indexSize = srcIndex->unitNum;
 
     CheckNTErrors(indexSize != 0, "NULL index!")
-    CheckNTErrors((s && t), "Invalid tensors!");
-    CheckNTErrors((srcIndex && tgtIndex), "Invalid index tensors!");
-    CheckNTErrors((s->devID == t->devID || (s->devID < 0 && t->devID < 0)),
+    CheckNTErrors(s && t, "Invalid tensors!");
+    CheckNTErrors(srcIndex && tgtIndex, "Invalid index tensors!");
+    CheckNTErrors(s->devID == t->devID || (s->devID < 0 && t->devID < 0),
                   "the data must be kept on the same device!");
-    CheckNTErrors((srcIndex->devID == srcIndex->devID || (s->devID < 0 && t->devID < 0)),
+    CheckNTErrors(srcIndex->devID == srcIndex->devID || (s->devID < 0 && t->devID < 0),
                   "the index must be kept on the same device!");
-    CheckNTErrors((s->devID == srcIndex->devID || (s->devID < 0 && t->devID < 0)),
+    CheckNTErrors(s->devID == srcIndex->devID || (s->devID < 0 && t->devID < 0),
                   "the data and index must be kept on the same device!");
-    CheckNTErrors((dim >= 0 && dim < order), "A too larget dimension specified!");
-    CheckNTErrors((s->unitSize == t->unitSize), "Unmatched tensors!");
-    CheckNTErrors((srcIndex->unitNum == tgtIndex->unitNum), "Unmatched index tensors!");
+    CheckNTErrors(dim >= 0 && dim < order, "A too larget dimension specified!");
+    CheckNTErrors(s->unitSize == t->unitSize, "Unmatched tensors!");
+    CheckNTErrors(srcIndex->unitNum == tgtIndex->unitNum, "Unmatched index tensors!");
 
     for (int i = 0; i < order; i++) {
         if (i != dim) {
@@ -193,8 +193,8 @@ make a new tensor to keep the result and return it
 
 >> s - the source tensor
 >> dim - the leading dimension to define "sub-tensors"
-         e.g., for a tensor of size (3, 2, 4) and dim = 2, 
-         we have 4 sub-tensors of size (3,2)
+         e.g., for a tensor of size (4, 2, 3) and dim = 0, 
+         we have 4 sub-tensors of size (2, 3)
 >> srcIndex - index of the source sub-tensors
 >> indexSize - length of srcIndex (and tgtIndex)
 >> tgtIndex - index of the target sub-tensors
@@ -249,8 +249,8 @@ make a new tensor to keep the result and return it
 
 >> s - the source tensor
 >> dim - the leading dimension to define "sub-tensors"
-         e.g., for a tensor of size (3, 2, 4) and dim = 2, 
-         we have 4 sub-tensors of size (3,2)
+         e.g., for a tensor of size (4, 2, 3) and dim = 0, 
+         we have 4 sub-tensors of size (2, 3)
 >> srcIndex - index of the source sub-tensors
 >> indexSize - length of srcIndex (and tgtIndex)
 >> tgtIndex - index of the target sub-tensors

source/tensor/core/movement/CopyIndexed.h

@@ -40,7 +40,8 @@ void _CopyIndexed(const XTensor * s, XTensor * t, int dim,
 copy selected sub-tensors (return a XTensor structure)
 make a new tensor to keep the result and return it (remove this???)
 */
-XTensor CopyIndexed(const XTensor &s, int dim, int * srcIndex, int indexSize, int * tgtIndex, int copyNum);
+//XTensor CopyIndexed(const XTensor &s, int dim, int * srcIndex, int indexSize, int * tgtIndex, int copyNum);
+
 /*
 copy selected sub-tensors where indeces are kept in tensors (return an XTensor structure)
 make a new tensor to keep the result and return it