V2025.12.0 RC to merge into main

.github/workflows/build.yml

@@ -4,7 +4,7 @@ jobs:
   build_docker:
     strategy:
       matrix:
-        target: [gcc12_debug, gcc13, clang13, clang14_debug, clang15, rocm6, rocm6_desul, intel2024, intel2024_debug, intel2024_sycl]
+        target: [gcc12, gcc12_debug, gcc13, gcc13_desul, clang14_debug, clang14_style, clang14_desul, intel2024_0, intel2024_0_debug, intel2024_0_sycl, rocm6_4_3_desul]
     runs-on: ubuntu-latest
     steps:
     - run: |

.gitlab-ci.yml

@@ -78,7 +78,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: 'v2025.06.0'
+        ref: 'v2025.09.1'
         file: 'pipelines/${CI_MACHINE}.yml'
       - artifact: '${CI_MACHINE}-jobs.yml'
         job: 'generate-job-lists'
@@ -107,7 +107,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.1'
     file: 'utilities/preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'

.gitlab/custom-jobs-and-variables.yml

@@ -22,6 +22,16 @@ variables:
 # Project specific deps for dane
   PROJECT_DANE_DEPS:
 
+# Matrix
+# Arguments for top level allocation
+  MATRIX_SHARED_ALLOC: "--exclusive --partition=pci --time=60 --nodes=1"
+# Arguments for job level allocation
+  MATRIX_JOB_ALLOC: "--partition=pci --nodes=1"
+# Project specific variants for matrix
+  PROJECT_MATRIX_VARIANTS: "~shared +cuda cuda_arch=90 +tests"
+# Project specific deps for matrix
+  PROJECT_MATRIX_DEPS:
+
 # Corona
 # Arguments for top level allocation
   CORONA_SHARED_ALLOC: "--exclusive --time-limit=60m --nodes=1 -o per-resource.count=2"
@@ -44,7 +54,7 @@ variables:
 
 # Tuolumne
 # Arguments for top level allocation
-  TUOLUMNE_SHARED_ALLOC: "--exclusive --queue=pci --time-limit=60m --nodes=1 -o per-resource.count=2"
+  TUOLUMNE_SHARED_ALLOC: "--exclusive --queue=pci --time-limit=90m --nodes=1 -o per-resource.count=2"
 # Arguments for job level allocation
   TUOLUMNE_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
 # Project specific variants for corona

.gitlab/jobs/corona.yml

@@ -17,7 +17,7 @@
 # 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.
+## rocm 5.7.1 job is in the shared RSC set of jobs
 
 ############
 # Extra jobs
@@ -26,16 +26,20 @@
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
+rocmcc_5_7_1_hip_openmp:
+  variables:
+    SPEC: " ~shared +rocm +openmp +tests +vectorization amdgpu_target=gfx906 %llvm-amdgpu@=5.7.1 ^[email protected]"
+  extends: .job_on_corona
+
 rocmcc_5_7_1_hip_desul_atomics:
   variables:
-    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %rocmcc@=5.7.1 ^[email protected]"
+    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %llvm-amdgpu@=5.7.1 ^[email protected]"
   extends: .job_on_corona
 
-clang_20_0_0_sycl_gcc_10_3_1_rocmcc_6_0_2_hip:
+clang_22_0_0_sycl_gcc_10_3_1_rocmcc_6_4_2:
   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/6.0.2"
-    SYCL_PATH: "/usr/WS2/raja-dev/clang_sycl_730cd3a5275f_hip_gcc10.3.1_rocm6.0.2/"
+    SPEC: " ~shared +sycl ~openmp +tests cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\" %sycl-clang-22-gcc-10"
+    MODULE_LIST: "rocm/6.4.2"
+    SYCL_PATH: "/usr/workspace/raja-dev/clang_sycl_16b7bcb09915_hip_gcc10.3.1_rocm6.4.2"
     LD_LIBRARY_PATH: "${SYCL_PATH}/lib:${SYCL_PATH}/lib64:${LD_LIBRARY_PATH}"
   extends: .job_on_corona
-

.gitlab/jobs/dane.yml

@@ -17,24 +17,23 @@
 # project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
 # when possible so that the comparison with the original job is easier.
 
-# Identical to shared job, but use OpenMP tasks and no vectorization
-clang_14_0_6:
-  variables:
-    SPEC: " ~shared +openmp +omptask ~vectorization +tests %clang@=14.0.6 ${PROJECT_POODLE_DEPS}"
+# Shared job uses %clang-19-gcc-13, replaced with %clang-19 below
+clang_19_1_3_gcc_13_3_1:
   extends: .job_on_dane
-
-# Identical to shared job, but use OpenMP tasks and no vectorization
-gcc_10_3_1:
   variables:
-    SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_POODLE_DEPS}"
+    ON_DANE: "OFF"
+
+# Shared job uses %oneapi-2025-gcc-10, replaced with %oneapi@=2025.2 below
+oneapi_2025_2_0_gcc_10_3_1:
   extends: .job_on_dane
+  variables:
+    ON_DANE: "OFF"
+
+## gcc 13.3.1 job is in the shared RSC set of jobs
 
-# custom variant
+# Similar to shared RSC job, but use OpenMP task, turn off vectorization,
+# and lower optimization level to get correct results
 # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843
-oneapi_2023_2_1:
-  variables:
-    SPEC: "${PROJECT_POODLE_VARIANTS} +lowopttest cxxflags==-fp-model=precise %oneapi@=2023.2.1 ${PROJECT_POODLE_DEPS}"
-  extends: .job_on_dane
 
 ############
 # Extra jobs
