diff options
author | Raul Tambre <raul@tambre.ee> | 2020-09-20 14:11:33 (GMT) |
---|---|---|
committer | Raul Tambre <raul@tambre.ee> | 2020-09-21 17:37:07 (GMT) |
commit | 4fe9f534f522505f2609bac019ffcb8c6826a7b7 (patch) | |
tree | b9f1a62b557240cce26ff57ce2b1067ebb6833ac /Tests/Cuda | |
parent | 39a5c0c82c2041a622bcdf19fa3f22abc34b9ae8 (diff) | |
download | CMake-4fe9f534f522505f2609bac019ffcb8c6826a7b7.zip CMake-4fe9f534f522505f2609bac019ffcb8c6826a7b7.tar.gz CMake-4fe9f534f522505f2609bac019ffcb8c6826a7b7.tar.bz2 |
Tests: Don't unnecessarily set CUDA_ARCHITECTURES
Architecture 30 was removed with CUDA 11, so most of the CUDA tests fail with
it.
Remove setting the architecture and bump the minimum version to 3.18, so
CMP0104 takes effect and we can rely on the default architecture, which is
guaranteed to be compilable.
Use of __ldg() in ProperLinkFlags was removed as it only affects performance
and is available only on sm_35 and above.
Testing the functionality of CUDA_ARCHITECTURES is already covered by
CudaOnly.Architecture and CudaOnly.CompileFlags.
Diffstat (limited to 'Tests/Cuda')
-rw-r--r-- | Tests/Cuda/CXXStandardSetTwice/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/Cuda/Complex/CMakeLists.txt | 7 | ||||
-rw-r--r-- | Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt | 5 | ||||
-rw-r--r-- | Tests/Cuda/MixedStandardLevels1/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/Cuda/MixedStandardLevels2/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/Cuda/MixedStandardLevels3/CMakeLists.txt | 4 | ||||
-rw-r--r-- | Tests/Cuda/MixedStandardLevels4/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/Cuda/MixedStandardLevels5/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/Cuda/ObjectLibrary/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/Cuda/ProperDeviceLibraries/CMakeLists.txt | 3 | ||||
-rw-r--r-- | Tests/Cuda/ProperLinkFlags/CMakeLists.txt | 6 | ||||
-rw-r--r-- | Tests/Cuda/ProperLinkFlags/file1.cu | 1 | ||||
-rw-r--r-- | Tests/Cuda/SharedRuntimePlusToolkit/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/Cuda/WithC/CMakeLists.txt | 4 |
14 files changed, 16 insertions, 33 deletions
diff --git a/Tests/Cuda/CXXStandardSetTwice/CMakeLists.txt b/Tests/Cuda/CXXStandardSetTwice/CMakeLists.txt index f4ad83a..50338cf 100644 --- a/Tests/Cuda/CXXStandardSetTwice/CMakeLists.txt +++ b/Tests/Cuda/CXXStandardSetTwice/CMakeLists.txt @@ -1,8 +1,7 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project(CXXStandardSetTwice CXX CUDA) set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CUDA_ARCHITECTURES 30) add_executable(CXXStandardSetTwice main.cu) target_compile_features(CXXStandardSetTwice PUBLIC cxx_std_11) diff --git a/Tests/Cuda/Complex/CMakeLists.txt b/Tests/Cuda/Complex/CMakeLists.txt index 265bd85..63defdf 100644 --- a/Tests/Cuda/Complex/CMakeLists.txt +++ b/Tests/Cuda/Complex/CMakeLists.txt @@ -1,6 +1,5 @@ - -cmake_minimum_required(VERSION 3.7) -project (Complex CXX CUDA) +cmake_minimum_required(VERSION 3.18) +project(Complex CXX CUDA) #Goal for this example: #build a cpp dynamic library base @@ -14,8 +13,6 @@ project (Complex CXX CUDA) #this tests that we can properly handle linking cuda and cpp together #and also building cpp targets that need cuda implicit libraries -#verify that we can pass explicit cuda arch flags -set(CMAKE_CUDA_ARCHITECTURES 30) set(CMAKE_CUDA_STANDARD 11) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CUDA_STANDARD_REQUIRED TRUE) diff --git a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt index 7098a7d..b01b9d7 100644 --- a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt +++ b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt @@ -1,6 +1,5 @@ - -cmake_minimum_required(VERSION 3.7) -project (ConsumeCompileFeatures CXX CUDA) +cmake_minimum_required(VERSION 3.18) +project(ConsumeCompileFeatures CXX CUDA) #Goal for this example: #build a c++11 library that express a c++11 public compile feature diff --git a/Tests/Cuda/MixedStandardLevels1/CMakeLists.txt b/Tests/Cuda/MixedStandardLevels1/CMakeLists.txt index e40ffa6..ac2b2f5 100644 --- a/Tests/Cuda/MixedStandardLevels1/CMakeLists.txt +++ b/Tests/Cuda/MixedStandardLevels1/CMakeLists.txt @@ -1,9 +1,8 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project(MixedStandardLevels1 CXX CUDA) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CUDA_STANDARD 11) -set(CMAKE_CUDA_ARCHITECTURES 30) add_executable(MixedStandardLevels1 main.cu lib.cpp) diff --git a/Tests/Cuda/MixedStandardLevels2/CMakeLists.txt b/Tests/Cuda/MixedStandardLevels2/CMakeLists.txt index 7af8081..9ef734b 100644 --- a/Tests/Cuda/MixedStandardLevels2/CMakeLists.txt +++ b/Tests/Cuda/MixedStandardLevels2/CMakeLists.txt @@ -1,8 +1,7 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project(MixedStandardLevels2 CXX CUDA) set(CMAKE_CXX_STANDARD 17) #this can decay -set(CMAKE_CUDA_ARCHITECTURES 30) add_executable(MixedStandardLevels2 main.cu lib.cpp) target_compile_features(MixedStandardLevels2 PUBLIC cuda_std_11) diff --git a/Tests/Cuda/MixedStandardLevels3/CMakeLists.txt b/Tests/Cuda/MixedStandardLevels3/CMakeLists.txt index 2c42003..629d99c 100644 --- a/Tests/Cuda/MixedStandardLevels3/CMakeLists.txt +++ b/Tests/Cuda/MixedStandardLevels3/CMakeLists.txt @@ -1,8 +1,6 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project(MixedStandardLevels3 CXX CUDA) -set(CMAKE_CUDA_ARCHITECTURES 30) - add_executable(MixedStandardLevels3 main.cu lib.cpp) target_compile_features(MixedStandardLevels3 PUBLIC cuda_std_03 cxx_std_14) diff --git a/Tests/Cuda/MixedStandardLevels4/CMakeLists.txt b/Tests/Cuda/MixedStandardLevels4/CMakeLists.txt index 230230d..8ce57ca 100644 --- a/Tests/Cuda/MixedStandardLevels4/CMakeLists.txt +++ b/Tests/Cuda/MixedStandardLevels4/CMakeLists.txt @@ -1,8 +1,7 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project(MixedStandardLevels4 CXX CUDA) set(CMAKE_CUDA_STANDARD 03) -set(CMAKE_CUDA_ARCHITECTURES 30) add_executable(MixedStandardLevels4 main.cu lib.cpp) target_compile_features(MixedStandardLevels4 PUBLIC cxx_std_14) diff --git a/Tests/Cuda/MixedStandardLevels5/CMakeLists.txt b/Tests/Cuda/MixedStandardLevels5/CMakeLists.txt index 5f5ee06..a3c3557 100644 --- a/Tests/Cuda/MixedStandardLevels5/CMakeLists.txt +++ b/Tests/Cuda/MixedStandardLevels5/CMakeLists.txt @@ -1,8 +1,7 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project(MixedStandardLevels5 CXX CUDA) set(CMAKE_CXX_STANDARD 98) -set(CMAKE_CUDA_ARCHITECTURES 30) add_executable(MixedStandardLevels5 main.cu lib.cpp) diff --git a/Tests/Cuda/ObjectLibrary/CMakeLists.txt b/Tests/Cuda/ObjectLibrary/CMakeLists.txt index 395bd38..d308514 100644 --- a/Tests/Cuda/ObjectLibrary/CMakeLists.txt +++ b/Tests/Cuda/ObjectLibrary/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project (ObjectLibrary CUDA CXX) #Goal for this example: # diff --git a/Tests/Cuda/ProperDeviceLibraries/CMakeLists.txt b/Tests/Cuda/ProperDeviceLibraries/CMakeLists.txt index fe28c3e..43068d9 100644 --- a/Tests/Cuda/ProperDeviceLibraries/CMakeLists.txt +++ b/Tests/Cuda/ProperDeviceLibraries/CMakeLists.txt @@ -1,8 +1,7 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.18) project(ProperDeviceLibraries CXX CUDA) set(CMAKE_CUDA_STANDARD 11) -set(CMAKE_CUDA_ARCHITECTURES 35) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads) diff --git a/Tests/Cuda/ProperLinkFlags/CMakeLists.txt b/Tests/Cuda/ProperLinkFlags/CMakeLists.txt index d38da6d..862b03b 100644 --- a/Tests/Cuda/ProperLinkFlags/CMakeLists.txt +++ b/Tests/Cuda/ProperLinkFlags/CMakeLists.txt @@ -1,6 +1,5 @@ - -cmake_minimum_required(VERSION 3.7) -project (ProperLinkFlags CUDA CXX) +cmake_minimum_required(VERSION 3.18) +project(ProperLinkFlags CUDA CXX) #Goal for this example: #Verify that when we have CXX and CUDA enabled and we link an executable that @@ -19,7 +18,6 @@ set(CMAKE_CXX_FLAGS "-Wall") set(CMAKE_CXX_STANDARD 11) set(CMAKE_CUDA_STANDARD 11) -set(CMAKE_CUDA_ARCHITECTURES 35) add_executable(ProperLinkFlags file1.cu main.cxx) set_target_properties( ProperLinkFlags diff --git a/Tests/Cuda/ProperLinkFlags/file1.cu b/Tests/Cuda/ProperLinkFlags/file1.cu index 9a105f0..1ce63bf 100644 --- a/Tests/Cuda/ProperLinkFlags/file1.cu +++ b/Tests/Cuda/ProperLinkFlags/file1.cu @@ -3,7 +3,6 @@ result_type __device__ file1_func(int x) { - __ldg(&x); result_type r; r.input = x; r.sum = x * x; diff --git a/Tests/Cuda/SharedRuntimePlusToolkit/CMakeLists.txt b/Tests/Cuda/SharedRuntimePlusToolkit/CMakeLists.txt index 48df558..61a3190 100644 --- a/Tests/Cuda/SharedRuntimePlusToolkit/CMakeLists.txt +++ b/Tests/Cuda/SharedRuntimePlusToolkit/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.18) project(SharedRuntimePlusToolkit CXX) #Goal for this example: diff --git a/Tests/Cuda/WithC/CMakeLists.txt b/Tests/Cuda/WithC/CMakeLists.txt index 049cbce..cc5fa0c 100644 --- a/Tests/Cuda/WithC/CMakeLists.txt +++ b/Tests/Cuda/WithC/CMakeLists.txt @@ -1,8 +1,6 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.18) project(WithC CUDA C) -set(CMAKE_CUDA_ARCHITECTURES 30) - add_executable(CudaWithC main.c cuda.cu) if(APPLE) |