diff --git a/CMakeLists.txt b/CMakeLists.txt index d95788aad5b58bd592dd5ae67179740d7f71a1ba..594ee42bd2ec038b797f60eaa86b2359104c2e4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,8 +55,12 @@ if(ENABLE_GPU) message("CUDA is compatible") set(WARNING_SUPPRESSION_AND_OPTION_NVCC -Xcudafe "--display_error_number --diag_suppress=2915 --diag_suppress=2914 --diag_suppress=2912 --diag_suppress=2913 --diag_suppress=111 --diag_suppress=186 --diag_suppress=611 --diag_suppress=2928 --diag_suppress=2931 --diag_suppress=2929 --diag_suppress=2930" --expt-extended-lambda) set(WARNING_SUPPRESSION_AND_OPTION_NVCC_TEXT "-Xcudafe \"--display_error_number --diag_suppress=2915 --diag_suppress=2914 --diag_suppress=2912 --diag_suppress=2913 --diag_suppress=111 --diag_suppress=186 --diag_suppress=611 --diag_suppress=2928 --diag_suppress=2931 --diag_suppress=2929 --diag_suppress=2930 \" --expt-extended-lambda") + 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=2978 --diag_suppress=2979 --diag_suppress=1835 --diag_suppress=611 --diag_suppress=186 --diag_suppress=128" --expt-extended-lambda) + set(WARNING_SUPPRESSION_AND_OPTION_NVCC_TEXT "-Xcudafe \"--display_error_number --diag_suppress=2976 --diag_suppress=2977 --diag_suppress=2978 --diag_suppress=2979 --diag_suppress=1835 --diag_suppress=611 --diag_suppress=186 --diag_suppress=128\" --expt-extended-lambda") else() - message(FATAL_ERROR "CUDA is incompatible, version 9.2 is only supported") + message(FATAL_ERROR "CUDA is incompatible, version 9.2 10.1 and 10.2 is only supported") endif() endif() diff --git a/install b/install index 9b93b0391022d41d365aa156b100540e743c209c..47d4b7fa7b0dfceabe0eb36673dc5a84d15909d6 100755 --- a/install +++ b/install @@ -1,5 +1,6 @@ #! /bin/bash + source script/help source script/discover_os source script/show_solutions diff --git a/src/Grid/tests/grid_dist_id_unit_test.cpp b/src/Grid/tests/grid_dist_id_unit_test.cpp index a7c3ab071fa65f1db09b5b9215c95759534dd6a7..b3aa284846a27531cf62c71eeda42e0d9eac4c11 100644 --- a/src/Grid/tests/grid_dist_id_unit_test.cpp +++ b/src/Grid/tests/grid_dist_id_unit_test.cpp @@ -53,6 +53,8 @@ BOOST_AUTO_TEST_CASE( grid_dist_id_domain_grid_unit_converter3D_test) // Distributed grid with id decomposition grid_dist_id<3, float, aggregate<float>, CartDecomposition<3,float>> g_dist(sz,domain,g); + auto ghost_start = g_dist.getLocalGridsInfo().get(0).Dbox.getKP1(); + // get the decomposition auto & dec = g_dist.getDecomposition();