diff options
| author | David Elsing <[email protected]> | 2024-08-04 22:15:58 +0000 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2024-09-06 11:46:25 +0200 |
| commit | b44b2e346c1274eff3392ebfbf0aa3b6595e156c (patch) | |
| tree | 7b5db7643dc0faacda97c091a9a9ec1bd9b3b5e9 /gnu/packages/patches/python-pytorch-runpath.patch | |
| parent | 87fd4d217cd7dcd1961486907aa9517142fabd9d (diff) | |
gnu: python-pytorch: Update to 2.4.0.
This also updates the qnnpack-pytorch package.
* gnu/packages/machine-learning.scm (%python-pytorch-version): Set to 2.4.0.
(%python-pytorch-src): Adjust hash accordingly.
[source]: Remove obsolete file deletions in snippet.
(python-pytorch)[arguments]<#:phases>: Disable telemetry and set Python
install directory. Remove obsolete USE_FFMPEG, USE_OPENCV and
USE_PYTORCH_QNNPACK environment variables.
[native-inputs]: Remove python-typing-extensions.
[inputs]: Add brotli, cpp-httplib and zlib. Remove qnnpack. Use oneapi-dnnl,
qnnpack-pytorch and xnnpack for all systems.
[propagated-inputs]: Add onnx and python-typing-extensions. Use cpuinfo for
all systems.
[supported-systems]: New field.
(python-pytorch-for-r-torch)[inputs]: Add qnnpack.
* gnu/packages/patches/python-pytorch-fix-codegen.patch: Adjust patch.
* gnu/packages/patches/python-pytorch-runpath.patch: Adjust patch.
* gnu/packages/patches/python-pytorch-system-libraries.patch: Adjust patch.
* gnu/packages/patches/python-pytorch-without-kineto.patch: Adjust patch.
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 2c1724cdb0..811de9e288 100644 --- a/gnu/packages/patches/python-pytorch-runpath.patch +++ b/gnu/packages/patches/python-pytorch-runpath.patch @@ -2,21 +2,8 @@ Libraries (such as 'libtorch_cpu.so') and executables (such as 'torch_shm_manage get installed, quite surprisingly, to 'lib/python3.8/site-packages/{bin,lib}'. Make sure RUNPATH matches that. -diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 74836372..c8eb69d1 100644 ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -1910,7 +1910,7 @@ if(BUILD_PYTHON) - if(${BUILDING_WITH_TORCH_LIBS}) - # site-packages/caffe2/python/caffe2_pybind11_state - # site-packages/torch/lib -- set(caffe2_pybind11_rpath "${_rpath_portable_origin}/../../torch/lib") -+ set(caffe2_pybind11_rpath $ORIGIN/../../torch/lib) - endif(${BUILDING_WITH_TORCH_LIBS}) - - # Must also include `CMAKE_SHARED_LINKER_FLAGS` in linker flags for diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index acc95842..8f8fb7d7 100644 +index f1f2eb7..cb5caea 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -4,7 +4,7 @@ if(APPLE) @@ -29,10 +16,10 @@ index acc95842..8f8fb7d7 100644 # 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 f2f32745..db21b656 100644 +index bdfa4bf..2a75e38 100644 --- a/functorch/CMakeLists.txt +++ b/functorch/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE pybind::pybind11) +@@ -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) |