Daint: Update daint modules after upgrade (CUDA 11.0) (GridTools#1613)

2 tests disabled: - boundary_conditions_gpu because of GridTools#1522 - test_tuple.cu conversion constructor for Clang 11.0.0 because of GridTools#1615
havogt · Mar 23, 2021 · 7faf8fc · 7faf8fc
1 parent 83240c0
commit 7faf8fc
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -47,11 +47,18 @@ The GridTools libraries are currently nightly tested with the following compiler
 
 | Compiler | Backend | Tested on | Comments
 | --- | --- | --- | --- |
-| Cray clang version 9.0.2 | all backends | Piz Daint | with flags `-fno-cray-gpu -fno-cray`, P100 GPU
-| GNU 7.3.0 + NVCC 10.1 | all backends | Piz Daint | P100 GPU |
-| Clang 7.0.1 + NVCC 10.1 | all backends | Piz Daint | GPU compilation in NVCC-CUDA mode, P100 GPU |
+| Cray clang version 11.0.0 | all backends | Piz Daint | P100 GPU |
+| GNU 9.3.0 + NVCC 11.0 | all backends | Piz Daint | P100 GPU |
+| GNU 9.3.0 + NVCC 11.0 | all backends | Dom | P100 GPU |
+| Clang 7.0.1 + NVCC 10.2 | all backends | Piz Daint | GPU compilation in NVCC-CUDA mode, P100 GPU |
 | GNU 8.3.0 + NVCC 10.1 | all backends | Tsa | V100 GPU |
-| HIP-Clang pre-release, based on Clang 10.0.0 | all backends | Ault | Mi50 GPU |
+
+##### Known issues
+
+- Some tests are failing with ROCm3.8.0 (Clang 11).
+- CUDA 11.0.x has a severe issue, see https://github.com/GridTools/gridtools/issues/1522. Under certain conditions, GridTools code will not compile for this version of CUDA. CUDA 11.1.x and later should not be affected by this issue.
+- Cray Clang version 11.0.0 has a problem with the `gridtools::tuple` conversion constructor, see https://github.com/GridTools/gridtools/issues/1615.
+
 
 ##### Officially not supported (no workarounds implemented and planned)
 

diff --git a/jenkins/envs/daint.sh b/jenkins/envs/daint.sh
@@ -16,9 +16,9 @@ function module() {
 }
 
 module load daint-gpu
-module load cudatoolkit/10.1.105_3.27-7.0.1.1_4.1__ga311ce7
-module rm CMake
-module load /users/jenkins/easybuild/daint/haswell/modules/all/CMake/3.14.5
+module load cudatoolkit
+module load CMake
+
 
 export BOOST_ROOT=/project/c14/install/daint/boost/boost_1_67_0/
 export CUDATOOLKIT_HOME=$CUDA_PATH

diff --git a/jenkins/envs/daint_nvcc_clang.sh b/jenkins/envs/daint_nvcc_clang.sh
@@ -2,8 +2,9 @@
 
 source $(dirname "$BASH_SOURCE")/daint.sh
 
+module switch cudatoolkit/10.2.89_3.29-7.0.2.1_3.5__g67354b4
 module load /users/vogtha/modules/compilers/clang/7.0.1
-module load gcc
+module load gcc/8.3.0
 
 export GTCMAKE_GT_CLANG_CUDA_MODE=NVCC-CUDA
 

diff --git a/jenkins/envs/daint_nvcc_gcc.sh b/jenkins/envs/daint_nvcc_gcc.sh
@@ -3,7 +3,11 @@
 source $(dirname "$BASH_SOURCE")/daint.sh
 
 module swap PrgEnv-cray PrgEnv-gnu
-module swap gcc/7.3.0
+module load cdt-cuda
+
+if [ "$build_type" != "debug" ]; then
+  module load HPX/1.5.0-CrayGNU-20.08-cuda
+fi
 
 export CXX=$(which CC)
 export CC=$(which cc)

diff --git a/jenkins/envs/dom_nvcc_gcc.sh b/jenkins/envs/dom_nvcc_gcc.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+source $(dirname "$BASH_SOURCE")/dom.sh
+
+module swap PrgEnv-cray PrgEnv-gnu
+module load cdt-cuda
+
+export CXX=$(which CC)
+export CC=$(which cc)
+export FC=$(which ftn)
+export CUDAHOSTCXX="$CXX"
+
+export GTCMAKE_CMAKE_CXX_FLAGS='-march=haswell'
+export GTCMAKE_CMAKE_CXX_FLAGS_RELEASE='-Ofast -DNDEBUG'
+
+export CTEST_PARALLEL_LEVEL=1
diff --git a/tests/regression/CMakeLists.txt b/tests/regression/CMakeLists.txt
@@ -73,19 +73,25 @@ function(gridtools_add_layout_transformation_test)
 endfunction()
 
 function(gridtools_add_boundary_conditions_test)
+    set(ENABLED_GT_GCL_ARCHS)
     foreach(arch IN LISTS GT_GCL_ARCHS)
-        set(tgt bc_testee_${arch})
-        add_library(${tgt} INTERFACE)
-        target_link_libraries(${tgt} INTERFACE boundaries_${arch})
-        if (arch STREQUAL gpu)
-            target_compile_definitions(${tgt} INTERFACE GT_GCL_GPU)
-        elseif (arch STREQUAL cpu)
-            target_compile_definitions(${tgt} INTERFACE GT_GCL_CPU)
+        if(arch STREQUAL gpu AND CMAKE_BUILD_TYPE STREQUAL Debug AND CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0 AND CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.1)
+            message(WARNING "CUDA 11.0.x is buggy, see https://github.com/GridTools/gridtools/issues/1522, skipping test boundary_conditions_gpu.")
+        else()
+            list(APPEND ENABLED_GT_GCL_ARCHS ${arch})
+            set(tgt bc_testee_${arch})
+            add_library(${tgt} INTERFACE)
+            target_link_libraries(${tgt} INTERFACE boundaries_${arch})
+            if (arch STREQUAL gpu)
+                target_compile_definitions(${tgt} INTERFACE GT_GCL_GPU)
+            elseif (arch STREQUAL cpu)
+                target_compile_definitions(${tgt} INTERFACE GT_GCL_CPU)
+            endif()
         endif()
     endforeach()
     gridtools_add_regression_test(boundary_conditions
             LIB_PREFIX bc_testee
-            KEYS ${GT_GCL_ARCHS}
+            KEYS ${ENABLED_GT_GCL_ARCHS}
             SOURCES boundary_conditions.cpp
             PERFTEST)
 endfunction()

diff --git a/tests/unit_tests/common/test_tuple.cu b/tests/unit_tests/common/test_tuple.cu
@@ -34,6 +34,9 @@ namespace gridtools {
         EXPECT_EQ(2.5, tuple_util::host::get<1>(testee));
     }
 
+#if defined(__clang__) && (__clang_major__ == 11 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
+    // crashes Clang 11.0.0, see https://github.com/GridTools/gridtools/issues/1615
+#else
     __device__ tuple<int, double> element_wise_conversion_ctor(char x, char y) { return {x, y}; }
 
     TEST(tuple, element_wise_conversion_ctor) {
@@ -51,6 +54,7 @@ namespace gridtools {
         EXPECT_EQ('a', tuple_util::host::get<0>(testee));
         EXPECT_EQ('b', tuple_util::host::get<1>(testee));
     }
+#endif
 } // namespace gridtools
 
-#include "test_tuple.cpp"
+//#include "test_tuple.cpp"