From 2a42791660321de1d2831d4075b78005b873eb67 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 29 Sep 2025 11:38:02 +0200
Subject: [PATCH 01/11] Update to spack v1

---
 .gitlab-ci.yml                   |  4 +--
 .gitlab/jobs/lassen.yml          | 32 ++++++++++++------------
 .gitlab/subscribed-pipelines.yml | 42 ++++++++++++++++++++++++++++++++
 .uberenv_config.json             |  4 +--
 scripts/radiuss-spack-configs    |  2 +-
 scripts/uberenv                  |  2 +-
 6 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4be376bd..595befa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: 'v2025.06.0'
+        ref: 'v2025.09.0'
         file: 'pipelines/${CI_MACHINE}.yml'
       - artifact: '${CI_MACHINE}-jobs.yml'
         job: 'generate-job-lists'
@@ -89,7 +89,7 @@ include:
     file: 'id_tokens.yml'
   # [Optional] checks preliminary to running the actual CI test
   #- project: 'radiuss/radiuss-shared-ci'
-  #  ref: 'v2025.06.0'
+  #  ref: 'v2025.09.0'
   #  file: 'preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'
diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
index 79901054..47f2bad4 100644
--- a/.gitlab/jobs/lassen.yml
+++ b/.gitlab/jobs/lassen.yml
@@ -33,35 +33,35 @@ gcc_11_2_1_cuda_11_8_0:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-clang_12_0_1_libcpp:
-  extends: .job_on_lassen
-  variables:
-    SPEC: "~shared +raja tests=basic %clang@12.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"
+#clang_12_0_1_libcpp:
+#  extends: .job_on_lassen
+#  variables:
+#    SPEC: "~shared +raja tests=basic %clang@12.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"
 
 clang_16_0_6_libcpp:
   extends: .job_on_lassen
   variables:
-    SPEC: "~shared +raja tests=basic %clang@16.0.6 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"
+    SPEC: "~shared +raja tests=basic %clang-16 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"
 
-clang_12_0_1_gcc_8_3_1_memleak:
-  extends: .job_on_lassen
-  variables:
-    SPEC: "~shared +raja tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
-    ASAN_OPTIONS: "detect_leaks=1"
+#clang_12_0_1_gcc_8_3_1_memleak:
+#  extends: .job_on_lassen
+#  variables:
+#    SPEC: "~shared +raja tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
+#    ASAN_OPTIONS: "detect_leaks=1"
 
 clang_16_0_6_gcc_8_3_1_memleak:
   extends: .job_on_lassen
   variables:
-    SPEC: "~shared +raja tests=basic %clang@16.0.6.gcc.8.3.1 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
+    SPEC: "~shared +raja tests=basic %clang-16 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
     ASAN_OPTIONS: "detect_leaks=1"
 
-clang_12_0_1_datarace:
-  extends: .job_on_lassen
-  variables:
-    SPEC: "~shared +raja tests=basic %clang@12.0.1 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"
+#clang_12_0_1_datarace:
+#  extends: .job_on_lassen
+#  variables:
+#    SPEC: "~shared +raja tests=basic %clang@12.0.1 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"
 
 clang_16_0_6_datarace:
   extends: .job_on_lassen
   variables:
-    SPEC: "~shared +raja tests=basic %clang@16.0.6 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"
+    SPEC: "~shared +raja tests=basic %clang-16 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"
 
diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml
index 14ac565e..5f630371 100644
--- a/.gitlab/subscribed-pipelines.yml
+++ b/.gitlab/subscribed-pipelines.yml
@@ -55,57 +55,99 @@ dane-up-check:
   variables:
     CI_MACHINE: "dane"
   extends: [.machine-check]
