fix dynamic_loader and some demo CMakeLists.txt

test=develop
PaddlePaddle · Mar 30, 2020 · 3e516ee · 3e516ee
1 parent 0ebefb7
commit 3e516ee
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt
@@ -94,11 +94,9 @@ if(WITH_MKL)
   set(MATH_LIB_PATH "${PADDLE_LIB_THIRD_PARTY_PATH}mklml")
   include_directories("${MATH_LIB_PATH}/include")
   if(WIN32)
-    set(MATH_LIB ${MATH_LIB_PATH}/lib/mklml${CMAKE_STATIC_LIBRARY_SUFFIX}
-                 ${MATH_LIB_PATH}/lib/libiomp5md${CMAKE_STATIC_LIBRARY_SUFFIX})
+    set(MATH_LIB ${MATH_LIB_PATH}/lib/mklml${CMAKE_STATIC_LIBRARY_SUFFIX})
   else()
-    set(MATH_LIB ${MATH_LIB_PATH}/lib/libmklml_intel${CMAKE_SHARED_LIBRARY_SUFFIX}
-                 ${MATH_LIB_PATH}/lib/libiomp5${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(MATH_LIB ${MATH_LIB_PATH}/lib/libmklml_gnu${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
   set(MKLDNN_PATH "${PADDLE_LIB_THIRD_PARTY_PATH}mkldnn")
   if(EXISTS ${MKLDNN_PATH})

diff --git a/paddle/fluid/platform/dynload/dynamic_loader.cc b/paddle/fluid/platform/dynload/dynamic_loader.cc
@@ -44,7 +44,7 @@ DEFINE_string(
     tensorrt_dir, "",
     "Specify path for loading tensorrt library, such as libnvinfer.so.");
 
-DEFINE_string(mklml_dir, "", "Specify path for loading libmklml_intel.so.");
+DEFINE_string(mklml_dir, "", "Specify path for loading libmklml_gnu.so.");
 
 DEFINE_string(op_dir, "", "Specify path for loading user-defined op library.");
 
@@ -274,11 +274,11 @@ void* GetTensorRtDsoHandle() {
 
 void* GetMKLMLDsoHandle() {
 #if defined(__APPLE__) || defined(__OSX__)
-  return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "libmklml_intel.dylib");
+  return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "libmklml_gnu.dylib");
 #elif defined(_WIN32)
   return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "mklml.dll");
 #else
-  return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "libmklml_intel.so");
+  return GetDsoHandleFromSearchPath(FLAGS_mklml_dir, "libmklml_gnu.so");
 #endif
 }
 

diff --git a/paddle/fluid/train/demo/CMakeLists.txt b/paddle/fluid/train/demo/CMakeLists.txt
@@ -46,7 +46,7 @@ if(WITH_MKL)
   if(WIN32)
     set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/mklml.lib)
   else(WIN32)
-    set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/libmklml_intel.so)
+    set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/libmklml_gnu.so)
   endif(WIN32)
 else()
   if(APPLE)

diff --git a/paddle/fluid/train/imdb_demo/CMakeLists.txt b/paddle/fluid/train/imdb_demo/CMakeLists.txt
@@ -45,7 +45,7 @@ if(WITH_MKL)
   if(WIN32)
     set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/mklml.lib)
   else(WIN32)
-    set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/libmklml_intel.so)
+    set(MATH_LIB ${PADDLE_LIB}/third_party/install/mklml/lib/libmklml_gnu.so)
   endif(WIN32)
 else()
   if(APPLE)

diff --git a/python/setup.py.in b/python/setup.py.in
@@ -182,7 +182,7 @@ if '${TENSORRT_FOUND}' == 'ON' and os.name == 'nt':
 
 if '${WITH_MKL}' == 'ON':
     shutil.copy('${MKLML_SHARED_LIB}', libs_path)
-    package_data['paddle.libs']+=[('libmklml_intel' if os.name != 'nt' else 'mklml') + ext_name, ('libiomp5' if os.name != 'nt' else 'libiomp5md') + ext_name]
+    package_data['paddle.libs']+=[('libmklml_gnu' if os.name != 'nt' else 'mklml') + ext_name, ('libiomp5' if os.name != 'nt' else 'libiomp5md') + ext_name]
     # mklml has dependency to vs runtime library
     if os.name == 'nt':
         shutil.copy('${MKLML_SHARED_LIB_DEPS}', libs_path)
@@ -207,7 +207,7 @@ if '${WITH_MKLDNN}' == 'ON':
         #
         # change rpath of libdnnl.so.1, add $ORIGIN/ to it.
         # The reason is that all thirdparty libraries in the same directory,
-        # thus, libdnnl.so.1 will find libmklml_intel.so and libiomp5.so.
+        # thus, libdnnl.so.1 will find libmklml_gnu.so.
         command = "patchelf --set-rpath '$ORIGIN/' ${MKLDNN_SHARED_LIB}"
         if os.system(command) != 0:
             raise Exception("patch libdnnl.so failed, command: %s" % command)