Skip to content

Commit 7975461

Browse files
authored
use default rpath setting to align with ipex (#103)
1 parent 4c8f2a2 commit 7975461

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat")
66
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=cpp")
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat-security")
88
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")
9-
# Since 2016 Debian start using RUNPATH instead of normally RPATH, which gave the annoy effect that
10-
# allow LD_LIBRARY_PATH to override dynamic linking path. Depends on intention of linking priority,
11-
# change below for best outcome: disable, using RPATH, enable, using RUNPATH
12-
if (ENABLE_LINKER_RUNPATH)
13-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--enable-new-dtags")
14-
else()
15-
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--disable-new-dtags")
16-
endif()
179

1810
set(LINUX TRUE)
1911
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

setup.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,11 @@ def build_cmake(self, extension: CMakeExtension):
102102

103103
if _check_env_flag('DEBUG'):
104104
build_type = 'Debug'
105-
run_path = 'OFF'
106-
if _check_env_flag('RUNPATH'):
107-
run_path = 'ON'
108105

109106
build_options = {
110107
'CMAKE_BUILD_TYPE': build_type,
111108
# The value cannot be easily obtained in CMakeLists.txt.
112109
'CMAKE_PREFIX_PATH': torch.utils.cmake_prefix_path,
113-
# Enable the RPATH of the oneCCL and torchCCL
114-
'ENABLE_LINKER_RUNPATH': run_path,
115110
# skip the example and test code in oneCCL
116111
'BUILD_EXAMPLES': 'OFF',
117112
'BUILD_CONFIG': 'OFF',

0 commit comments

Comments
 (0)