Skip to content

Commit

Permalink
Merge pull request #12000 from luotao1/mklml_rpath
Browse files Browse the repository at this point in the history
check return value of patchelf in setup.py.in
  • Loading branch information
luotao1 authored Jul 6, 2018
2 parents d3a4848 + bc16b22 commit 89704d9
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions python/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ if '${WITH_MKLDNN}' == 'ON':
# 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}"
os.system(command)
if os.system(command) != 0:
raise Exception("patchelf --set-rpath for libmkldnn.so.0 fails")
package_data['paddle.libs']+=['libmkldnn.so.0']
shutil.copy('${MKLDNN_SHARED_LIB}', libs_path)
# remove unused paddle/libs/__init__.py
Expand All @@ -142,7 +143,8 @@ package_dir['paddle.libs']=libs_path
# 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
command = "patchelf --set-rpath '$ORIGIN/../libs/' ${PADDLE_BINARY_DIR}/python/paddle/fluid/core.so"
os.system(command)
if os.system(command) != 0:
raise Exception("patchelf --set-rpath for core.so fails")

setup(name='${PACKAGE_NAME}',
version='${PADDLE_VERSION}',
Expand Down

0 comments on commit 89704d9

Please sign in to comment.