diff options
Diffstat (limited to 'gnu/packages/patches/python-pytorch-runpath.patch')
| -rw-r--r-- | gnu/packages/patches/python-pytorch-runpath.patch | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/gnu/packages/patches/python-pytorch-runpath.patch b/gnu/packages/patches/python-pytorch-runpath.patch index cd8bea370b8..d491698f961 100644 --- a/gnu/packages/patches/python-pytorch-runpath.patch +++ b/gnu/packages/patches/python-pytorch-runpath.patch @@ -1,6 +1,6 @@ -Libraries (such as 'libtorch_cpu.so') and executables (such as 'torch_shm_manager') -get installed, quite surprisingly, to 'lib/python3.8/site-packages/{bin,lib}'. -Make sure RUNPATH matches that. +Libraries (such as 'libtorch_cpu.so') and executables (such as +'torch_shm_manager') get installed, quite surprisingly, to +'lib/pythonX.Y/site-packages/{bin,lib}'. Make sure RUNPATH matches that. diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index be45936a8..7b19e5359 100644 @@ -15,16 +15,3 @@ index be45936a8..7b19e5359 100644 endif(APPLE) # Use separate rpaths during build and install phases set(CMAKE_SKIP_BUILD_RPATH FALSE) -diff --git a/functorch/CMakeLists.txt b/functorch/CMakeLists.txt -index bdfa4bfe4..2a75e3825 100644 ---- a/functorch/CMakeLists.txt -+++ b/functorch/CMakeLists.txt -@@ -26,7 +26,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE pybind::pybind11) - - set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY - ${CMAKE_BINARY_DIR}/functorch) --set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${_rpath_portable_origin}/../torch/lib") -+set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../torch/lib") - - # Copy-pasted prefix/suffix logic for Python extensions from - # https://github.com/pytorch/pytorch/blob/33bb8ae350611760139457b85842b1d7edf9aa11/caffe2/CMakeLists.txt#L1975 |