Set RELATIVE_PATH argument to build_dpctl_ext for pertinent modules

Author: oleksandr-pavlyk

dpctl/CMakeLists.txt

@@ -105,7 +105,7 @@ set(CMAKE_INSTALL_RPATH "$ORIGIN")
 
 function(build_dpctl_ext _trgt _src _dest)
     set(options SYCL)
-    cmake_parse_arguments(BUILD_DPCTL_EXT "${options}" "" "" ${ARGN})
+    cmake_parse_arguments(BUILD_DPCTL_EXT "${options}" "RELATIVE_PATH" "" ${ARGN})
     add_cython_target(${_trgt} ${_src} CXX OUTPUT_VAR _generated_src)
     set(_cythonize_trgt "${_trgt}_cythonize_pyx")
     Python_add_library(${_trgt} MODULE WITH_SOABI ${_generated_src})
@@ -147,11 +147,11 @@ function(build_dpctl_ext _trgt _src _dest)
     # TODO: do not set directory if we did not generate header
     target_include_directories(${_trgt} INTERFACE ${_generated_src_dir_dir})
     set(_rpath_value "$ORIGIN")
+    if (BUILD_DPCTL_EXT_RELATIVE_PATH)
+        set(_rpath_value "${_rpath_value}/${BUILD_DPCTL_EXT_RELATIVE_PATH}")
+    endif()
     if (DPCTL_WITH_REDIST)
-        get_filename_component(_src_dir ${_src} DIRECTORY)
-        cmake_path(RELATIVE_PATH CMAKE_SOURCE_DIR BASE_DIRECTORY ${_src_dir} OUTPUT_VARIABLE _relative_path)
-	string(JOIN ":" _expanded_rpath_value ${_rpath_value} "$ORIGIN/${_relative_path}/../../")
-	set(_rpath_value ${_expanded_rpath_value})
+        set(_rpath_value "${_rpath_value}:${_rpath_value}/../../..")
     endif()
     set_target_properties(${_trgt} PROPERTIES INSTALL_RPATH ${_rpath_value})
 

dpctl/memory/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 set(_cy_file ${CMAKE_CURRENT_SOURCE_DIR}/_memory.pyx)
 get_filename_component(_trgt ${_cy_file} NAME_WLE)
-build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/memory" SYCL)
+build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/memory" SYCL RELATIVE_PATH "..")
 # _memory include _opaque_smart_ptr.hpp
 target_include_directories(${_trgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)

dpctl/program/CMakeLists.txt

@@ -2,6 +2,6 @@
 file(GLOB _cython_sources *.pyx)
 foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
-    build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/program")
+    build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/program" RELATIVE_PATH "..")
     target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
 endforeach()

dpctl/tensor/CMakeLists.txt

@@ -1,7 +1,7 @@
 file(GLOB _cython_sources *.pyx)
 foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
-    build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/tensor")
+    build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/tensor" RELATIVE_PATH "..")
     target_include_directories(${_trgt} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
     target_link_libraries(DpctlCAPI INTERFACE ${_trgt}_headers)
 endforeach()

dpctl/utils/CMakeLists.txt

@@ -2,7 +2,7 @@
 file(GLOB _cython_sources *.pyx)
 foreach(_cy_file ${_cython_sources})
     get_filename_component(_trgt ${_cy_file} NAME_WLE)
-    build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/utils")
+    build_dpctl_ext(${_trgt} ${_cy_file} "dpctl/utils" RELATIVE_PATH "..")
 endforeach()
 
 set(_pybind11_targets)