From 50a00c7d54da0c4e567f4acdac27a93e23e21764 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Fri, 16 Oct 2020 09:49:31 +0200 Subject: [PATCH] Adding missing files --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93b7a8cd..3ea95a65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,8 @@ set(PARMETIS_DIR ${PARMETIS_ROOT}) set(OPENBLAS_ROOT CACHE PATH "Root path for blas library") set(SuiteSparse_ROOT ${SUITESPARSE_ROOT}) -set (CMAKE_CXX_STANDARD 11) -set (CMAKE_CUDA_STANDARD 11) +set (CMAKE_CXX_STANDARD 14) +set (CMAKE_CUDA_STANDARD 14) if (OPENBLAS_ROOT) set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:${OPENBLAS_ROOT}/lib") @@ -54,8 +54,11 @@ if(ENABLE_GPU) elseif ( CUDA_VERSION_MAJOR EQUAL 10 AND CUDA_VERSION_MINOR EQUAL 2 ) message("CUDA is compatible") set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=2976 --diag_suppress=2977 --diag_suppress=2979 --diag_suppress=186" --expt-extended-lambda) - else() - message(FATAL_ERROR "CUDA is incompatible, version 9.2 and 10.1 is only supported") +elseif ( CUDA_VERSION_MAJOR EQUAL 11 AND CUDA_VERSION_MINOR EQUAL 0 ) + message("CUDA is compatible") + set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=3059 --diag_suppress=3058 --diag_suppress=3057 --diag_suppress=3056 --diag_suppress=611 --diag_suppress=186" --expt-extended-lambda) + else() + message(FATAL_ERROR "CUDA is incompatible, version 9.2 10.1 10.2 and 11.0 is only supported") endif() endif() -- GitLab