+  rules:
+    # Runs except if we explicitly deactivate dane by variable.
+    - if: '$ON_DANE == "OFF"'
+      when: never
+    - when: on_success
 
 dane-build-and-test:
   variables:
     CI_MACHINE: "dane"
   needs: [dane-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    # Runs except if we explicitly deactivate dane by variable.
+    - if: '$ON_DANE == "OFF"'
+      when: never
+    - when: on_success
 
 # CORONA
 corona-up-check:
   variables:
     CI_MACHINE: "corona"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_CORONA == "OFF"'
+      when: never
+    - when: on_success
 
 corona-build-and-test:
   variables:
     CI_MACHINE: "corona"
   needs: [corona-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_CORONA == "OFF"'
+      when: never
+    - when: on_success
 
 # TIOGA
 tioga-up-check:
   variables:
     CI_MACHINE: "tioga"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_TIOGA == "OFF"'
+      when: never
+    - when: on_success
 
 tioga-build-and-test:
   variables:
     CI_MACHINE: "tioga"
   needs: [tioga-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_TIOGA == "OFF"'
+      when: never
+    - when: on_success
 
 # TUOLUMNE
 tuolumne-up-check:
   variables:
     CI_MACHINE: "tuolumne"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_TUOLUMNE == "OFF"'
+      when: never
+    - when: on_success
 
 tuolumne-build-and-test:
   variables:
     CI_MACHINE: "tuolumne"
   needs: [tuolumne-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_TUOLUMNE == "OFF"'
+      when: never
+    - when: on_success
 
 # LASSEN
 lassen-up-check:
   variables:
     CI_MACHINE: "lassen"
   extends: [.machine-check]
+  rules:
+    - if: '$ON_LASSEN == "OFF"'
+      when: never
+    - when: on_success
 
 lassen-build-and-test:
   variables:
     CI_MACHINE: "lassen"
   needs: [lassen-up-check, generate-job-lists]
   extends: [.build-and-test]
+  rules:
+    - if: '$ON_LASSEN == "OFF"'
+      when: never
+    - when: on_success
diff --git a/.uberenv_config.json b/.uberenv_config.json
index 6dc61326..38485328 100644
--- a/.uberenv_config.json
+++ b/.uberenv_config.json
@@ -4,8 +4,8 @@
 "package_final_phase" : "initconfig",
 "package_source_dir" : "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_commit": "280017a9ba3f6a969743deca0eebc96e7c0e5cfd",
+"spack_branch": "v1.0.2",
 "spack_configs_path": "scripts/radiuss-spack-configs",
-"spack_packages_path": "scripts/radiuss-spack-configs/packages",
+"spack_packages_path": "scripts/radiuss-spack-configs/spack_repo/llnl_radiuss/packages",
 "spack_setup_clingo": false
 }
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index dcf80758..4a516060 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit dcf807584584cb1ca4dca1d5cbf8b320bf73567e
+Subproject commit 4a516060a785c434780970246349db0773353072
diff --git a/scripts/uberenv b/scripts/uberenv
index 6ba67dcb..b0356984 160000
--- a/scripts/uberenv
+++ b/scripts/uberenv
@@ -1 +1 @@
-Subproject commit 6ba67dcbd7ccbb9c03920b89de19ac959e2c3bdd
+Subproject commit b03569845051ce2ec396a1dfba5ecc8142c7d657

From dd60b2e095536cef6811325cb7f9d49ef8bf3c94 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 29 Sep 2025 15:35:10 +0200
Subject: [PATCH 02/11] Point at uberenv@main with merged changes

---
 scripts/uberenv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/uberenv b/scripts/uberenv
index b0356984..eb185358 160000
--- a/scripts/uberenv
+++ b/scripts/uberenv
@@ -1 +1 @@
-Subproject commit b03569845051ce2ec396a1dfba5ecc8142c7d657
+Subproject commit eb1853586821360613f1c6c415ebf65d370a47e7

From 45d86a4f7d04ff9712dbcb7ccc2032527ee33025 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Mon, 29 Sep 2025 15:35:40 +0200
Subject: [PATCH 03/11] Update Spack in 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 4a516060..0bdad350 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 4a516060a785c434780970246349db0773353072
+Subproject commit 0bdad3500b5a18fd57b9f83a1eec9c15dd3b4b50

From 095ff0cf1b3fb89c3172a2dc6955386b26ec58bf Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 30 Sep 2025 10:29:49 +0200
Subject: [PATCH 04/11] Point at new RSC 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 0bdad350..b39030f6 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 0bdad3500b5a18fd57b9f83a1eec9c15dd3b4b50
+Subproject commit b39030f680263f6c15c7dfe510fa6ffdb9482136

From 740c42c404ea038d557ec38a881aaa4c4e54b798 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Tue, 30 Sep 2025 10:44:22 +0200
Subject: [PATCH 05/11] Fix ordering in CI jobs specs

---
 .gitlab/jobs/lassen.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
index 47f2bad4..06b2c533 100644
--- a/.gitlab/jobs/lassen.yml
+++ b/.gitlab/jobs/lassen.yml
@@ -36,32 +36,32 @@ gcc_11_2_1_cuda_11_8_0:
 #clang_12_0_1_libcpp:
 #  extends: .job_on_lassen
 #  variables:
-#    SPEC: "~shared +raja tests=basic %clang@12.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"
+#    SPEC: "~shared +raja tests=basic cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises %clang@12.0.1"
 
 clang_16_0_6_libcpp:
   extends: .job_on_lassen
   variables:
-    SPEC: "~shared +raja tests=basic %clang-16 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"
+    SPEC: "~shared +raja tests=basic cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" %clang-16 ^raja~examples~exercises"
 
 #clang_12_0_1_gcc_8_3_1_memleak:
 #  extends: .job_on_lassen
 #  variables:
-#    SPEC: "~shared +raja tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
+#    SPEC: "~shared +raja tests=basic cxxflags==\"-fsanitize=address\" %clang@12.0.1.gcc.8.3.1 ^raja~examples~exercises"
 #    ASAN_OPTIONS: "detect_leaks=1"
 
 clang_16_0_6_gcc_8_3_1_memleak:
   extends: .job_on_lassen
   variables:
-    SPEC: "~shared +raja tests=basic %clang-16 cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
+    SPEC: "~shared +raja tests=basic cxxflags==\"-fsanitize=address\" %clang-16 ^raja~examples~exercises"
     ASAN_OPTIONS: "detect_leaks=1"
 
 #clang_12_0_1_datarace:
 #  extends: .job_on_lassen
 #  variables:
-#    SPEC: "~shared +raja tests=basic %clang@12.0.1 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"
+#    SPEC: "~shared +raja tests=basic cxxflags==\"-fsanitize=thread\" %clang@12.0.1 ^raja~examples~exercises"
 
 clang_16_0_6_datarace:
   extends: .job_on_lassen
   variables:
-    SPEC: "~shared +raja tests=basic %clang-16 cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"
+    SPEC: "~shared +raja tests=basic cxxflags==\"-fsanitize=thread\" %clang-16 ^raja~examples~exercises"
 

From 04feb39031037ae0bef6f817726ce5c13954d04e Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 1 Oct 2025 12:26:46 +0200
Subject: [PATCH 06/11] Update RSC with packages and configs updates

---
 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 b39030f6..4dac97ec 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit b39030f680263f6c15c7dfe510fa6ffdb9482136
+Subproject commit 4dac97ec251994e9c4f30e4eb29f5377b8956166

From 45aeb89e0dd42acf6a76cacce09d62acd48d94d0 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Wed, 1 Oct 2025 16:13:56 +0200
Subject: [PATCH 07/11] Add Matrix

---
 .gitlab-ci.yml                        |  4 ++--
 .gitlab/custom-jobs-and-variables.yml | 11 +++++++++++
 .gitlab/jobs/matrix.yml               | 27 +++++++++++++++++++++++++++
 .gitlab/subscribed-pipelines.yml      | 24 ++++++++++++++++++++++++
 scripts/radiuss-spack-configs         |  2 +-
 5 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 .gitlab/jobs/matrix.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 595befa3..b27d8651 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: 'v2025.09.0'
+        ref: 'v2025.09.1'
         file: 'pipelines/${CI_MACHINE}.yml'
       - artifact: '${CI_MACHINE}-jobs.yml'
         job: 'generate-job-lists'
@@ -89,7 +89,7 @@ include:
     file: 'id_tokens.yml'
   # [Optional] checks preliminary to running the actual CI test
   #- project: 'radiuss/radiuss-shared-ci'
-  #  ref: 'v2025.09.0'
+  #  ref: 'v2025.09.1'
   #  file: 'preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'
diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
index faf7a2f1..33431062 100644
--- a/.gitlab/custom-jobs-and-variables.yml
+++ b/.gitlab/custom-jobs-and-variables.yml
@@ -23,6 +23,17 @@ variables:
 # Project specific deps for dane
   PROJECT_DANE_DEPS: "^raja~examples~exercises "
 
+# Matrix
+# Arguments for top level allocation
+  MATRIX_SHARED_ALLOC: "--exclusive --time=7 --nodes=1"
+# Arguments for job level allocation
+# Note: We repeat the reservation, necessary when jobs are manually re-triggered.
+  MATRIX_JOB_ALLOC: "--overlap --nodes=1"
+# Project specific variants for matrix
+  PROJECT_MATRIX_VARIANTS: "~shared +raja tests=basic +cuda cuda_arch=75"
+# Project specific deps for matrix
+  PROJECT_MATRIX_DEPS: "^raja~examples~exercises "
+
 # Corona
 # Arguments for top level allocation
   CORONA_SHARED_ALLOC: "--exclusive --time-limit=9m --nodes=1"
diff --git a/.gitlab/jobs/matrix.yml b/.gitlab/jobs/matrix.yml
new file mode 100644
index 00000000..05c1c6b2
--- /dev/null
+++ b/.gitlab/jobs/matrix.yml
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2016-25, Lawrence Livermore National Security, LLC and CHAI
+# project contributors. See the CHAI LICENSE file for details.
+#
+# SPDX-License-Identifier: (MIT)
+###############################################################################
+
+# Override reproducer section to define projet specific variables.
+.matrix_reproducer_vars:
+  script:
+    - !reference [.reproducer_vars, script]
+
+########################
+# Overridden shared jobs
+########################
+# We duplicate the shared jobs description and add necessary changes for this
+# project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
+# So that the comparison with the original job is easier.
+
+# No overridden jobs so far.
+
+############
+# Extra jobs
+############
+# We do not recommend using ${PROJECT_<MACHINE>_VARIANTS} and
+# ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
+# describe the spec here.
diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml
index 89385060..53203906 100644
--- a/.gitlab/subscribed-pipelines.yml
+++ b/.gitlab/subscribed-pipelines.yml
@@ -38,12 +38,14 @@ generate-job-lists:
     LOCAL_JOBS_PATH: ".gitlab/jobs"
   script:
     - cat ${RADIUSS_JOBS_PATH}/dane.yml ${LOCAL_JOBS_PATH}/dane.yml > dane-jobs.yml
+    - cat ${RADIUSS_JOBS_PATH}/matrix.yml ${LOCAL_JOBS_PATH}/matrix.yml > matrix-jobs.yml
     - cat ${RADIUSS_JOBS_PATH}/corona.yml ${LOCAL_JOBS_PATH}/corona.yml > corona-jobs.yml
     - cat ${RADIUSS_JOBS_PATH}/tioga.yml ${LOCAL_JOBS_PATH}/tioga.yml > tioga-jobs.yml
     - cat ${RADIUSS_JOBS_PATH}/tuolumne.yml ${LOCAL_JOBS_PATH}/tuolumne.yml > tuolumne-jobs.yml
   artifacts:
     paths:
       - dane-jobs.yml
+      - matrix-jobs.yml
       - corona-jobs.yml
       - tioga-jobs.yml
       - tuolumne-jobs.yml
@@ -70,6 +72,28 @@ dane-build-and-test:
       when: never
     - when: on_success
 
+# MATRIX
+matrix-up-check:
+  variables:
+    CI_MACHINE: "matrix"
+  extends: [.machine-check]
+  rules:
+    # Runs except if we explicitly deactivate matrix by variable.
+    - if: '$ON_MATRIX == "OFF"'
+      when: never
+    - when: on_success
+
+matrix-build-and-test:
+  variables:
+    CI_MACHINE: "matrix"
+  needs: [matrix-up-check, generate-job-lists]
+  extends: [.build-and-test]
+  rules:
+    # Runs except if we explicitly deactivate matrix by variable.
+    - if: '$ON_MATRIX == "OFF"'
+      when: never
+    - when: on_success
+
 # CORONA
 corona-up-check:
   variables:
diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
index 4dac97ec..2b1f50d1 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 4dac97ec251994e9c4f30e4eb29f5377b8956166
+Subproject commit 2b1f50d135a497b06e29b9065fc50baf9766283c

From 30780c889f0fa52d164563152e054c2ebf4204e3 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Thu, 30 Oct 2025 22:52:42 +0100
Subject: [PATCH 08/11] Point at radiuss-spack-configs correponding 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 4dac97ec..a98900c1 160000
--- a/scripts/radiuss-spack-configs
+++ b/scripts/radiuss-spack-configs
@@ -1 +1 @@
-Subproject commit 4dac97ec251994e9c4f30e4eb29f5377b8956166
+Subproject commit a98900c19c37175b630773c26e7b5467312e89e5

From c0a1af74ea1225056b208f8a1695e5ba6ab36c0a Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Thu, 30 Oct 2025 22:58:04 +0100
Subject: [PATCH 09/11] Use pdebug on matrix

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

diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
index 33431062..9d2bfac1 100644
--- a/.gitlab/custom-jobs-and-variables.yml
+++ b/.gitlab/custom-jobs-and-variables.yml
@@ -25,10 +25,10 @@ variables:
 
 # Matrix
 # Arguments for top level allocation
-  MATRIX_SHARED_ALLOC: "--exclusive --time=7 --nodes=1"
+  MATRIX_SHARED_ALLOC: "--exclusive --partition=pdebug --time=7 --nodes=1"
 # Arguments for job level allocation
 # Note: We repeat the reservation, necessary when jobs are manually re-triggered.
-  MATRIX_JOB_ALLOC: "--overlap --nodes=1"
+  MATRIX_JOB_ALLOC: "--partition=pdebug --overlap --nodes=1"
 # Project specific variants for matrix
   PROJECT_MATRIX_VARIANTS: "~shared +raja tests=basic +cuda cuda_arch=75"
 # Project specific deps for matrix

From 73135981d09ad791cf40fd22a398341350cc48e5 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Thu, 13 Nov 2025 15:00:36 +0100
Subject: [PATCH 10/11] Fix: Add matrix cores count + use ci reservation

---
 .gitlab/custom-jobs-and-variables.yml | 4 ++--
 scripts/gitlab/build_and_test.sh      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
index 9d2bfac1..e77c1c35 100644
--- a/.gitlab/custom-jobs-and-variables.yml
+++ b/.gitlab/custom-jobs-and-variables.yml
@@ -25,10 +25,10 @@ variables:
 
 # Matrix
 # Arguments for top level allocation
-  MATRIX_SHARED_ALLOC: "--exclusive --partition=pdebug --time=7 --nodes=1"
+  MATRIX_SHARED_ALLOC: "--exclusive --reservation=ci --time=7 --nodes=1"
 # Arguments for job level allocation
 # Note: We repeat the reservation, necessary when jobs are manually re-triggered.
-  MATRIX_JOB_ALLOC: "--partition=pdebug --overlap --nodes=1"
+  MATRIX_JOB_ALLOC: "--reservation=ci --overlap --nodes=1"
 # Project specific variants for matrix
   PROJECT_MATRIX_VARIANTS: "~shared +raja tests=basic +cuda cuda_arch=75"
 # Project specific deps for matrix
diff --git a/scripts/gitlab/build_and_test.sh b/scripts/gitlab/build_and_test.sh
index 3b4a3fbc..a9720405 100755
--- a/scripts/gitlab/build_and_test.sh
+++ b/scripts/gitlab/build_and_test.sh
@@ -210,7 +210,7 @@ then
     timed_message "Cleaning working directory"
 
     # Map CPU core allocations
-    declare -A core_counts=(["lassen"]=40 ["poodle"]=28 ["dane"]=28 ["corona"]=32 ["rzansel"]=48 ["tioga"]=32 ["tuolumne"]=48)
+    declare -A core_counts=(["lassen"]=40 ["poodle"]=28 ["dane"]=28 ["matrix"]=28 ["corona"]=32 ["rzansel"]=48 ["tioga"]=32 ["tuolumne"]=48)
 
     # If building, then delete everything first
     # NOTE: 'cmake --build . -j core_counts' attempts to reduce individual build resources.

From 2b7305e045c63f4cf826f2b0f5e86ef0bf734da0 Mon Sep 17 00:00:00 2001
From: "Adrien M. BERNEDE" <51493078+adrienbernede@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:51:37 +0100
Subject: [PATCH 11/11] Fix: CI partition instead of reservation on matrix

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

diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
index e77c1c35..91537b3b 100644
--- a/.gitlab/custom-jobs-and-variables.yml
+++ b/.gitlab/custom-jobs-and-variables.yml
@@ -25,10 +25,10 @@ variables:
 
 # Matrix
 # Arguments for top level allocation
-  MATRIX_SHARED_ALLOC: "--exclusive --reservation=ci --time=7 --nodes=1"
+  MATRIX_SHARED_ALLOC: "--exclusive --partition=pci --time=7 --nodes=1"
 # Arguments for job level allocation
 # Note: We repeat the reservation, necessary when jobs are manually re-triggered.
-  MATRIX_JOB_ALLOC: "--reservation=ci --overlap --nodes=1"
+  MATRIX_JOB_ALLOC: "--partition=pci --overlap --nodes=1"
 # Project specific variants for matrix
   PROJECT_MATRIX_VARIANTS: "~shared +raja tests=basic +cuda cuda_arch=75"
 # Project specific deps for matrix