Merge with the branch of xiaotong.

source/tensor/XDevice.cpp

@@ -168,7 +168,6 @@ void XDevice::Clear()
 
     GPUMaxThreadNum = 0;
 
-    MUTEX_DELE(cublasMutex);
     if (isHandleReady) {
         cublasDestroy(cublasHandle);
         isHandleReady = false;

source/tensor/test/TSub.cpp

@@ -188,7 +188,7 @@ bool TestSub2()
     /* call Sub function */
     _Sub(aGPU, bGPU, cGPU, beta);
     _SubMe(cMeGPU, bGPU, beta);
-    cUserGPU = Sub(*aGPU, *bGPU, beta);
+    cUserGPU = Sub(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(cGPU, answer, unitNum, 1e-4F) &&
@@ -287,7 +287,7 @@ bool TestSub3()
     bGPU->SetData(bData, bUnitNum);
 
     /* call Sum function */
-    cUserGPU = Sub(*aGPU, *bGPU, beta);
+    cUserGPU = Sub(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(&cUserGPU, answer, cUnitNum, 1e-4F);
@@ -389,7 +389,7 @@ bool TestSub4()
     bGPU->SetData(bData, bUnitNum);
 
     /* call Sum function */
-    cUserGPU = Sub(*aGPU, *bGPU, beta);
+    cUserGPU = Sub(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(&cUserGPU, answer, cUnitNum, 1e-4F);
@@ -491,7 +491,7 @@ bool TestSub5()
     bGPU->SetData(bData, bUnitNum);
 
     /* call Sum function */
-    cUserGPU = Sub(*aGPU, *bGPU, beta);
+    cUserGPU = Sub(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(&cUserGPU, answer, cUnitNum, 1e-4F);

source/tensor/test/TSum.cpp

@@ -188,7 +188,7 @@ bool TestSum2()
     /* call Sum function */
     _Sum(aGPU, bGPU, cGPU, beta);
     _SumMe(cMeGPU, bGPU, beta);
-    cUserGPU = Sum(*aGPU, *bGPU, beta);
+    cUserGPU = Sum(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(cGPU, answer, unitNum, 1e-4F) &&
@@ -287,7 +287,7 @@ bool TestSum3()
     bGPU->SetData(bData, bUnitNum);
 
     /* call Sum function */
-    cUserGPU = Sum(*aGPU, *bGPU, beta);
+    cUserGPU = Sum(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(&cUserGPU, answer, cUnitNum, 1e-4F);
@@ -389,7 +389,7 @@ bool TestSum4()
     bGPU->SetData(bData, bUnitNum);
 
     /* call Sum function */
-    cUserGPU = Sum(*aGPU, *bGPU, beta);
+    cUserGPU = Sum(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(&cUserGPU, answer, cUnitNum, 1e-4F);
@@ -491,7 +491,7 @@ bool TestSum5()
     bGPU->SetData(bData, bUnitNum);
 
     /* call Sum function */
-    cUserGPU = Sum(*aGPU, *bGPU, beta);
+    cUserGPU = Sum(*aGPU, *bGPU, false, beta);
 
     /* check results */
     gpuTest = _CheckData(&cUserGPU, answer, cUnitNum, 1e-4F);