[WIP] Various updates in RADIUSS Spack Configs

.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'

.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:

.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 ^[email protected]"
   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_6_0_2_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\""
-    MODULE_LIST: "rocm/5.7.1"
+    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/"
+    LD_LIBRARY_PATH: "${SYCL_PATH}/lib:${SYCL_PATH}/lib64:${LD_LIBRARY_PATH}"
   extends: .job_on_corona
 

.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
 

.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
 
 ############

.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
 
 ############

.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_3_0_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.3.0 ^hip@6.3.0"
   extends: .job_on_tioga
 
-rocmcc_6_2_0_hip_openmp:
+rocmcc_6_3_0_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.3.0 ^hip@6.3.0"
   extends: .job_on_tioga

.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-2025-01-12",
 "spack_activate" : {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": "scripts/radiuss-spack-configs/packages",

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} \