From fa9edaedbcac611c6bcc1cd33e5d93b0a5c32314 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 21 May 2020 18:29:47 -0400 Subject: [PATCH] remove cuda 8 support related to #10296 --- cmake/configure/configure_1_cuda.cmake | 11 +++++++++-- doc/external-libs/cuda.html | 10 ++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_1_cuda.cmake index 17f0dfb627..8b3a8b3a72 100644 --- a/cmake/configure/configure_1_cuda.cmake +++ b/cmake/configure/configure_1_cuda.cmake @@ -57,7 +57,15 @@ MACRO(FEATURE_CUDA_FIND_EXTERNAL var) ENDIF() # - # CUDA Toolkit 8 is incompatible with C++14, + # disable CUDA support older than 9.0: + # + IF(CUDA_VERSION_MAJOR VERSION_LESS 9) + MESSAGE(ERROR "\n" + "deal.II requires CUDA version 9 or newer." + ) + ENDIF() + + # # CUDA Toolkit 9 and CUDA Toolkit 10 are incompatible with C++17. # Make sure that deal.II is configured appropriately # @@ -76,7 +84,6 @@ MACRO(FEATURE_CUDA_FIND_EXTERNAL var) ENDIF() ENDIF() ENDMACRO() - _cuda_ensure_feature_off(8 DEAL_II_WITH_CXX14) _cuda_ensure_feature_off(9 DEAL_II_WITH_CXX17) _cuda_ensure_feature_off(10 DEAL_II_WITH_CXX17) diff --git a/doc/external-libs/cuda.html b/doc/external-libs/cuda.html index 196226354f..0eb275c7ea 100644 --- a/doc/external-libs/cuda.html +++ b/doc/external-libs/cuda.html @@ -20,7 +20,7 @@ capabilities of newer ones. In order to use CUDA with deal.II, you will need your GPU to have compute capability 3.5 or higher. Independently from the GPU itself, you also need a version of CUDA recent enough. - deal.II supports CUDA 8.0 and higher. Finally to be able to configure + deal.II supports CUDA 9.0 and higher. Finally to be able to configure deal.II, you will need CMake 3.9 or higher.

@@ -31,14 +31,12 @@ -DDEAL_II_WITH_CUDA=ON Depending on you system, this may be enough to get CUDA to work. If you - are using CUDA 8 with gcc 5.4, you will need to turn off support for - C++14: + are using CUDA 9 or 10, you might need to turn off support for + C++17:
 
-        -DDEAL_II_WITH_CXX14=OFF
+        -DDEAL_II_WITH_CXX17=OFF
       
- If you are using CUDA 9 or CUDA 10, you will need to turn off support for - C++17 similarly. By default, we try to detect the compute capability of your device but you can easily set your own CUDA flags:
-- 
2.39.5