From b4dc73a818bd21a72c75f826e5b387a54f939bb3 Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Wed, 21 Aug 2024 15:26:59 +0200
Subject: [PATCH] Update to oneAPI 2024.2

---
 README.md                                 | 2 +-
 cmake/alpakaCommon.cmake                  | 2 +-
 script/job_generator/generate_job_yaml.py | 4 ++++
 script/job_generator/versions.py          | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8071abdb169..82795a45929 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ Supported Compilers
 
 This library uses C++17 (or newer when available).
 
-| Accelerator Back-end                                                           | gcc 9.5 <br/> (Linux)                           | gcc 10.4 / 11.1 <br/> (Linux)                   | gcc 12.3 <br/> (Linux)                      | gcc 13.1 <br/> (Linux) | clang 9 <br/> (Linux)                                      | clang 10 / 11<br/> (Linux)                            | clang 12 <br/> (Linux)                          | clang 13 <br/> (Linux)                      | clang 14 <br/> (Linux)                            | clang 15 <br/> (Linux)                    | clang 16 <br/> (Linux)                    | clang 17 <br/> (Linux)                    | icpx 2024.0 (Linux) | Xcode 13.2.1 / 14.2 / 14.3.1 <br /> (macOS)           | Visual Studio 2022 <br/> (Windows)   |
+| Accelerator Back-end                                                           | gcc 9.5 <br/> (Linux)                           | gcc 10.4 / 11.1 <br/> (Linux)                   | gcc 12.3 <br/> (Linux)                      | gcc 13.1 <br/> (Linux) | clang 9 <br/> (Linux)                                      | clang 10 / 11<br/> (Linux)                            | clang 12 <br/> (Linux)                          | clang 13 <br/> (Linux)                      | clang 14 <br/> (Linux)                            | clang 15 <br/> (Linux)                    | clang 16 <br/> (Linux)                    | clang 17 <br/> (Linux)                    | icpx 2024.2 (Linux) | Xcode 13.2.1 / 14.2 / 14.3.1 <br /> (macOS)           | Visual Studio 2022 <br/> (Windows)   |
 |--------------------------------------------------------------------------------|-------------------------------------------------|-------------------------------------------------|---------------------------------------------|------------------------|------------------------------------------------------------|-------------------------------------------------------|-------------------------------------------------|---------------------------------------------|---------------------------------------------------|-------------------------------------------|-------------------------------------------|-------------------------------------------|----------------------------------|-------------------------------------------------------|--------------------------------------|
 | Serial                                                                         | :white_check_mark:                              | :white_check_mark:                              | :white_check_mark:                          | :white_check_mark:     | :white_check_mark:                                         | :white_check_mark:                                    | :white_check_mark:                              | :white_check_mark:                          | :white_check_mark:                                | :white_check_mark:                        | :white_check_mark:                        | :white_check_mark:                        | :white_check_mark:               | :white_check_mark:                                    | :white_check_mark:                   |
 | OpenMP 2.0+ blocks                                                             | :white_check_mark:                              | :white_check_mark:                              | :white_check_mark:                          | :white_check_mark:     | :white_check_mark:                                         | :white_check_mark:                                    | :white_check_mark:                              | :white_check_mark:                          | :white_check_mark:                                | :white_check_mark:                        | :white_check_mark:                        | :white_check_mark:                        | :white_check_mark:[^3]           | :white_check_mark:                                    | :white_check_mark:                   |
diff --git a/cmake/alpakaCommon.cmake b/cmake/alpakaCommon.cmake
index a9a13f883b1..d3753cd2a39 100644
--- a/cmake/alpakaCommon.cmake
+++ b/cmake/alpakaCommon.cmake
@@ -757,7 +757,7 @@ if(alpaka_ACC_SYCL_ENABLE)
             target_link_options(alpaka INTERFACE "-fno-sycl-rdc")
         endif()
     else()
-        message(FATAL_ERROR "alpaka currently does not support SYCL implementations other than oneAPI.")
+        message(FATAL_ERROR "alpaka currently does not support SYCL implementations other than oneAPI: ${CMAKE_CXX_COMPILER_ID}.")
     endif()
 
     if(NOT alpaka_DISABLE_VENDOR_RNG)
diff --git a/script/job_generator/generate_job_yaml.py b/script/job_generator/generate_job_yaml.py
index 5f728581b93..db11d930459 100644
--- a/script/job_generator/generate_job_yaml.py
+++ b/script/job_generator/generate_job_yaml.py
@@ -369,6 +369,10 @@ def job_variables(job: Dict[str, Tuple[str, str]]) -> Dict[str, str]:
         variables["ALPAKA_CI_CXX"] = "icpx"
         if job[DEVICE_COMPILER][VERSION] == "2024.0":
             variables["ALPAKA_CI_CLANG_VER"] = "17"
+        elif job[DEVICE_COMPILER][VERSION] == "2024.1":
+            variables["ALPAKA_CI_CLANG_VER"] = "18"
+        elif job[DEVICE_COMPILER][VERSION] == "2024.2":
+            variables["ALPAKA_CI_CLANG_VER"] = "19"
         variables["ALPAKA_CI_STDLIB"] = "libstdc++"
         variables["ALPAKA_CI_ONEAPI_VERSION"] = job[DEVICE_COMPILER][VERSION]
         variables["alpaka_SYCL_ONEAPI_CPU"] = "ON"
diff --git a/script/job_generator/versions.py b/script/job_generator/versions.py
index 663a85f43ea..881bf660ec0 100644
--- a/script/job_generator/versions.py
+++ b/script/job_generator/versions.py
@@ -29,7 +29,7 @@
         "12.5",
     ],
     HIPCC: ["5.1", "5.2", "5.3", "5.4", "5.5", "5.6", "5.7", "6.0"],
-    ICPX: ["2024.0"],
+    ICPX: ["2024.2"],
     # 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.