From 130d039efaa0a4c476b5d4513c0125ff6b608e98 Mon Sep 17 00:00:00 2001 From: Hannes Vogt Date: Mon, 17 Jun 2024 11:10:11 +0200 Subject: [PATCH] CI: test CUDA 12.4 (#1773) --- .github/workflows/tests.yml | 2 +- include/gridtools/common/defs.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5bc615ca8..2c71e2688 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: container: ghcr.io/gridtools/gridtools-base:${{ matrix.compiler }} strategy: matrix: - compiler: [gcc-8, gcc-9, gcc-10, gcc-11, gcc-12, gcc-13, clang-11, clang-12, clang-13, clang-14, clang-15, clang-16, clang-14-cuda-11, gcc-10-cuda-11.8, gcc-11-cuda-12.0, gcc-12-cuda-12.1, gcc-12-cuda-12.2, gcc-12-cuda-12.3, base-hip, gcc-10-hpx, nvhpc-23.3, nvhpc-23.9] + compiler: [gcc-8, gcc-9, gcc-10, gcc-11, gcc-12, gcc-13, clang-11, clang-12, clang-13, clang-14, clang-15, clang-16, clang-14-cuda-11, gcc-10-cuda-11.8, gcc-11-cuda-12.0, gcc-12-cuda-12.3, gcc-12-cuda-12.4, base-hip, gcc-10-hpx, nvhpc-23.3, nvhpc-23.9] build_type: [debug, release] exclude: - compiler: gcc-8 diff --git a/include/gridtools/common/defs.hpp b/include/gridtools/common/defs.hpp index 53fbf4615..b46527f53 100644 --- a/include/gridtools/common/defs.hpp +++ b/include/gridtools/common/defs.hpp @@ -52,8 +52,8 @@ namespace gridtools { #define GT_NVCC_DIAG_POP_SUPPRESS(x) #endif -#if defined(__NVCC__) && (__CUDACC_VER_MAJOR__ == 12 && __CUDACC_VER_MINOR__ >= 1 && __CUDACC_VER_MINOR__ <= 3) -// enables workaround for CTAD/constexpr issues in CUDA 12.1, 12.2, 12.3 (https://github.com/GridTools/gridtools/issues/1766) +#if defined(__NVCC__) && (__CUDACC_VER_MAJOR__ == 12 && __CUDACC_VER_MINOR__ >= 1 && __CUDACC_VER_MINOR__ <= 4) +// enables workaround for CTAD/constexpr issues in CUDA 12.1, 12.2, 12.3, 12.4 (https://github.com/GridTools/gridtools/issues/1766) #define GT_NVCC_WORKAROUND_1766 1 #else #define GT_NVCC_WORKAROUND_1766 0