From: Szilárd Páll Date: Fri, 4 Jun 2021 10:15:32 +0000 (+0000) Subject: Require CUDA 11.0 X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=5e1261a9285241b0e573641b896b155dc911ccbd;p=alexxy%2Fgromacs.git Require CUDA 11.0 Also remove some cmake code that aided support for version <11.0. Refs #3708 --- diff --git a/cmake/gmxManageCuda.cmake b/cmake/gmxManageCuda.cmake index 96aaa27c4e..3e2fb38f37 100644 --- a/cmake/gmxManageCuda.cmake +++ b/cmake/gmxManageCuda.cmake @@ -2,7 +2,7 @@ # This file is part of the GROMACS molecular simulation package. # # Copyright (c) 2012,2013,2014,2015,2016 by the GROMACS development team. -# Copyright (c) 2017,2018,2019,2020, by the GROMACS development team, led by +# Copyright (c) 2017,2018,2019,2020,2021, by the GROMACS development team, led by # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, # and including many others, as listed in the AUTHORS file in the # top-level source directory and at http://www.gromacs.org. @@ -33,9 +33,8 @@ # To help us fund GROMACS development, we humbly ask that you cite # the research papers on the package. Check out http://www.gromacs.org. - -# The earliest version of the CUDA toolkit that supports c++14 is 9.0 -set(REQUIRED_CUDA_VERSION 9.0) +# The earliest version of the CUDA toolkit that supports c++17 is 11.0 +set(REQUIRED_CUDA_VERSION 11.0) set(REQUIRED_CUDA_COMPUTE_CAPABILITY 3.0) set(GMX_GPU_CUDA ON) diff --git a/cmake/gmxManageNvccConfig.cmake b/cmake/gmxManageNvccConfig.cmake index b5f5663f4c..9fd71bb787 100644 --- a/cmake/gmxManageNvccConfig.cmake +++ b/cmake/gmxManageNvccConfig.cmake @@ -100,17 +100,10 @@ if (GMX_CUDA_TARGET_SM OR GMX_CUDA_TARGET_COMPUTE) endforeach() else() # Set the CUDA GPU architectures to compile for: - # - with CUDA >=9.0 CC 7.0 is supported and CC 2.0 is no longer supported - # => compile sm_30, sm_35, sm_37, sm_50, sm_52, sm_60, sm_61, sm_70 SASS, and compute_35, compute_70 PTX - # - with CUDA >=10.0 CC 7.5 is supported - # => compile sm_30, sm_35, sm_37, sm_50, sm_52, sm_60, sm_61, sm_70, sm_75 SASS, and compute_35, compute_75 PTX # - with CUDA >=11.0 CC 8.0 is supported # => compile sm_35, sm_37, sm_50, sm_52, sm_60, sm_61, sm_70, sm_75, sm_80 SASS, and compute_35, compute_80 PTX # First add flags that trigger SASS (binary) code generation for physical arch - if(CUDA_VERSION VERSION_LESS "11.0") - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_30,code=sm_30") - endif() list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_35,code=sm_35") list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_37,code=sm_37") list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_50,code=sm_50") @@ -118,32 +111,21 @@ else() list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_60,code=sm_60") list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_61,code=sm_61") list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_70,code=sm_70") - if(NOT CUDA_VERSION VERSION_LESS "10.0") - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_75,code=sm_75") - endif() - if(NOT CUDA_VERSION VERSION_LESS "11.0") - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_80,code=sm_80") - # Requesting sm or compute 35, 37, or 50 triggers deprecation messages with - # nvcc 11.0, which we need to suppress for use in CI - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-Wno-deprecated-gpu-targets") - endif() + list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_75,code=sm_75") + list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_80,code=sm_80") if(NOT CUDA_VERSION VERSION_LESS "11.1") list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_86,code=sm_86") endif() + # Requesting sm or compute 35, 37, or 50 triggers deprecation messages with + # nvcc 11.0, which we need to suppress for use in CI + list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-Wno-deprecated-gpu-targets") # Next add flags that trigger PTX code generation for the # newest supported virtual arch that's useful to JIT to future architectures # as well as an older one suitable for JIT-ing to any rare intermediate arch # (like that of Jetson / Drive PX devices) - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_35,code=compute_35") - if(CUDA_VERSION VERSION_LESS "11.0") - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_32,code=compute_32") - else() - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_53,code=compute_53") - endif() - if(NOT CUDA_VERSION VERSION_LESS "11.0") - list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_80,code=compute_80") - endif() + list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_53,code=compute_53") + list (APPEND GMX_CUDA_NVCC_GENCODE_FLAGS "-gencode;arch=compute_80,code=compute_80") endif() if (GMX_CUDA_TARGET_SM) @@ -158,22 +140,15 @@ endif() # FindCUDA.cmake is unaware of the mechanism used by cmake to embed # the compiler flag for the required C++ standard in the generated # build files, so we have to pass it ourselves -if (CUDA_VERSION VERSION_LESS 11.0) - # CUDA doesn't formally support C++17 until version 11.0, so for - # now host-side code that compiles with CUDA is restricted to - # C++14. This needs to be expressed formally for older CUDA - # version. + +# gcc-7 pre-dated C++17, so uses the -std=c++1z compiler flag for it, +# which modern nvcc does not recognize. So we work around that by +# compiling in C++14 mode. Clang doesn't have this problem because nvcc +# only supports version of clang that already understood -std=c++17 +if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) list(APPEND GMX_CUDA_NVCC_FLAGS "${CMAKE_CXX14_STANDARD_COMPILE_OPTION}") else() - # gcc-7 pre-dated C++17, so uses the -std=c++1z compiler flag for it, - # which modern nvcc does not recognize. So we work around that by - # compiling in C++14 mode. Clang doesn't have this problem because nvcc - # only supports version of clang that already understood -std=c++17 - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) - list(APPEND GMX_CUDA_NVCC_FLAGS "${CMAKE_CXX14_STANDARD_COMPILE_OPTION}") - else() - list(APPEND GMX_CUDA_NVCC_FLAGS "${CMAKE_CXX17_STANDARD_COMPILE_OPTION}") - endif() + list(APPEND GMX_CUDA_NVCC_FLAGS "${CMAKE_CXX17_STANDARD_COMPILE_OPTION}") endif() # assemble the CUDA flags