Merge branch 'master' into feature/fix_with_doc_build_option

Dockerfile

@@ -13,7 +13,7 @@ ARG WITH_DOC
 ARG WITH_STYLE_CHECK
 
 ENV WOBOQ OFF
-ENV WITH_GPU=${WITH_AVX:-OFF}
+ENV WITH_GPU=${WITH_GPU:-OFF}
 ENV WITH_AVX=${WITH_AVX:-ON}
 ENV WITH_DOC=${WITH_DOC:-OFF}
 ENV WITH_STYLE_CHECK=${WITH_STYLE_CHECK:-OFF}

cmake/system.cmake

@@ -28,6 +28,11 @@ ELSE(WIN32)
         STRING(REGEX MATCH "[0-9]+.[0-9]+" VERSION "${MACOSX_VERSION}")
         SET(MACOS_VERSION ${VERSION})
         SET(HOST_SYSTEM "macosx")
+        IF(NOT DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
+            # Set cache variable - end user may change this during ccmake or cmake-gui configure.
+            SET(CMAKE_OSX_DEPLOYMENT_TARGET ${MACOS_VERSION} CACHE STRING
+                "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
+        ENDIF()
     ELSE(APPLE)
 
         IF(EXISTS "/etc/issue")

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,7 +52,7 @@ 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) {
@@ -59,13 +60,14 @@ void testMatrixProjectionBackward(int 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}));

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
   }
 }