From a8d3f40966c06178308ec9a4c7ef354c012ee03a Mon Sep 17 00:00:00 2001 From: David Elsing Date: Wed, 25 Jun 2025 19:10:17 +0200 Subject: gnu: python-pytorch: Improve package. This fixes the build of python-pytorch-for-r-torch and moves the new patches introduced in 81d309de8745605eb76b85e6c445b896c2ba10f3 to the existing patch files for python-pytorch. Fixes guix/guix#779. * gnu/packages/machine-learning.scm (python-pytorch)[source]: Update patches. [arguments]: Adjust the 'use-system-libraries phase. * 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-runpath-2.7.0.patch: Remove patch. * gnu/packages/patches/python-pytorch-system-libraries-2.7.0.patch: Remove patch. * gnu/packages/patches/python-pytorch-without-kineto-2.7.0.patch: Remove patch. * gnu/packages/patches/python-pytorch-fix-codegen-2.7.0.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/packages/patches/python-pytorch-runpath.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/patches/python-pytorch-runpath.patch') diff --git a/gnu/packages/patches/python-pytorch-runpath.patch b/gnu/packages/patches/python-pytorch-runpath.patch index 811de9e2888..cd8bea370b8 100644 --- a/gnu/packages/patches/python-pytorch-runpath.patch +++ b/gnu/packages/patches/python-pytorch-runpath.patch @@ -3,7 +3,7 @@ get installed, quite surprisingly, to 'lib/python3.8/site-packages/{bin,lib}'. Make sure RUNPATH matches that. diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index f1f2eb7..cb5caea 100644 +index be45936a8..7b19e5359 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -4,7 +4,7 @@ if(APPLE) @@ -16,7 +16,7 @@ index f1f2eb7..cb5caea 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 bdfa4bf..2a75e38 100644 +index bdfa4bfe4..2a75e3825 100644 --- a/functorch/CMakeLists.txt +++ b/functorch/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE pybind::pybind11) -- cgit v1.3