summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-01-12 14:27:50 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-01-12 14:28:05 (GMT)
commitc8f42171f29f1d5b08e0f71807acee41651a683b (patch)
tree5905a6d2174894a0d8f684c0d6497bb9a7e6c5a5
parent64b7c16b2104e64543a744899c3ad519abd10d5f (diff)
parent4d90f65b246fe7f9f9fc1d34fb985cd67b992aa9 (diff)
downloadCMake-c8f42171f29f1d5b08e0f71807acee41651a683b.zip
CMake-c8f42171f29f1d5b08e0f71807acee41651a683b.tar.gz
CMake-c8f42171f29f1d5b08e0f71807acee41651a683b.tar.bz2
Merge topic 'cuda-12'
4d90f65b24 CUDA: Update set of architectures supported by CUDA 12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8031
-rw-r--r--Modules/CUDA/architectures.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/CUDA/architectures.cmake b/Modules/CUDA/architectures.cmake
index d646920..7d6a6e0 100644
--- a/Modules/CUDA/architectures.cmake
+++ b/Modules/CUDA/architectures.cmake
@@ -17,7 +17,7 @@ if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 9.0)
endif()
list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL 20 21)
- list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 20 21)
+ list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 20)
endif()
if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 10.0
@@ -51,6 +51,12 @@ if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 11.8
list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 90)
endif()
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 12.0
+ AND (NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang"))
+ list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL 35 37)
+ list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 35)
+endif()
+
# only generate jit code for the newest arch for all/all-major
list(POP_BACK CMAKE_CUDA_ARCHITECTURES_ALL _latest_arch)
list(TRANSFORM CMAKE_CUDA_ARCHITECTURES_ALL APPEND "-real")