From c98c24251e446e210c88177a0941ae8037c96614 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:46:32 +0200
Subject: [PATCH 01/27] From RSC: Do not reuse already installed specs

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 00c06c2d02..77c0a7a410 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 00c06c2d0258802fbf4a57ff987314d4acd9f629
+Subproject commit 77c0a7a410890e7a45895474d8649ed2a39f5236

From b548b16f65fd8164027532c9faf90767c93aaa02 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:08:19 +0200
Subject: [PATCH 02/27] From RSC: Add externals using following Axom tracks (+
 version update)

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 77c0a7a410..cd0dc0a959 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 77c0a7a410890e7a45895474d8649ed2a39f5236
+Subproject commit cd0dc0a95968b81eb5b44aa782d31317ee5e4298

From 7e18e368e714433cd565b1d1ec1cb307b841da5a Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:11:31 +0200
Subject: [PATCH 03/27] From RSC: Fix concretization bug around elfutils

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index cd0dc0a959..fb9c3f82a8 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit cd0dc0a95968b81eb5b44aa782d31317ee5e4298
+Subproject commit fb9c3f82a8b25a5358b6d0a71d36059a434dac55

From adc74139e8cc864a292fe1136bd54ae50c89451e Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 21 Oct 2024 15:09:55 +0200
Subject: [PATCH 04/27] Update RSC with changes from RADIUSS Spack Testing

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index fb9c3f82a8..9cb7c6812f 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit fb9c3f82a8b25a5358b6d0a71d36059a434dac55
+Subproject commit 9cb7c6812fa37a1ca5fc35a71a3fa85d1e68b63d

From 79e47efd1ea0643ce6af15567210576284081166 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:22:44 +0100
Subject: [PATCH 05/27] From RSC and Uberenv: Split env files

---
 scripts/radiuss-spack-configs | 2 +-
 scripts/uberenv               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 756ab5a968..8ad7a8632c 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 756ab5a96855d8766da3be7d90fcd4deca5b8bef
+Subproject commit 8ad7a8632c391ae7a21fbbb5b082ba0010b56136
diff --git a/scripts/uberenv b/scripts/uberenv
index 205672b8b2..06933746d8 160000
--- a/scripts/uberenv
+++ b/scripts/uberenv
@@ -1 +1 @@
-Subproject commit 205672b8b2520d7dc69acefe8738960cd5db0937
+Subproject commit 06933746d88ee3ea6b6b9a37cff68b71510daad2

From 02c4ab317812312fc8239b267b51822d98dd940a Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 26 Nov 2024 11:53:47 +0100
Subject: [PATCH 06/27] From RSC: Update tioga toolchain: rocm 6.2.4,
 cray-mpich 8.1.31, cce 18.0.1

---
 .gitlab/jobs/tioga.yml        | 12 ++++++------
 scripts/radiuss-spack-configs |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
index 110c8308bf..5249664785 100644
--- a/.gitlab/jobs/tioga.yml
+++ b/.gitlab/jobs/tioga.yml
@@ -19,9 +19,9 @@
 
 # Compiler error preventing a test to succeed.
 # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2316335119
-cce_18_0_0:
+cce_18_0_1:
   variables:
-    SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.0 ${PROJECT_TIOGA_DEPS}"
+    SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.1 ${PROJECT_TIOGA_DEPS}"
   extends: .job_on_tioga
   allow_failure: true
 
@@ -37,12 +37,12 @@ cce_17_0_1:
     SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=17.0.1 ${PROJECT_TIOGA_DEPS}"
   extends: .job_on_tioga
 
-rocmcc_6_2_0_hip_desul_atomics:
+rocmcc_6_2_4_hip_desul_atomics:
   variables:
-    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0"
+    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4"
   extends: .job_on_tioga
 
-rocmcc_6_2_0_hip_openmp:
+rocmcc_6_2_4_hip_openmp:
   variables:
