Gitlab CI: enable Clang CPU backends

alpaka-group · Sep 6, 2023 · 6c4f556 · 6c4f556
1 parent d5a5ec6
commit 6c4f556
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -164,10 +164,12 @@ jobs:
           os: ubuntu-22.04
           env: {CXX: g++,     CC: gcc,    ALPAKA_CI_GCC_VER: 13,       ALPAKA_CI_STDLIB: libstdc++, CMAKE_BUILD_TYPE: Debug,   ALPAKA_BOOST_VERSION: 1.82.0, ALPAKA_CI_CMAKE_VER: 3.26.4, OMP_NUM_THREADS: 2, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:22.04"}
 
+        # TODO: keep jobs until GitLab CI supports:
+        #  - disable CMAKE_CXX_EXTENSIONS=OFF
+        #  - Ubuntu 22.04
+        #  - libc++
+        #  - sanitizer jobs
         # clang++
-        - name: linux_clang-9_debug
-          os: ubuntu-20.04
-          env: {CXX: clang++, CC: clang,  ALPAKA_CI_CLANG_VER: 9,      ALPAKA_CI_STDLIB: libstdc++, CMAKE_BUILD_TYPE: Debug,   ALPAKA_BOOST_VERSION: 1.74.0, ALPAKA_CI_CMAKE_VER: 3.22.6, OMP_NUM_THREADS: 1, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:20.04"}
         - name: linux_clang-10_release
           os: ubuntu-20.04
           env: {CXX: clang++, CC: clang,  ALPAKA_CI_CLANG_VER: 10,     ALPAKA_CI_STDLIB: libc++,    CMAKE_BUILD_TYPE: Release, ALPAKA_BOOST_VERSION: 1.75.0, ALPAKA_CI_CMAKE_VER: 3.23.5, OMP_NUM_THREADS: 4, ALPAKA_CI_DOCKER_BASE_IMAGE_NAME: "ubuntu:20.04", alpaka_ACC_CPU_B_TBB_T_SEQ_ENABLE: OFF, CMAKE_CXX_EXTENSIONS: OFF}

diff --git a/script/job_generator/generate_job_yaml.py b/script/job_generator/generate_job_yaml.py
@@ -315,7 +315,17 @@ def job_variables(job: Dict[str, Tuple[str, str]]) -> Dict[str, str]:
     if job[DEVICE_COMPILER][NAME] == GCC:
         variables["CC"] = "gcc"
         variables["CXX"] = "g++"
-        variables["ALPAKA_CI_GCC_VER"] = job[HOST_COMPILER][VERSION]
+        variables["ALPAKA_CI_GCC_VER"] = job[DEVICE_COMPILER][VERSION]
+        if (
+            ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE in job
+            and job[ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE][VERSION] == ON_VER
+        ):
+            variables["ALPAKA_CI_TBB_VERSION"] = "2021.10.0"
+
+    if job[DEVICE_COMPILER][NAME] == CLANG:
+        variables["CC"] = "clang"
+        variables["CXX"] = "clang++"
+        variables["ALPAKA_CI_CLANG_VER"] = job[DEVICE_COMPILER][VERSION]
         if (
             ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE in job
             and job[ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE][VERSION] == ON_VER

diff --git a/script/job_generator/job_generator.py b/script/job_generator/job_generator.py
@@ -113,15 +113,6 @@ def get_args() -> argparse.Namespace:
     enable_clang_cuda = True
     parameters[HOST_COMPILER] = get_compiler_versions(clang_cuda=enable_clang_cuda)
     parameters[DEVICE_COMPILER] = get_compiler_versions(clang_cuda=enable_clang_cuda)
-    # TODO(SimeonEhrig): remove Clang from DEVICE_COMPILER to disable CPU accelerator
-    # Backends
-    parameters[DEVICE_COMPILER] = list(
-        filter(
-            lambda compiler: compiler[NAME] != CLANG,
-            parameters[DEVICE_COMPILER],
-        )
-    )
-
     parameters[BACKENDS] = get_backend_matrix()
     parameters[CMAKE] = get_sw_tuple_list(CMAKE)
     parameters[BOOST] = get_sw_tuple_list(BOOST)