Merge remote-tracking branch 'refs/remotes/origin/bert' into bert

cf676c82 · xulongteng · 7a0c5fef · 14bba568 · cf676c82 · cf676c82
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

CMakeLists.txt CMakeLists.txt +1 -0

demo-serving/CMakeLists.txt demo-serving/CMakeLists.txt +1 -1

未找到文件。
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(PADDLE_SERVING_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(PADDLE_SERVING_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 SET(PADDLE_SERVING_INSTALL_DIR ${CMAKE_BINARY_DIR}/output)
+SET(CMAKE_INSTALL_RPATH "\$ORIGIN" "${CMAKE_INSTALL_RPATH}")

 include(system)


--- a/demo-serving/CMakeLists.txt
+++ b/demo-serving/CMakeLists.txt
@@ -90,7 +90,7 @@ if (${WITH_MKL})
    install(FILES
            ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mklml/lib/libmklml_intel.so
                ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mklml/lib/libiomp5.so
-                ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mkldnn/lib/libmkldnn.so
+                ${CMAKE_BINARY_DIR}/third_party/install/Paddle/third_party/install/mkldnn/lib/libmkldnn.so.0
                DESTINATION
                ${PADDLE_SERVING_INSTALL_DIR}/demo/serving/bin)
 endif()