Merge pull request #1824 from hedaoyuan/fix_1769

Fix ContextProjectionOpTest
PaddlePaddle · Apr 20, 2017 · 6b058ea · 6b058ea
2 parents 6d6804f + c4ceefa
commit 6b058ea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/paddle/function/ContextProjectionOpTest.cpp b/paddle/function/ContextProjectionOpTest.cpp
@@ -28,11 +28,12 @@ void testMatrixProjectionForward(int context_start,
                std::max(0, (int)(context_start + context_length - 1));
   if (pad == 0) is_padding = false;
 
-  FunctionCompare test("ContextProjectionForward",
-                       FuncConfig()
-                           .set("context_length", context_length)
-                           .set("context_start", context_start)
-                           .set("begin_pad", std::max(0, -context_start)));
+  FunctionCompare test(
+      "ContextProjectionForward",
+      FuncConfig()
+          .set("context_length", context_length)
+          .set("context_start", context_start)
+          .set("begin_pad", (size_t)std::max(0, -context_start)));
 
   // prepare input arguments
   test.addSequence(SequenceIdArg(TensorShape{batch_size}));
@@ -51,21 +52,22 @@ void testMatrixProjectionForward(int context_start,
 }
 
 void testMatrixProjectionBackward(int context_start,
-                                  int context_length,
+                                  size_t context_length,
                                   bool is_padding,
                                   size_t batch_size,
                                   size_t input_dim) {
   size_t pad = std::max(0, -context_start) +
                std::max(0, (int)(context_start + context_length - 1));
   if (pad == 0) is_padding = false;
 
-  FunctionCompare test("ContextProjectionBackward",
-                       FuncConfig()
-                           .set("context_length", context_length)
-                           .set("context_start", context_start)
-                           .set("begin_pad", std::max(0, -context_start))
-                           .set("is_padding", is_padding)
-                           .set("total_pad", pad));
+  FunctionCompare test(
+      "ContextProjectionBackward",
+      FuncConfig()
+          .set("context_length", context_length)
+          .set("context_start", context_start)
+          .set("begin_pad", (size_t)std::max(0, -context_start))
+          .set("is_padding", is_padding)
+          .set("total_pad", pad));
 
   // prepare input arguments
   test.addSequence(SequenceIdArg(TensorShape{batch_size}));

diff --git a/paddle/math/tests/test_matrixCompare.cpp b/paddle/math/tests/test_matrixCompare.cpp
@@ -235,8 +235,10 @@ TEST(Matrix, unary) {
       testMatrixTranspose(height, width);
       testMatrixRotate(height, width);
     }
-    // inverse
+// inverse
+#ifdef PADDLE_USE_LAPACK
     testMatrixInverse(height);
+#endif
   }
 }