add oneapi dependency package path into rpath (#197)

Author: jingxu10

CMakeLists.txt

@@ -13,11 +13,8 @@ set(CMAKE_INSTALL_MESSAGE NEVER)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 
-set(RPATH_VALUE $ORIGIN)
-set(CMAKE_SKIP_BUILD_RPATH  FALSE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH "${RPATH_VALUE}")
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+set(RPATH_VALUE)
+list(APPEND RPATH_VALUE "$ORIGIN")
 
 set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
 
@@ -43,6 +40,7 @@ IF (USE_SYSTEM_ONECCL)
     set(CCL_CONFIGURATION_PATH $ENV{CCL_CONFIGURATION_PATH})
     include_directories(${CCL_ROOT}/include)
     list(APPEND DEPENDS_LIB "${CCL_ROOT}/lib/${CCL_CONFIGURATION_PATH}/libccl.so")
+    list(APPEND RPATH_VALUE "$ORIGIN/../../../../")
 ELSE()
     # Find OneCCL Lib
     find_package(oneCCL REQUIRED)
@@ -54,6 +52,11 @@ if(COMPUTE_BACKEND STREQUAL "dpcpp")
     list(APPEND DEPENDS_LIB ze_loader)
 endif()
 
+set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+set(CMAKE_INSTALL_RPATH "${RPATH_VALUE}")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+
 SET(LIB_NAME "oneccl_bindings_for_pytorch")
 
 add_subdirectory(./src)

setup.py

@@ -113,57 +113,55 @@ def build_cmake(self, extension: CMakeExtension):
             'BUILD_FT': 'OFF'
         }
 
+        compute_backend = os.getenv('COMPUTE_BACKEND', 'n/a')
         runtime = 'gcc'
-        if 'COMPUTE_BACKEND' in os.environ:
-            if os.environ['COMPUTE_BACKEND'] == 'dpcpp':
-                runtime = 'dpcpp'
-                build_options['COMPUTE_BACKEND'] = os.environ['COMPUTE_BACKEND']
-                import intel_extension_for_pytorch
-                build_options['CMAKE_PREFIX_PATH'] += ";" + intel_extension_for_pytorch.cmake_prefix_path
-                if "DPCPP_GCC_INSTALL_DIR" in my_env:
-                    exist_cflags = "CFLAGS" in my_env
-                    cflags = ""
-                    if exist_cflags:
-                        cflags = my_env["CFLAGS"]
-                    my_env["CFLAGS"] = f"--gcc-install-dir={my_env['DPCPP_GCC_INSTALL_DIR']} {cflags}"
-                    exist_cxxflags = "CXXFLAGS" in my_env
-                    cxxflags = ""
-                    if exist_cxxflags:
-                        cxxflags = my_env["CXXFLAGS"]
-                    my_env["CXXFLAGS"] = f"--gcc-install-dir={my_env['DPCPP_GCC_INSTALL_DIR']} {cxxflags}"
-                    exist_ldflags = "LDFLAGS" in my_env
-                    ldflags = ""
-                    if exist_ldflags:
-                        ldflags = my_env["LDFLAGS"]
-                    my_env["LDFLAGS"] = f"--gcc-install-dir={my_env['DPCPP_GCC_INSTALL_DIR']} -fuse-ld=lld -lrt -lpthread {ldflags}"
+        if compute_backend == 'dpcpp':
+            runtime = 'dpcpp'
+            build_options['COMPUTE_BACKEND'] = compute_backend
+            import intel_extension_for_pytorch
+            build_options['CMAKE_PREFIX_PATH'] += ";" + intel_extension_for_pytorch.cmake_prefix_path
+            if "DPCPP_GCC_INSTALL_DIR" in my_env:
+                exist_cflags = "CFLAGS" in my_env
+                cflags = ""
+                if exist_cflags:
+                    cflags = my_env["CFLAGS"]
+                my_env["CFLAGS"] = f"--gcc-install-dir={my_env['DPCPP_GCC_INSTALL_DIR']} {cflags}"
+                exist_cxxflags = "CXXFLAGS" in my_env
+                cxxflags = ""
+                if exist_cxxflags:
+                    cxxflags = my_env["CXXFLAGS"]
+                my_env["CXXFLAGS"] = f"--gcc-install-dir={my_env['DPCPP_GCC_INSTALL_DIR']} {cxxflags}"
+                exist_ldflags = "LDFLAGS" in my_env
+                ldflags = ""
+                if exist_ldflags:
+                    ldflags = my_env["LDFLAGS"]
+                my_env["LDFLAGS"] = f"--gcc-install-dir={my_env['DPCPP_GCC_INSTALL_DIR']} -fuse-ld=lld -lrt -lpthread {ldflags}"
 
         cc, cxx = get_compiler(runtime)
         build_options['CMAKE_C_COMPILER'] = cc
         build_options['CMAKE_CXX_COMPILER'] = cxx
 
         extension.generate(build_options, my_env, build_dir, install_dir)
 
