refactor XList: now a list has the same basic function as a STL vector

source/sample/main.cpp

@@ -53,6 +53,9 @@ void TestDataManager() {
 	s[9] = 0;
 	s[9] = 0;
 	str.Add(s);
 	str.Add(s);
 	cout << str.Get(0);
 	cout << str.Get(0);
+
+	vector<int> x;
+
 }
 }
 
 
 int main()
 int main()

source/tensor/core/arithmetic/MatrixMul2DMultiTheading.cpp

@@ -51,10 +51,10 @@ void _MatrixMul2DMultiTheading(XList * args)
     XTensor * c = matrixArgs->GetItem(2);
     XTensor * c = matrixArgs->GetItem(2);
     DTYPE alpha = *(DTYPE*)(matrixArgs->GetItem(3));
     DTYPE alpha = *(DTYPE*)(matrixArgs->GetItem(3));
     DTYPE beta = *(DTYPE*)(matrixArgs->GetItem(4));
     DTYPE beta = *(DTYPE*)(matrixArgs->GetItem(4));
-	int x1 = *(indexArgs->GetItem(0));
-	int y1 = *(indexArgs->GetItem(1));
-	int x2 = *(indexArgs->GetItem(2));
-	int y2 = *(indexArgs->GetItem(3));
+	int x1 = indexArgs->GetItem(0);
+	int y1 = indexArgs->GetItem(1);
+	int x2 = indexArgs->GetItem(2);
+	int y2 = indexArgs->GetItem(3);
 
 
 #ifdef FAST_MATRIX
 #ifdef FAST_MATRIX
     int am = a->dimSize[1];
     int am = a->dimSize[1];

source/tensor/core/shape/Merge.cpp

@@ -217,15 +217,15 @@ void _Merge(const XList * smalls, XTensor * big, int whereToMerge)
     bool uniform = true;
     bool uniform = true;
 
 
     int mergeNum = smalls->count;
     int mergeNum = smalls->count;
-    XTensor* smallsItem0 = (XTensor*)(smalls->GetItem(0));
+    XTensor* smallsItem0 = smalls->GetItem(0);
     int itemSize = smallsItem0->unitNum * smallsItem0->unitSize;
     int itemSize = smallsItem0->unitNum * smallsItem0->unitSize;
 
 
     for (int i = 0; i < smalls->count; i++) {
     for (int i = 0; i < smalls->count; i++) {
-        XTensor* smallsItem = (XTensor*)smalls->GetItem(i);
+        XTensor* smallsItem = smalls->GetItem(i);
         CheckNTErrors((big->unitNum == smallsItem->unitNum * mergeNum), "Unmatched tensors!");
         CheckNTErrors((big->unitNum == smallsItem->unitNum * mergeNum), "Unmatched tensors!");
 
 
         if (i > 0) {
         if (i > 0) {
-            XTensor * preItem = (XTensor*)smalls->GetItem(i - 1);
+            XTensor * preItem = smalls->GetItem(i - 1);
             if (smallsItem->unitNum * smallsItem->unitSize != (char*)smallsItem->data - (char*)preItem->data)
             if (smallsItem->unitNum * smallsItem->unitSize != (char*)smallsItem->data - (char*)preItem->data)
                 uniform = false;
                 uniform = false;
         }
         }
@@ -237,7 +237,7 @@ void _Merge(const XList * smalls, XTensor * big, int whereToMerge)
     int gridNum = 1;
     int gridNum = 1;
     int mergedNum = smalls->count;
     int mergedNum = smalls->count;
 
 
-    XTensor * s0 = (XTensor*)smalls->GetItem(0);
+    XTensor * s0 = smalls->GetItem(0);
     int whereToMergeRDI = s0->order - whereToMerge - 1;
     int whereToMergeRDI = s0->order - whereToMerge - 1;
     for (int i = 0; i < s0->order; i++) {
     for (int i = 0; i < s0->order; i++) {
         if (i <= whereToMergeRDI)
         if (i <= whereToMergeRDI)
@@ -263,7 +263,7 @@ void _Merge(const XList * smalls, XTensor * big, int whereToMerge)
         for (int g = 0; g < gridNum; g++) {
         for (int g = 0; g < gridNum; g++) {
             char * tData = (char*)big->data + g * blockSize * blockNum * big->unitSize;
             char * tData = (char*)big->data + g * blockSize * blockNum * big->unitSize;
             for (int k = 0; k < mergedNum; k++) {
             for (int k = 0; k < mergedNum; k++) {
-                XTensor * s = (XTensor*)smalls->GetItem(k);
+                XTensor * s = smalls->GetItem(k);
                 char * sData = (char*)s->data + g * blockSize * blockNum * s->unitSize;
                 char * sData = (char*)s->data + g * blockSize * blockNum * s->unitSize;
                 XMemCopy2D(tData + k * tStep, tPtich, big->devID,
                 XMemCopy2D(tData + k * tStep, tPtich, big->devID,
                     sData + k * sStep, sPitch, s->devID,
                     sData + k * sStep, sPitch, s->devID,
@@ -295,7 +295,7 @@ void _Merge(const XList * smalls, XTensor * big, int whereToMerge)
         /* copy from source to tmp */
         /* copy from source to tmp */
         if (!uniform) {
         if (!uniform) {
             for (int i = 0; i < mergeNum; i++) {
             for (int i = 0; i < mergeNum; i++) {
-                XTensor* smallsItem = (XTensor*)smalls->GetItem(i);
+                XTensor* smallsItem = smalls->GetItem(i);
                 XMemCopy((char*)(tensorTMP->data) + (itemSize * i), tensorTMP->devID, smallsItem->data, smallsItem->devID, itemSize);
                 XMemCopy((char*)(tensorTMP->data) + (itemSize * i), tensorTMP->devID, smallsItem->data, smallsItem->devID, itemSize);
             }
             }
         }
         }
@@ -324,7 +324,7 @@ make a new tensor to keep the result and return it
 */
 */
 XTensor Merge(const XList &smalls, int whereToMerge)
 XTensor Merge(const XList &smalls, int whereToMerge)
 {
 {
-    XTensor * tensor = (XTensor*)smalls.GetItem(0);
+    XTensor * tensor = smalls.GetItem(0);
     int order = tensor->order;
     int order = tensor->order;
     int * dimSize = new int[order];
     int * dimSize = new int[order];
     for (int i = 0; i < tensor->order; i++) {
     for (int i = 0; i < tensor->order; i++) {

source/tensor/core/utilities/XMatrixSegment.cpp

@@ -81,10 +81,10 @@ void RunParallel2D(XPRunner * parallelRunner, void * job,
         XList * blockArgs = new XList(argNum);
         XList * blockArgs = new XList(argNum);
         int * blockIndex = indexList + i * 4;
         int * blockIndex = indexList + i * 4;
 
 
-		indexArgs->Add(blockIndex);
-		indexArgs->Add(blockIndex + 1);
-		indexArgs->Add(blockIndex + 2);
-		indexArgs->Add(blockIndex + 3);
+		indexArgs->Add(blockIndex[0]);
+		indexArgs->Add(blockIndex[1]);
+		indexArgs->Add(blockIndex[2]);
+		indexArgs->Add(blockIndex[3]);
 
 
         for (int j = 0; j < argNum; j++)
         for (int j = 0; j < argNum; j++)
             blockArgs->Add(jobArgList->GetItem(j));
             blockArgs->Add(jobArgList->GetItem(j));