tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 9194e520bb0..d05fdcfb6cb 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -1160,10 +1160,6 @@ if(BUILD_SHARED_LIBS)
6 ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix
7 DESTINATION share/cmake/Caffe2/
8 COMPONENT dev)
9- install(FILES
10- ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUDAToolkit.cmake
11- DESTINATION share/cmake/Caffe2/
12- COMPONENT dev)
13 install(FILES
14 ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake
15 DESTINATION share/cmake/Caffe2/
16diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake
17index c7595774d81..4fc43771810 100644
18--- a/cmake/public/cuda.cmake
19+++ b/cmake/public/cuda.cmake
20@@ -61,9 +61,15 @@ find_package(CUDAToolkit REQUIRED)
21 cmake_policy(POP)
22
23 if(NOT CMAKE_CUDA_COMPILER_VERSION VERSION_EQUAL CUDAToolkit_VERSION)
24- message(FATAL_ERROR "Found two conflicting CUDA versions:\n"
25- "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n"
26- "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIRS}'")
27+ if(CUDA_INCLUDE_DIRS IN_LIST CUDAToolkit_INCLUDE_DIR)
28+ message(STATUS "CUDA_INCLUDE_DIRS is a substring of CUDAToolkit_INCLUDE_DIR. "
29+ "Setting CUDA_INCLUDE_DIRS to CUDAToolkit_INCLUDE_DIR.")
30+ set(CUDA_INCLUDE_DIRS "${CUDAToolkit_INCLUDE_DIR}")
31+ else()
32+ message(FATAL_ERROR "Found two conflicting CUDA installs:\n"
33+ "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n"
34+ "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'")
35+ endif()
36 endif()
37
38 if(NOT TARGET CUDA::nvToolsExt)
39diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
40index fb19b66dfba..3f83bef32fe 100644
41--- a/tools/setup_helpers/cmake.py
42+++ b/tools/setup_helpers/cmake.py
43@@ -207,6 +207,8 @@ class CMake:
44 "BUILDING_WITH_TORCH_LIBS",
45 "CUDA_HOST_COMPILER",
46 "CUDA_NVCC_EXECUTABLE",
47+ "CUDAToolkit_ROOT",
48+ "CUDAToolkit_INCLUDE_DIR",
49 "CUDA_SEPARABLE_COMPILATION",
50 "CUDNN_LIBRARY",
51 "CUDNN_INCLUDE_DIR",