From 2049139f9fed94b8a874cca5dca8f1a6b901b92b Mon Sep 17 00:00:00 2001
From: luotao1 <luotao02@baidu.com>
Date: Tue, 21 Aug 2018 11:01:22 +0800
Subject: [PATCH] only change rpath in Release mode
---
python/setup.py.in | 50 +++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/python/setup.py.in b/python/setup.py.in
index 4a6cddbbea4..786c9f2e398 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -159,18 +159,20 @@ if '${WITH_MKL}' == 'ON':
shutil.copy('${MKLML_LIB}', libs_path)
shutil.copy('${MKLML_IOMP_LIB}', libs_path)
package_data['paddle.libs']+=['libmklml_intel.so','libiomp5.so']
-if '${WITH_MKLDNN}' == 'ON':
- # TODO(typhoonzero): use install_name_tool to patch mkl libs once
- # we can support mkl on mac.
- #
- # change rpath of libmkldnn.so.0, add $ORIGIN/ to it.
- # The reason is that all thirdparty libraries in the same directory,
- # thus, libmkldnn.so.0 will find libmklml_intel.so and libiomp5.so.
- command = "patchelf --set-rpath '$ORIGIN/' ${MKLDNN_SHARED_LIB}"
- if os.system(command) != 0:
- raise Exception("patch libmkldnn.so failed, command: %s" % command)
- package_data['paddle.libs']+=['libmkldnn.so.0']
- shutil.copy('${MKLDNN_SHARED_LIB}', libs_path)
+if '${CMAKE_BUILD_TYPE}' == 'Release':
+ # only change rpath in Release mode.
+ if '${WITH_MKLDNN}' == 'ON':
+ # TODO(typhoonzero): use install_name_tool to patch mkl libs once
+ # we can support mkl on mac.
+ #
+ # change rpath of libmkldnn.so.0, add $ORIGIN/ to it.
+ # The reason is that all thirdparty libraries in the same directory,
+ # thus, libmkldnn.so.0 will find libmklml_intel.so and libiomp5.so.
+ command = "patchelf --set-rpath '$ORIGIN/' ${MKLDNN_SHARED_LIB}"
+ if os.system(command) != 0:
+ raise Exception("patch libmkldnn.so failed, command: %s" % command)
+ package_data['paddle.libs']+=['libmkldnn.so.0']
+ shutil.copy('${MKLDNN_SHARED_LIB}', libs_path)
# remove unused paddle/libs/__init__.py
os.remove(libs_path+'/__init__.py')
package_dir['paddle.libs']=libs_path
@@ -179,20 +181,22 @@ package_dir['paddle.libs']=libs_path
# The reason is that libwarpctc.so, libiomp5.so etc are in paddle.libs, and
# core.so is in paddle.fluid, thus paddle/fluid/../libs will pointer to above libraries.
# This operation will fix https://github.com/PaddlePaddle/Paddle/issues/3213
-if "@APPLE@" == "1":
- command = "install_name_tool -id \"@loader_path/../libs/\" ${PADDLE_BINARY_DIR}/python/paddle/fluid/core.so"
-else:
- command = "patchelf --set-rpath '$ORIGIN/../libs/' ${PADDLE_BINARY_DIR}/python/paddle/fluid/core.so"
-if os.system(command) != 0:
- raise Exception("patch core.so failed, command: %s" % command)
-if '${WITH_FLUID_ONLY}'== 'OFF':
- # change rpath of _swig_paddle.so.
+if '${CMAKE_BUILD_TYPE}' == 'Release':
+ # only change rpath in Release mode, since in Debug mode, core.so is too large to be changed.
if "@APPLE@" == "1":
- command = "install_name_tool -id \"@loader_path/../paddle/libs/\" ${PADDLE_BINARY_DIR}/python/py_paddle/_swig_paddle.so"
+ command = "install_name_tool -id \"@loader_path/../libs/\" ${PADDLE_BINARY_DIR}/python/paddle/fluid/core.so"
else:
- command = "patchelf --set-rpath '$ORIGIN/../paddle/libs/' ${PADDLE_BINARY_DIR}/python/py_paddle/_swig_paddle.so"
+ command = "patchelf --set-rpath '$ORIGIN/../libs/' ${PADDLE_BINARY_DIR}/python/paddle/fluid/core.so"
if os.system(command) != 0:
- raise Exception("patch _swig_paddle.so failed, command: %s" % command)
+ raise Exception("patch core.so failed, command: %s" % command)
+ if '${WITH_FLUID_ONLY}'== 'OFF':
+ # change rpath of _swig_paddle.so.
+ if "@APPLE@" == "1":
+ command = "install_name_tool -id \"@loader_path/../paddle/libs/\" ${PADDLE_BINARY_DIR}/python/py_paddle/_swig_paddle.so"
+ else:
+ command = "patchelf --set-rpath '$ORIGIN/../paddle/libs/' ${PADDLE_BINARY_DIR}/python/py_paddle/_swig_paddle.so"
+ if os.system(command) != 0:
+ raise Exception("patch _swig_paddle.so failed, command: %s" % command)
setup(name='${PACKAGE_NAME}',
version='${PADDLE_VERSION}',
--
GitLab