-        if 'COMPUTE_BACKEND' in os.environ:
-            if os.environ['COMPUTE_BACKEND'] == 'dpcpp':
-                if "DPCPP_GCC_INSTALL_DIR" in my_env:
-                    if exist_cflags:
-                        my_env["CFLAGS"] = cflags
-                    else:
-                        del my_env["CFLAGS"]
-                    if exist_cxxflags:
-                        my_env["CXXFLAGS"] = cxxflags
-                    else:
-                        del my_env["CXXFLAGS"]
-                    if exist_ldflags:
-                        my_env["LDFLAGS"] = ldflags
-                    else:
-                        del my_env["LDFLAGS"]
+        if compute_backend == 'dpcpp':
+            if "DPCPP_GCC_INSTALL_DIR" in my_env:
+                if exist_cflags:
+                    my_env["CFLAGS"] = cflags
+                else:
+                    del my_env["CFLAGS"]
+                if exist_cxxflags:
+                    my_env["CXXFLAGS"] = cxxflags
+                else:
+                    del my_env["CXXFLAGS"]
+                if exist_ldflags:
+                    my_env["LDFLAGS"] = ldflags
+                else:
+                    del my_env["LDFLAGS"]
 
         build_args = ['-j', str(os.cpu_count())]
         check_call(['make', 'oneccl_bindings_for_pytorch'] + build_args, cwd=str(build_dir))
-        if 'COMPUTE_BACKEND' in os.environ:
-            if os.environ['COMPUTE_BACKEND'] == 'dpcpp':
-                check_call(['make', 'oneccl_bindings_for_pytorch_xpu'] + build_args, cwd=str(build_dir))
+        if compute_backend == 'dpcpp':
+            check_call(['make', 'oneccl_bindings_for_pytorch_xpu'] + build_args, cwd=str(build_dir))
         check_call(['make', 'install'], cwd=str(build_dir))
 
 
@@ -223,7 +221,12 @@ def get_python_c_module():
     ]
 
     def make_relative_rpath(path):
-        return '-Wl,-rpath,$ORIGIN/' + path
+        ret = []
+        ret.append('-Wl,-rpath,$ORIGIN/' + path)
+        if os.getenv('COMPUTE_BACKEND', 'n/a') == 'dpcpp':
+            ret.append('-Wl,-rpath,$ORIGIN/../../../')
+            ret.append('-Wl,--disable-new-dtags')
+        return ret
 
     _c_module = CppExtension("oneccl_bindings_for_pytorch._C",
                              libraries=main_libraries,
@@ -232,7 +235,7 @@ def make_relative_rpath(path):
                              extra_compile_args=main_compile_args + extra_compile_args,
                              include_dirs=include_dirs,
                              library_dirs=library_dirs,
-                             extra_link_args=extra_link_args + main_link_args + [make_relative_rpath('lib')])
+                             extra_link_args=extra_link_args + main_link_args + make_relative_rpath('lib'))
 
     return _c_module
 

src/CMakeLists.txt

@@ -19,6 +19,9 @@ target_include_directories(oneccl_bindings_for_pytorch PUBLIC ./)
 
 target_link_libraries(oneccl_bindings_for_pytorch PUBLIC ${DEPENDS_LIB})
 
-set_target_properties(oneccl_bindings_for_pytorch PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_RPATH}")
+foreach(RPATH ${CMAKE_INSTALL_RPATH})
+    set_target_properties(oneccl_bindings_for_pytorch PROPERTIES LINK_FLAGS "-Wl,-rpath,${RPATH}")
+endforeach()
+set_target_properties(oneccl_bindings_for_pytorch PROPERTIES LINK_FLAGS "-Wl,--disable-new-dtags")
 
 install(TARGETS oneccl_bindings_for_pytorch LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")

src/gpu/CMakeLists.txt

@@ -11,7 +11,10 @@ target_link_libraries(oneccl_bindings_for_pytorch_xpu PUBLIC ${DEPENDS_LIB})
 target_link_libraries(oneccl_bindings_for_pytorch_xpu PUBLIC oneccl_bindings_for_pytorch)
 target_link_libraries(oneccl_bindings_for_pytorch_xpu PUBLIC intel-ext-pt-gpu)
 
-set_target_properties(oneccl_bindings_for_pytorch_xpu PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_RPATH}")
+foreach(RPATH ${CMAKE_INSTALL_RPATH})
+    set_target_properties(oneccl_bindings_for_pytorch_xpu PROPERTIES LINK_FLAGS "-Wl,-rpath,${RPATH}")
+endforeach()
+set_target_properties(oneccl_bindings_for_pytorch_xpu PROPERTIES LINK_FLAGS "-Wl,--disable-new-dtags")
 
 install(TARGETS oneccl_bindings_for_pytorch_xpu LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")