Merge pull request #1945 from LLNL/woptim/rsc-2025-11

Several changes in RADIUSS Spack Configs

Author: adrienbernede

.gitlab/jobs/dane.yml

@@ -17,26 +17,23 @@
 # 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 %clang-14-gcc-11
-clang_14_0_6:
+# Shared job uses %clang-19-gcc-13, replaced with %clang-19 below
+clang_19_1_3_gcc_13_3_1:
+  extends: .job_on_dane
   variables:
-    SPEC: " ~shared +openmp +omptask ~vectorization +tests %llvm@=14.0.6 ${PROJECT_DANE_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 11.2.1 job is in the shared RSC set of jobs
+## gcc 13.3.1 job is in the shared RSC set of jobs
 
 # 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: "~shared +openmp +vectorization +tests +lowopttest cxxflags==-fp-model=precise %oneapi@=2023.2.1"
-  extends: .job_on_dane
-
-oneapi_2025_2_0:
-  variables:
-    SPEC: "~shared +openmp +vectorization +tests cxxflags==-fp-model=precise %oneapi@=2025.2.0"
-  extends: .job_on_dane
 
 ############
 # Extra jobs
@@ -45,6 +42,11 @@ oneapi_2025_2_0:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
+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"
@@ -60,12 +62,12 @@ gcc_12_1_1:
     SPEC: " ~shared +openmp +tests %gcc@=12.1.1"
   extends: .job_on_dane
 
-gcc_13_3_1:
+clang_14_0_6_gcc_11_2_1_desul_atomics:
   variables:
-    SPEC: " ~shared +openmp +tests %gcc@=13.3.1"
+    SPEC: " ~shared +openmp +tests +desul %clang-14-gcc-11"
   extends: .job_on_dane
 
-clang_14_0_6_gcc_11_2_1_desul_atomics:
+oneapi_2025_2_0:
   variables:
-    SPEC: " ~shared +openmp +tests +desul %clang-14-gcc-11"
+    SPEC: "~shared +openmp +vectorization +tests cxxflags==-fp-model=precise %oneapi@=2025.2.0"
   extends: .job_on_dane

.gitlab/jobs/matrix.yml

@@ -17,13 +17,11 @@
 # project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
 # when possible so that the comparison with the original job is easier.
 
-## clang 18.1.1 + CUDA 12.6.0 job is in the shared RSC set of jobs
-# Overridden to allow failure
-clang_18_1_1_cuda_12_6_0:
-  variables:
-    SPEC: "${PROJECT_MATRIX_VARIANTS} %llvm@=18.1.8 ^cuda@12.6.0+allow-unsupported-compilers ${PROJECT_MATRIX_DEPS}"
+# 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
-  allow_failure: true
+  variables:
+    ON_MATRIX: "OFF"
 
 ############
 # Extra jobs
@@ -32,4 +30,10 @@ clang_18_1_1_cuda_12_6_0:
 # ${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 ^cuda@12.6.0+allow-unsupported-compilers"
+  extends: .job_on_matrix
+  allow_failure: true
 

.gitlab/jobs/tioga.yml

@@ -19,15 +19,7 @@
 
 ## NOTE: rocm 6.4.1 job is in the shared RSC set of jobs
 
-# 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: cce 19.0.0 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
@@ -36,11 +28,6 @@ cce_18_0_1:
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-cce_20_0_0:
-  variables:
-    SPEC: "~shared +openmp +vectorization +tests %cce@=20.0.0 "
-  extends: .job_on_tioga
-
 rocmcc_6_4_1_hip_desul_atomics:
   variables:
     SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %llvm-amdgpu@=6.4.1 ^hip@6.4.1"

.gitlab/jobs/tuolumne.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.
 
-## cce 19.0.0 job is in the shared RSC set of jobs
+## 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
 
@@ -28,11 +28,6 @@
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-cce_20_0_0:
-  variables:
-    SPEC: "~shared +openmp +vectorization +tests %cce@=20.0.0"
-  extends: .job_on_tuolumne
-
 rocmcc_6_4_1_hip_desul_atomics:
   variables:
     SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx942 %llvm-amdgpu@=6.4.1 ^hip@6.4.1"