Update RSC with rocm 6.4.1, add tuolumne and dane (#317)

* Update RSC to v2025.06.0 (rocm 6.4.1, adding tuolumne and moving from poodle to dane)

Author: adrienbernede

.gitlab-ci.yml

@@ -76,7 +76,7 @@ stages:
     include:
       - local: '.gitlab/custom-jobs-and-variables.yml'
       - project: 'radiuss/radiuss-shared-ci'
-        ref: 'v2024.12.0'
+        ref: 'v2025.06.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: 'v2024.12.0'
+  #  ref: 'v2025.06.0'
   #  file: 'preliminary-ignore-draft-pr.yml'
   # pipelines subscribed by the project
   - local: '.gitlab/subscribed-pipelines.yml'

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

@@ -23,16 +23,16 @@ variables:
 # Project specific deps for ruby
   PROJECT_RUBY_DEPS: "^raja~examples~exercises "
 
-# Poodle
+# Dane
 # Arguments for top level allocation
-  POODLE_SHARED_ALLOC: "--exclusive --partition=pdebug --time=7 --nodes=1"
+  DANE_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.
-  POODLE_JOB_ALLOC: "--overlap --nodes=1"
-# Project specific variants for poodle
-  PROJECT_POODLE_VARIANTS: "~shared +raja tests=basic "
-# Project specific deps for poodle
-  PROJECT_POODLE_DEPS: "^raja~examples~exercises "
+  DANE_JOB_ALLOC: "--overlap --reservation=ci --nodes=1"
+# Project specific variants for dane
+  PROJECT_DANE_VARIANTS: "~shared +raja tests=basic "
+# Project specific deps for dane
+  PROJECT_DANE_DEPS: "^raja~examples~exercises "
 
 # Corona
 # Arguments for top level allocation
@@ -54,6 +54,16 @@ variables:
 # Project specific deps for tioga
   PROJECT_TIOGA_DEPS: "^raja~examples~exercises "
 
+# Tuolumne
+# Arguments for top level allocation
+  TUOLUMNE_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=16m --nodes=1"
+# Arguments for job level allocation
+  TUOLUMNE_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
+# Project specific variants for tuolumne
+  PROJECT_TUOLUMNE_VARIANTS: "~shared +raja tests=basic "
+# Project specific deps for tuolumne
+  PROJECT_TUOLUMNE_DEPS: "^raja~examples~exercises "
+
 # Lassen and Butte use a different job scheduler (spectrum lsf) that does not
 # allow pre-allocation the same way slurm does.
 # Arguments for job level allocation

.gitlab/jobs/poodle.yml renamed to .gitlab/jobs/dane.yml

@@ -6,7 +6,7 @@
 ###############################################################################
 
 # Override reproducer section to define projet specific variables.
-.poodle_reproducer_vars:
+.dane_reproducer_vars:
   script:
     - !reference [.reproducer_vars, script]
 
@@ -29,5 +29,5 @@
 clang_14_0_6_develop_tpls:
   variables:
     SPEC: " ~shared +raja tests=basic %clang@=14.0.6 ^umpire@develop ^raja@develop~examples~exercises ^camp@main"
-  extends: .job_on_poodle
+  extends: .job_on_dane
   allow_failure: true

.gitlab/jobs/tuolumne.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 project specific variables.
+.tuolumne_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.

.gitlab/subscribed-pipelines.yml

@@ -38,17 +38,19 @@ generate-job-lists:
     LOCAL_JOBS_PATH: ".gitlab/jobs"
   script:
     - cat ${RADIUSS_JOBS_PATH}/ruby.yml ${LOCAL_JOBS_PATH}/ruby.yml > ruby-jobs.yml
-    - cat ${RADIUSS_JOBS_PATH}/poodle.yml ${LOCAL_JOBS_PATH}/poodle.yml > poodle-jobs.yml
+    - cat ${RADIUSS_JOBS_PATH}/dane.yml ${LOCAL_JOBS_PATH}/dane.yml > dane-jobs.yml
     - cat ${RADIUSS_JOBS_PATH}/lassen.yml ${LOCAL_JOBS_PATH}/lassen.yml > lassen-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:
       - ruby-jobs.yml
-      - poodle-jobs.yml
+      - dane-jobs.yml
       - lassen-jobs.yml
       - corona-jobs.yml
       - tioga-jobs.yml
+      - tuolumne-jobs.yml
 
 # RUBY
 ruby-up-check:
@@ -62,16 +64,16 @@ ruby-build-and-test:
   needs: [ruby-up-check, generate-job-lists]
   extends: [.build-and-test]
 
-# POODLE
-poodle-up-check:
+# DANE
+dane-up-check:
   variables:
-    CI_MACHINE: "poodle"
+    CI_MACHINE: "dane"
   extends: [.machine-check]
 
-poodle-build-and-test:
+dane-build-and-test:
   variables:
-    CI_MACHINE: "poodle"
-  needs: [poodle-up-check, generate-job-lists]
+    CI_MACHINE: "dane"
+  needs: [dane-up-check, generate-job-lists]
   extends: [.build-and-test]
 
 # CORONA
@@ -98,6 +100,18 @@ tioga-build-and-test:
   needs: [tioga-up-check, generate-job-lists]
   extends: [.build-and-test]
 
+# TUOLUMNE
+tuolumne-up-check:
+  variables:
+    CI_MACHINE: "tuolumne"
+  extends: [.machine-check]
+
+tuolumne-build-and-test:
+  variables:
+    CI_MACHINE: "tuolumne"
+  needs: [tuolumne-up-check, generate-job-lists]
+  extends: [.build-and-test]
+
 # LASSEN
 lassen-up-check:
   variables:

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 ["ruby"]=28 ["poodle"]=28 ["corona"]=32 ["rzansel"]=48 ["tioga"]=32)
+    declare -A core_counts=(["lassen"]=40 ["ruby"]=28 ["poodle"]=28 ["dane"]=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.