Add CI jobs, remove irrelevant jobs

LLNL · Nov 4, 2024 · e4b6b88 · e4b6b88
1 parent 3602695
commit e4b6b88
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
@@ -32,18 +32,18 @@ gcc_8_3_1:
     SPEC: " ~shared +openmp %gcc@=8.3.1 ^blt@develop"
   extends: .job_on_lassen
 
-gcc_8_3_1_cuda_11_5_0_ats_disabled:
+gcc_8_3_1_cuda_11_7_0_ats_disabled:
   extends: .job_on_lassen
   variables:
-    SPEC: " ~shared +openmp +cuda %gcc@=8.3.1 cuda_arch=70 ^cuda@11.5.0+allow-unsupported-compilers ^blt@develop"
-    MODULE_LIST: "cuda/11.5.0"
+    SPEC: " ~shared +openmp +cuda %gcc@=8.3.1 cuda_arch=70 ^cuda@11.7.0+allow-unsupported-compilers ^blt@develop"
+    MODULE_LIST: "cuda/11.7.0"
     LASSEN_JOB_ALLOC: "1 --atsdisable -W 30 -q pci"
 
-gcc_8_3_1_cuda_11_5_0_ats_disabled_mpi:
+gcc_8_3_1_cuda_11_7_0_ats_disabled_mpi:
   extends: .job_on_lassen
   variables:
-    SPEC: " ~shared +openmp +cuda +mpi %gcc@=8.3.1 cuda_arch=70 ^cuda@11.5.0+allow-unsupported-compilers ^spectrum-mpi ^blt@develop"
-    MODULE_LIST: "cuda/11.5.0"
+    SPEC: " ~shared +openmp +cuda +mpi %gcc@=8.3.1 cuda_arch=70 ^cuda@11.7.0+allow-unsupported-compilers ^spectrum-mpi ^blt@develop"
+    MODULE_LIST: "cuda/11.7.0"
     LASSEN_JOB_ALLOC: "1 --atsdisable -W 30 -q pci"
 
 ##########
@@ -62,23 +62,7 @@ clang_13_0_1_libcpp:
 #    LSAN_OPTIONS: "suppressions=${CI_PROJECT_DIR}/tpl/RAJA/suppressions.asan"
 #  extends: .job_on_lassen
 
-clang_16_0_6_ibm_omptarget:
+clang_16_0_6_omptarget:
   variables:
-    SPEC: " ~shared +openmp +omptarget %clang@=16.0.6.ibm.gcc.8.3.1 ^blt@develop"
-    ON_LASSEN: "OFF"
+    SPEC: " ~shared +openmp +omptarget %clang@=16.0.6.cuda.11.8.0.gcc.11.2.1 ^blt@develop"
   extends: .job_on_lassen
-
-xl_2022_08_19_gcc_8_3_1_cuda_11_2_0:
-  variables:
-    SPEC: " ~shared +openmp cuda_arch=70 +cuda cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" %xl@=16.1.1.12.gcc.8.3.1 ^cuda@11.2.0+allow-unsupported-compilers ^blt@develop"
-    MODULE_LIST: "cuda/11.2.0"
-    LASSEN_JOB_ALLOC: "1 -W 60 -q pci"
-  extends: .job_on_lassen
-
-xl_2023_06_28_gcc_11_2_1_cuda_11_8_0:
-  variables:
-    SPEC: " ~shared +openmp cuda_arch=70 +cuda cxxflags==\"-qthreaded -std=c++14 -O3 -qstrict -qxlcompatmacros -qlanglvl=extended0x -qalias=noansi -qhot -qpic -qsmp=omp -qsuppress=1500-029 -qsuppress=1500-036\" %xl@=16.1.1.14.cuda.11.8.0.gcc.11.2.1 ^cuda@11.8.0+allow-unsupported-compilers ^blt@develop"
-    MODULE_LIST: "cuda/11.8.0"
-    LASSEN_JOB_ALLOC: "1 -W 60 -q pci"
-  extends: .job_on_lassen
-
diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
@@ -27,6 +27,11 @@
 # ${PROJECT_<MACHINE>_DEPS} in the extra jobs. There is no reason not to fully
 # describe the spec here.
 
+cce_17_0_1:
+  variables:
+    SPEC: "~shared +openmp %cce@=17.0.1 ^blt@develop"
+  extends: .job_on_tioga
+
 rocmcc_6_2_0_hip_openmp:
   variables:
     SPEC: "~shared +rocm +openmp amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0 ^blt@develop"