Преглед на файлове

Merge topic 'ci-cuda-archs' into release-4.1

ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11592
Brad King преди 2 седмици
родител
ревизия
cd4c4f261b
променени са 2 файла, в които са добавени 9 реда и са изтрити 2 реда
  1. 8 1
      Tests/CudaOnly/ArchSpecial/CMakeLists.txt
  2. 1 1
      Tests/CudaOnly/OptixIR/CMakeLists.txt

+ 8 - 1
Tests/CudaOnly/ArchSpecial/CMakeLists.txt

@@ -61,7 +61,14 @@ try_compile(native_archs_compiles
   COMPILE_DEFINITIONS ${try_compile_flags}
   OUTPUT_VARIABLE output
   )
-verify_output(native)
+if(native_archs_compiles)
+  verify_output(native)
+elseif("$ENV{CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP}"
+    AND CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA"
+    AND output MATCHES "Unsupported gpu architecture")
+  # nvcc -arch=native is not affected by the clamp
+  set(native_archs_compiles 1)
+endif()
 
 if(all_archs_compiles AND all_major_archs_compiles AND native_archs_compiles)
   set(CMAKE_CUDA_ARCHITECTURES all)

+ 1 - 1
Tests/CudaOnly/OptixIR/CMakeLists.txt

@@ -14,7 +14,7 @@ if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.7.0")
 endif()
 
 set_property(TARGET CudaOptix PROPERTY CUDA_SEPARABLE_COMPILATION ON)
-set_property(TARGET CudaOptix PROPERTY CUDA_ARCHITECTURES native)
+set_property(TARGET CudaOptix PROPERTY CUDA_ARCHITECTURES "${CMAKE_CUDA_ARCHITECTURES_NATIVE}")
 
 add_executable(CudaOnlyOptixIR main.cu)
 target_compile_features(CudaOnlyOptixIR PRIVATE cuda_std_11)