@@ -43,18 +42,32 @@ oneapi_2023_2_1:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-clang_14_0_6_openmp_off:
+clang_14_0_6:
+  variables:
+    SPEC: " ~shared +openmp +omptask ~vectorization +tests %llvm@=14.0.6"
+  extends: .job_on_dane
+
+clang_19_1_3:
+  variables:
+    SPEC: " ~shared +openmp +tests %llvm@=19.1.3"
+  extends: .job_on_dane
+
+gcc_10_3_1:
+  variables:
+    SPEC: " ~shared +openmp +omptask ~vectorization +tests %gcc@=10.3.1 ${PROJECT_DANE_DEPS}"
+  extends: .job_on_dane
+
+gcc_12_1_1:
   variables:
-    SPEC: " ~shared ~openmp +tests %clang@=14.0.6"
+    SPEC: " ~shared +openmp +tests %gcc@=12.1.1"
   extends: .job_on_dane
 
-gcc_10_3_1_openmp_default:
+clang_14_0_6_gcc_11_2_1_desul_atomics:
   variables:
-    SPEC: " ~shared +tests %gcc@=10.3.1"
+    SPEC: " ~shared +openmp +tests +desul %clang-14-gcc-11"
   extends: .job_on_dane
 
-# OTHERS
-clang_14_0_6_gcc_10_3_1_desul_atomics:
+oneapi_2025_2_0:
   variables:
-    SPEC: " ~shared +openmp +tests +desul %clang@=14.0.6.gcc.10.3.1"
+    SPEC: "~shared +openmp +vectorization +tests cxxflags==-fp-model=precise %oneapi@=2025.2.0"
   extends: .job_on_dane

.gitlab/jobs/matrix.yml

@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2016-25, Lawrence Livermore National Security, LLC
+# and RAJA project contributors. See the RAJA/LICENSE file for details.
+#
+# SPDX-License-Identifier: (BSD-3-Clause)
+##############################################################################
+
+# Override reproducer section to define project 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}
+# when possible so that the comparison with the original job is easier.
+
+# Shared job uses toolchain %clang-18-gcc-13, replaced with %llvm@=18.1.8 below
+clang_18_1_1_gcc_13_cuda_12_6_0:
+  extends: .job_on_matrix
+  variables:
+    ON_MATRIX: "OFF"
+
+############
+# 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.
+
+# clang_18_1_8_cuda_12_6_0
+clang_18_1_8_cuda_12_6_0:
+  variables:
+    SPEC: " ~shared +cuda cuda_arch=90 %llvm@=18.1.8 ^[email protected]+allow-unsupported-compilers"
+  extends: .job_on_matrix
+  allow_failure: true
+

.gitlab/jobs/tioga.yml

@@ -17,13 +17,9 @@
 # project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
 # So that the comparison with the original job is easier.
 
-# Compiler error preventing a test to succeed.
-# https://github.com/LLNL/RAJA/pull/1712#issuecomment-2316335119
-cce_18_0_1:
-  variables:
-    SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.1 ${PROJECT_TIOGA_DEPS}"
-  extends: .job_on_tioga
-  allow_failure: true
+## NOTE: rocm 6.4.1 job is in the shared RSC set of jobs
+
+## NOTE: cce 20.0.0 job is in the shared RSC set of jobs
 
 ############
 # Extra jobs
@@ -32,17 +28,12 @@ cce_18_0_1:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-cce_19_0_0:
-  variables:
-    SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=19.0.0 ${PROJECT_TIOGA_DEPS}"
-  extends: .job_on_tioga
-
 rocmcc_6_4_1_hip_desul_atomics:
   variables:
-    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.4.1 ^[email protected]"
+    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %llvm-amdgpu@=6.4.1 ^[email protected]"
   extends: .job_on_tioga
 
 rocmcc_6_4_1_hip_openmp:
   variables:
-    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.4.1 ^[email protected]"
+    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %llvm-amdgpu@=6.4.1 ^[email protected]"
   extends: .job_on_tioga

.gitlab/jobs/tuolumne.yml

@@ -17,13 +17,9 @@
 # project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
 # So that the comparison with the original job is easier.
 
-# Compiler error preventing a test to succeed.
-# https://github.com/LLNL/RAJA/pull/1712#issuecomment-2316335119
-cce_18_0_1:
-  variables:
-    SPEC: "${PROJECT_TUOLUMNE_VARIANTS} %cce@=18.0.1 ${PROJECT_TUOLUMNE_DEPS}"
-  extends: .job_on_tuolumne
-  allow_failure: true
+## cce 20.0.0 job is in the shared RSC set of jobs
+
+## rocm 6.4.1 job is in the shared RSC set of jobs
 
 ############
 # Extra jobs
@@ -32,17 +28,12 @@ cce_18_0_1:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-cce_19_0_0:
-  variables:
-    SPEC: "${PROJECT_TUOLUMNE_VARIANTS} %cce@=19.0.0 ${PROJECT_TUOLUMNE_DEPS}"
-  extends: .job_on_tuolumne
-
 rocmcc_6_4_1_hip_desul_atomics:
   variables:
-    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx942 %rocmcc@=6.4.1 ^[email protected]"
+    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx942 %llvm-amdgpu@=6.4.1 ^[email protected]"
   extends: .job_on_tuolumne
 
 rocmcc_6_4_1_hip_openmp:
   variables:
-    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx942 %rocmcc@=6.4.1 ^[email protected]"
+    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx942 %llvm-amdgpu@=6.4.1 ^[email protected]"
   extends: .job_on_tuolumne

.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
@@ -53,45 +55,101 @@ 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
+
+# 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:
     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