update CI container to version 3.2

alpaka-group · Jul 5, 2024 · 3015eae · 3015eae
1 parent 56c0e41
commit 3015eae
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
   # container version of the generated jobs
   # should be merged with ALPAKA_GITLAB_CI_CONTAINER_VERSION
   # see: script/job_generator/generate_job_yaml.py
-  ALPAKA_GITLAB_CI_GENERATOR_CONTAINER_VERSION: "3.1"
+  ALPAKA_GITLAB_CI_GENERATOR_CONTAINER_VERSION: "3.2"
 
 generate:
   stage: generator

diff --git a/script/gitlabci/job_cuda.yml b/script/gitlabci/job_cuda.yml
@@ -3,7 +3,7 @@
 # nvcc + g++
 linux_nvcc12.0_gcc12_debug_relocatable_device_code_compile_only:
   extends: .base_cuda_gcc_compile_only
-  image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.1
+  image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.2
   variables:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "12.0"
@@ -15,7 +15,7 @@ linux_nvcc12.0_gcc12_debug_relocatable_device_code_compile_only:
 
 linux_nvcc12.0_gcc12_release_extended_lambda_off_compile_only:
   extends: .base_cuda_gcc_compile_only
-  image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.1
+  image: registry.hzdr.de/crp/alpaka-group-container/alpaka-ci-ubuntu20.04-cuda110-gcc:3.2
   variables:
     ALPAKA_CI_UBUNTU_VER: "20.04"
     ALPAKA_CI_CUDA_VERSION: "12.0"

diff --git a/script/job_generator/alpaka_filter.py b/script/job_generator/alpaka_filter.py
@@ -49,7 +49,21 @@ def alpaka_post_filter(row: List) -> bool:
     # https://github.com/alpaka-group/alpaka/issues/639
     if row_check_name(row, DEVICE_COMPILER, "==", CLANG_CUDA) and (
         row_check_backend_version(row, ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE, "==", ON_VER)
-        or row_check_backend_version(row, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE, "==", ON_VER)
+        or row_check_backend_version(
+            row, ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE, "==", ON_VER
+        )
+    ):
+        return False
+
+    # there is a compiler bug in GCC 11.4 which avoids working with NVCC 11.5
+    if (
+        row_check_name(row, DEVICE_COMPILER, "==", NVCC)
+        and (
+            row_check_version(row, DEVICE_COMPILER, "==", "11.4")
+            or row_check_version(row, DEVICE_COMPILER, "==", "11.5")
+        )
+        and row_check_name(row, HOST_COMPILER, "==", GCC)
+        and row_check_version(row, HOST_COMPILER, "==", "11")
     ):
         return False