-    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0"
+    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4"
   extends: .job_on_tioga
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 8ad7a8632c..2425d8148a 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 8ad7a8632c391ae7a21fbbb5b082ba0010b56136
+Subproject commit 2425d8148a4a6a2aa2d51c7eb1f71a8392343fde

From ac0a68b8b01757416b1377be8ae0ab65337a0158 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Thu, 28 Nov 2024 12:51:16 +0100
Subject: [PATCH 07/27] Export hostconfig file as artifact

---
 .gitlab/custom-jobs-and-variables.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
index ca6f5f9011..1d68b86a89 100644
--- a/.gitlab/custom-jobs-and-variables.yml
+++ b/.gitlab/custom-jobs-and-variables.yml
@@ -70,6 +70,9 @@ variables:
   artifacts:
     reports:
       junit: junit.xml
+    name: "${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID}"
+    paths:
+      - ./*.cmake
 
 .reproducer_vars:
   script:

From 2806688eb9c4a732f120e722fc488608ac8a71d8 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:24:59 +0100
Subject: [PATCH 08/27] From RSC: Sync with Spack@develop-2024-12-01

---
 .uberenv_config.json          | 2 +-
 scripts/radiuss-spack-configs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index 24d40058b7..4a0d82bc76 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2024-10-06",
+"spack_branch": "develop-2024-12-01",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 2425d8148a..359f379f08 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 2425d8148a4a6a2aa2d51c7eb1f71a8392343fde
+Subproject commit 359f379f086c39954301de889d8b40053979c517

From 8cab0517e0657f2fad023d047fbfd8f8ca67100c Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 3 Dec 2024 09:54:20 +0100
Subject: [PATCH 09/27] Do not unload rocm module

---
 scripts/gitlab/build_and_test.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh
index 8c0a1a1185..9ab09322b8 100755
--- a/scripts/gitlab/build_and_test.sh
+++ b/scripts/gitlab/build_and_test.sh
@@ -202,10 +202,6 @@ then
     mkdir -p ${build_dir} && cd ${build_dir}
 
     timed_message "Building RAJA"
-    if [[ "${truehostname}" == "tioga" ]]
-    then
-        module unload rocm
-    fi
     $cmake_exe \
       -C ${hostconfig_path} \
       -DCMAKE_INSTALL_PREFIX=${install_dir} \

From abce5ffb0b431dafd43e359a29c1f61fa5a7e23b Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:07:10 +0100
Subject: [PATCH 10/27] Revert updating Spack because of problem with
 develop-2024-12-01

---
 .uberenv_config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index 4a0d82bc76..24d40058b7 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2024-12-01",
+"spack_branch": "develop-2024-10-06",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",

From 09a332014ca0bba9eb1e2a2f2866c3268f371fbd Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:51:00 +0100
Subject: [PATCH 11/27] Increase allocation for lassen job clang 16 +
 openmp-target

---
 .gitlab/jobs/lassen.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
index 7a8c2a5621..623c9c5b8f 100644
--- a/.gitlab/jobs/lassen.yml
+++ b/.gitlab/jobs/lassen.yml
@@ -63,5 +63,6 @@ gcc_8_3_1_cuda_11_7_desul_atomics:
 clang_16_0_6_omptarget:
   variables:
     SPEC: " ~shared +openmp +omptarget +tests %clang@=16.0.6.cuda.11.8.0.gcc.11.2.1"
+    LASSEN_JOB_ALLOC: "1 -W 60 -q pci"
   extends: .job_on_lassen
 

From 420c063c0fd6d44f199f31779b97b6b8483c03f5 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:05:50 +0100
Subject: [PATCH 12/27] Update Shared CI

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b263b8aa25..7b41489776 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: 'v2024.06.0'
+        ref: 'v2024.12.0'
         file: 'pipelines/${CI_MACHINE}.yml'
       - artifact: '${CI_MACHINE}-jobs.yml'
         job: 'generate-job-lists'
@@ -104,7 +104,7 @@ include:
     file: 'id_tokens.yml'
   # [Optional] checks preliminary to running the actual CI test
   - project: 'radiuss/radiuss-shared-ci'
-    ref: 'v2024.06.0'
+    ref: 'v2024.12.0'
     file: 'utilities/preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'

From 1196f0d38ef851c4ebc34be86254e3cf219deb9a Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 8 Jan 2025 18:21:58 +0100
Subject: [PATCH 13/27] From RSC: update to rocm 6.3.0 on tioga + sync with
 spack@develop + compiler rpaths

---
 .gitlab/jobs/tioga.yml        | 8 ++++----
 .uberenv_config.json          | 2 +-
 scripts/radiuss-spack-configs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
index 5249664785..e41f50e111 100644
--- a/.gitlab/jobs/tioga.yml
+++ b/.gitlab/jobs/tioga.yml
@@ -37,12 +37,12 @@ cce_17_0_1:
     SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=17.0.1 ${PROJECT_TIOGA_DEPS}"
   extends: .job_on_tioga
 
-rocmcc_6_2_4_hip_desul_atomics:
+rocmcc_6_3_0_hip_desul_atomics:
   variables:
-    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4"
+    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.3.0 ^hip@6.3.0"
   extends: .job_on_tioga
 
-rocmcc_6_2_4_hip_openmp:
+rocmcc_6_3_0_hip_openmp:
   variables:
-    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.2.4 ^hip@6.2.4"
+    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.3.0 ^hip@6.3.0"
   extends: .job_on_tioga
diff --git a/.uberenv_config.json b/.uberenv_config.json
index 24d40058b7..e695309414 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2024-10-06",
+"spack_branch": "develop",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 359f379f08..69d3ef1c88 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 359f379f086c39954301de889d8b40053979c517
+Subproject commit 69d3ef1c8836da14be85aa294cf460f1d9cc8360

From d496611bb4d589d1fcae4e54054dffc062f56005 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:11:11 +0100
Subject: [PATCH 14/27] From RSC: workarounds (rpath for missing lib)
 (requirement to enforce single compiler) + fix intel->oneapi missing
 migration

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 69d3ef1c88..abb459f707 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 69d3ef1c8836da14be85aa294cf460f1d9cc8360
+Subproject commit abb459f707063cffaf357a9edf98090b11d1f0ed

From b6e3f2fe7228580c98f9708f749741213f42e7cd Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:49:26 +0100
Subject: [PATCH 15/27] From RSC: update compiler used for SYCL testing

---
 .gitlab/jobs/corona.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml
index 930f394f94..814f6d3833 100644
--- a/.gitlab/jobs/corona.yml
+++ b/.gitlab/jobs/corona.yml
@@ -31,9 +31,9 @@ rocmcc_5_7_1_hip_desul_atomics:
     SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %rocmcc@=5.7.1 ^hip@5.7.1"
   extends: .job_on_corona
 
-clang_19_0_0_sycl_gcc_10_3_1_rocmcc_5_7_1_hip:
+clang_20_0_0_sycl_gcc_10_3_1_rocmcc_5_7_1_hip:
   variables:
-    SPEC: " ~shared +sycl ~openmp +tests %clang@=19.0.0 cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\""
+    SPEC: " ~shared +sycl ~openmp +tests %clang@=20.0.0 cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\""
     MODULE_LIST: "rocm/5.7.1"
   extends: .job_on_corona
 

From 41c1ebe83d7915d20df5918b000e1d4c1fdc8d85 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:04:37 +0100
Subject: [PATCH 16/27] Fix overridden intel jobs now oneapi

---
 .gitlab/jobs/poodle.yml | 4 ++--
 .gitlab/jobs/ruby.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml
index 8486266704..5e42cd21af 100644
--- a/.gitlab/jobs/poodle.yml
+++ b/.gitlab/jobs/poodle.yml
@@ -31,9 +31,9 @@ gcc_10_3_1:
 
 # custom variant
 # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843
-intel_2023_2_1:
+oneapi_2023_2_1:
   variables:
-    SPEC: "${PROJECT_POODLE_VARIANTS} +lowopttest cxxflags==-fp-model=precise %intel@=2023.2.1 ${PROJECT_POODLE_DEPS}"
+    SPEC: "${PROJECT_POODLE_VARIANTS} +lowopttest cxxflags==-fp-model=precise %oneapi@=2023.2.1 ${PROJECT_POODLE_DEPS}"
   extends: .job_on_poodle
 
 ############
diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml
index c745ca4a6c..aad255a351 100644
--- a/.gitlab/jobs/ruby.yml
+++ b/.gitlab/jobs/ruby.yml
@@ -31,9 +31,9 @@ gcc_10_3_1:
 
 # custom variant
 # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843
-intel_2023_2_1:
+oneapi_2023_2_1:
   variables:
-    SPEC: "${PROJECT_RUBY_VARIANTS} +lowopttest cxxflags==-fp-model=precise %intel@=2023.2.1 ${PROJECT_RUBY_DEPS}"
+    SPEC: "${PROJECT_RUBY_VARIANTS} +lowopttest cxxflags==-fp-model=precise %oneapi@=2023.2.1 ${PROJECT_RUBY_DEPS}"
   extends: .job_on_ruby
 
 ############

From ac22775a21a38e121e34ade54762f6b5cf70b5d0 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:52:56 +0100
Subject: [PATCH 17/27] From RSC: Update w.r.t. spack@develop-2024-01-12

---
 .uberenv_config.json          | 2 +-
 scripts/radiuss-spack-configs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index e695309414..d0406acd85 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop",
+"spack_branch": "develop-2025-01-12",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index abb459f707..b8d76a3d88 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit abb459f707063cffaf357a9edf98090b11d1f0ed
+Subproject commit b8d76a3d88b36d771f605b8af3c056b9803c5765

From 5e63e1ca984591a01f5630209dabd16626937d41 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 21 Jan 2025 21:56:24 +0100
Subject: [PATCH 18/27] Update module and prepend LD_LIBRARY_PATH for sycl
 build

---
 .gitlab/jobs/corona.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml
index 814f6d3833..00f13c9ad8 100644
--- a/.gitlab/jobs/corona.yml
+++ b/.gitlab/jobs/corona.yml
@@ -31,9 +31,11 @@ rocmcc_5_7_1_hip_desul_atomics:
     SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %rocmcc@=5.7.1 ^hip@5.7.1"
   extends: .job_on_corona
 
-clang_20_0_0_sycl_gcc_10_3_1_rocmcc_5_7_1_hip:
+clang_20_0_0_sycl_gcc_10_3_1_rocmcc_6_0_2_hip:
   variables:
     SPEC: " ~shared +sycl ~openmp +tests %clang@=20.0.0 cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\""
-    MODULE_LIST: "rocm/5.7.1"
+    MODULE_LIST: "rocm/6.0.2"
+    SYCL_PATH: "/usr/WS2/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/"
+    LD_LIBRARY_PATH: "${SYCL_PATH}/lib:${SYCL_PATH}/lib64:${LD_LIBRARY_PATH}"
   extends: .job_on_corona
 

From 92c22be537cdd19547ba7291cd1fe7ba2d270e4f Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 22 Jan 2025 11:12:05 +0100
Subject: [PATCH 19/27] Update RADIUSS Spack Configs

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index b8d76a3d88..991e007e60 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit b8d76a3d88b36d771f605b8af3c056b9803c5765
+Subproject commit 991e007e6030b12272ca189747e898291bc677f2

From 3f590c1639b169d1f93e6ae3b24eba59adbc5356 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 22 Jan 2025 11:31:52 +0100
Subject: [PATCH 20/27] From RSC: change tioga gcc to be coherent with
 available cray-mpich

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 991e007e60..aec5d3e5c0 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 991e007e6030b12272ca189747e898291bc677f2
+Subproject commit aec5d3e5c052baa9fb33db2dba5c34dacb3c6c26

From 25c39e04129dd360e0a54dd660b7305a690d998f Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 22 Jan 2025 20:48:06 +0100
Subject: [PATCH 21/27] Update RADIUSS Spack Configs to new release

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index aec5d3e5c0..e74d9ed6bc 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit aec5d3e5c052baa9fb33db2dba5c34dacb3c6c26
+Subproject commit e74d9ed6bc6dbb2092b895602cfd5f559ff52760

From e5e3d88a5a8c1313dfc4932457432776adf7666d Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 4 Feb 2025 10:26:03 +0100
Subject: [PATCH 22/27] Update uberenv and spack, better support of split
 environments

---
 .uberenv_config.json | 2 +-
 scripts/uberenv      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index d0406acd85..1f2a79da93 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2025-01-12",
+"spack_branch": "develop-2025-02-02",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
diff --git a/scripts/uberenv b/scripts/uberenv
index 06933746d8..44ab4ca475 160000
--- a/scripts/uberenv
+++ b/scripts/uberenv
@@ -1 +1 @@
-Subproject commit 06933746d88ee3ea6b6b9a37cff68b71510daad2
+Subproject commit 44ab4ca4751d570535a7941e7d0c2f613ec2502e

From 5c1c672265fbe2714cf9724929864b36d0d663bc Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:31:30 +0100
Subject: [PATCH 23/27] Do not try to setup clingo with spack

---
 .uberenv_config.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index 1f2a79da93..0a92ad606e 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -5,9 +5,8 @@
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
 "spack_branch": "develop-2025-02-02",
-"spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
 "spack_concretizer": "clingo",
-"spack_setup_clingo": false
+"spack_setup_clingo": "false"
 }

From 6d0d5158885d0d80a12a5cd7c5e7b13e94828005 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:40:44 +0100
Subject: [PATCH 24/27] Update Uberenv + Update Spack to fix bug

---
 .uberenv_config.json | 4 ++--
 scripts/uberenv      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index 0a92ad606e..6175aac022 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,9 +4,9 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2025-02-02",
+"spack_commit": "4487598d60fd54f765dd813dccc97dadea80d6b1",
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
 "spack_concretizer": "clingo",
-"spack_setup_clingo": "false"
+"spack_setup_clingo": false
 }
diff --git a/scripts/uberenv b/scripts/uberenv
index 44ab4ca475..6ba67dcbd7 160000
--- a/scripts/uberenv
+++ b/scripts/uberenv
@@ -1 +1 @@
-Subproject commit 44ab4ca4751d570535a7941e7d0c2f613ec2502e
+Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd

From 64666071280d75604b9e835b13748e60b67358bf Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Fri, 7 Feb 2025 15:32:35 +0100
Subject: [PATCH 25/27] From RSC: Set upper limit for FMT version in Umpire due
 to bug

---
 scripts/radiuss-spack-configs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index e74d9ed6bc..5d16f366c1 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit e74d9ed6bc6dbb2092b895602cfd5f559ff52760
+Subproject commit 5d16f366c1ee1e0db4491f856e82c3c600fef0a1

From 44cfea540bbf2f94a120b141fd9db0277f395f78 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 10 Feb 2025 20:23:59 +0100
Subject: [PATCH 26/27] Update Spack to snapshot release + RSC merge

---
 .uberenv_config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index 6175aac022..b68773f127 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_commit": "4487598d60fd54f765dd813dccc97dadea80d6b1",
+"spack_commit": "develop-2025-02-09",
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
 "spack_concretizer": "clingo",

From 0dc84f6eef9fc29759fc25df4aa7ab377c543caa Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 10 Feb 2025 20:53:45 +0100
Subject: [PATCH 27/27] Fix

---
 .uberenv_config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.uberenv_config.json b/.uberenv_config.json
index b68773f127..be03e85915 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_commit": "develop-2025-02-09",
+"spack_branch": "develop-2025-02-09",
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",
 "spack_concretizer": "clingo",