Final cleanup pass

Author: rhornung67

.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 shared
 
 ############
 # Extra jobs
@@ -26,9 +26,14 @@
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
-rocmcc_6_4_2_hip_desul_atomics:
+rocmcc_5_7_1_hip_openmp:
   variables:
-    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %llvm-amdgpu@=6.4.2 ^hip@6.4.2"
+    SPEC: " ~shared +rocm +openmp +tests +vectorization amdgpu_target=gfx906 %llvm-amdgpu@=5.7.1 ^hip@5.7.1"
+  extends: .job_on_corona
+
+rocmcc_5_7_1_hip_desul_atomics:
+  variables:
+    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %llvm-amdgpu@=5.7.1 ^hip@5.7.1"
   extends: .job_on_corona
 
 clang_22_0_0_sycl_gcc_10_3_1_rocmcc_6_4_2:

.gitlab/jobs/dane.yml

@@ -17,28 +17,25 @@
 # 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
+# Shared job uses %clang-14-gcc-11
 clang_14_0_6:
   variables:
     SPEC: " ~shared +openmp +omptask ~vectorization +tests %llvm@=14.0.6 ${PROJECT_DANE_DEPS}"
   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_DANE_DEPS}"
-  extends: .job_on_dane
+## gcc 11.2.1 job is shared
 
+# Identical to shared job, but use OpenMP tasks and no vectorization
 # custom variant
 # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2292006843
 oneapi_2023_2_1:
   variables:
-    SPEC: "${PROJECT_DANE_VARIANTS} +lowopttest cxxflags==-fp-model=precise %oneapi@=2023.2.1 ${PROJECT_DANE_DEPS}"
+    SPEC: "~shared +openmp +vectorization +tests +lowopttest cxxflags==-fp-model=precise %oneapi@=2023.2.1"
   extends: .job_on_dane
 
 oneapi_2025_2_0:
   variables:
-    SPEC: "${PROJECT_DANE_VARIANTS} cxxflags==-fp-model=precise %oneapi@=2025.2.0 ${PROJECT_DANE_DEPS}"
+    SPEC: "~shared +openmp +vectorization +tests cxxflags==-fp-model=precise %oneapi@=2025.2.0"
   extends: .job_on_dane
 
 ############
@@ -53,6 +50,11 @@ clang_19_1_3:
     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 %gcc@=12.1.1"
@@ -63,7 +65,6 @@ gcc_13_3_1:
     SPEC: " ~shared +openmp +tests %gcc@=13.3.1"
   extends: .job_on_dane
 
-# OTHERS
 clang_14_0_6_gcc_11_2_1_desul_atomics:
   variables:
     SPEC: " ~shared +openmp +tests +desul %clang-14-gcc-11"

.gitlab/jobs/matrix.yml

@@ -17,7 +17,7 @@
 # project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
 # when possible so that the comparison with the original job is easier.
 
-# No overridden jobs so far...
+## clang 18.1.1 + CUDA 12.6.0 job is shared
 
 ############
 # Extra jobs
@@ -26,3 +26,4 @@
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
+

.gitlab/jobs/tioga.yml

@@ -17,6 +17,8 @@
 # project. We keep ${PROJECT_<MACHINE>_VARIANTS} and ${PROJECT_<MACHINE>_DEPS}
 # So that the comparison with the original job is easier.
 
+## NOTE: rocm 6.4.1 job is shared
+
 # Compiler error preventing a test to succeed.
 # https://github.com/LLNL/RAJA/pull/1712#issuecomment-2316335119
 cce_18_0_1:
@@ -25,21 +27,18 @@ cce_18_0_1:
   extends: .job_on_tioga
   allow_failure: true
 
+## NOTE: cce 19.0.0 job is shared
+
 ############
 # 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.
 
-cce_19_0_0:
-  variables:
-    SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=19.0.0 ${PROJECT_TIOGA_DEPS}"
-  extends: .job_on_tioga
-
 cce_20_0_0:
   variables:
-    SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=20.0.0 ${PROJECT_TIOGA_DEPS}"
+    SPEC: "~shared +openmp +vectorization +tests %cce@=20.0.0 "
   extends: .job_on_tioga
 
 rocmcc_6_4_1_hip_desul_atomics:

.gitlab/jobs/tuolumne.yml

@@ -17,12 +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:
-    ON_TUOLUMNE: "OFF"
-  extends: .job_on_tuolumne
+## cce 19.0.0 job is shared
+
+## rocm 6.4.1 job is shared
 
 ############
 # Extra jobs
@@ -31,14 +28,9 @@ 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
-
 cce_20_0_0:
   variables:
-    SPEC: "${PROJECT_TUOLUMNE_VARIANTS} %cce@=20.0.0 ${PROJECT_TUOLUMNE_DEPS}"
+    SPEC: "~shared +openmp +vectorization +tests %cce@=20.0.0"
   extends: .job_on_tuolumne
 
 rocmcc_6_4_1_hip_desul_atomics: