fix icpx OpenMP atomics

CI_FILTER: ^linux_icpx
psychocoderHPC · Dec 21, 2023 · 3c61c3d · 3c61c3d
1 parent cf105b7
commit 3c61c3d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/script/install_oneapi.sh b/script/install_oneapi.sh
@@ -33,8 +33,7 @@ then
     # The compiler will automatically pull in OpenMP and TBB as dependencies
     components=(
         intel-oneapi-common-vars                                      # Contains /opt/intel/oneapi/setvars.sh - has no version number
-        intel-oneapi-compiler-dpcpp-cpp-"${ALPAKA_CI_ONEAPI_VERSION}" # Contains icpx compiler and SYCL runtime
-        intel-oneapi-runtime-opencl                                   # Required to run SYCL tests on the CPU - has no version number
+        intel-oneapi-runtime-openmp-"${ALPAKA_CI_ONEAPI_VERSION}" # Contains icpx compiler and SYCL runtime
     )
     travis_retry sudo apt-get install -y "${components[@]}"
 

diff --git a/script/job_generator/alpaka_filter.py b/script/job_generator/alpaka_filter.py
@@ -55,4 +55,13 @@ def alpaka_post_filter(row: List) -> bool:
     ):
         return False
 
+    # OpenMP is not supported for ipcx < 2024
+    #if row_check_name(row, HOST_COMPILER, "==", ICPX) and row_check_version(row, HOST_COMPILER, "!=", "2024.0") and (
+    #        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
+
     return True
diff --git a/script/job_generator/versions.py b/script/job_generator/versions.py
@@ -28,7 +28,7 @@
         "12.2",
     ],
     HIPCC: ["5.0", "5.1", "5.2", "5.3", "5.4", "5.5"],
-    ICPX: ["2023.1.0", "2023.2.0"],
+    ICPX: ["2024.0"],
     # Contains all enabled back-ends.
     # There are special cases for ALPAKA_ACC_GPU_CUDA_ENABLE and ALPAKA_ACC_GPU_HIP_ENABLE
     # which have to be combined with nvcc and hipcc versions.
@@ -68,8 +68,8 @@
         # Turn off OpenMP back-ends until Intel fixes https://github.com/intel/llvm/issues/10711
         [
             ALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLE,
-            ALPAKA_ACC_CPU_B_TBB_T_SEQ_ENABLE,
-            ALPAKA_ACC_SYCL_ENABLE,
+            ALPAKA_ACC_CPU_B_SEQ_T_OMP2_ENABLE,
+            ALPAKA_ACC_CPU_B_OMP2_T_SEQ_ENABLE
         ],
     ],
     UBUNTU: ["20.04"],