diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch b/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch index 508118cc2e8a..45587d3fe7b9 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch +++ b/nixpkgs/pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch @@ -1,19 +1,8 @@ -From aa7e7cfd5a5fe0c839406c1b197b81ef955a7ef5 Mon Sep 17 00:00:00 2001 -From: Gaetan Lepage <gaetan@glepage.com> -Date: Thu, 23 Nov 2023 00:39:26 +0100 -Subject: [PATCH] fix-cmake-cuda-toolkit - ---- - CMakeLists.txt | 4 ---- - cmake/public/cuda.cmake | 12 +++++++++--- - tools/setup_helpers/cmake.py | 2 ++ - 3 files changed, 11 insertions(+), 7 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a48eaf4e29..3aaeef2593a 100644 +index 9194e520bb0..d05fdcfb6cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1152,10 +1152,6 @@ if(BUILD_SHARED_LIBS) +@@ -1160,10 +1160,6 @@ if(BUILD_SHARED_LIBS) ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix DESTINATION share/cmake/Caffe2/ COMPONENT dev) @@ -25,16 +14,16 @@ index 3a48eaf4e29..3aaeef2593a 100644 ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake DESTINATION share/cmake/Caffe2/ diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake -index 32f3ba375b5..c8b666e4c78 100644 +index c7595774d81..4fc43771810 100644 --- a/cmake/public/cuda.cmake +++ b/cmake/public/cuda.cmake -@@ -62,9 +62,15 @@ cmake_policy(POP) +@@ -61,9 +61,15 @@ find_package(CUDAToolkit REQUIRED) + cmake_policy(POP) - if(NOT CMAKE_CUDA_COMPILER_VERSION STREQUAL CUDAToolkit_VERSION OR - NOT CUDA_INCLUDE_DIRS STREQUAL CUDAToolkit_INCLUDE_DIR) -- message(FATAL_ERROR "Found two conflicting CUDA installs:\n" + if(NOT CMAKE_CUDA_COMPILER_VERSION VERSION_EQUAL CUDAToolkit_VERSION) +- message(FATAL_ERROR "Found two conflicting CUDA versions:\n" - "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n" -- "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'") +- "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIRS}'") + if(CUDA_INCLUDE_DIRS IN_LIST CUDAToolkit_INCLUDE_DIR) + message(STATUS "CUDA_INCLUDE_DIRS is a substring of CUDAToolkit_INCLUDE_DIR. " + "Setting CUDA_INCLUDE_DIRS to CUDAToolkit_INCLUDE_DIR.") @@ -60,6 +49,3 @@ index fb19b66dfba..3f83bef32fe 100644 "CUDA_SEPARABLE_COMPILATION", "CUDNN_LIBRARY", "CUDNN_INCLUDE_DIR", --- -2.42.0 - |