Enable MPI everywhere to see where it fails

LLNL · Nov 12, 2024 · d9445fe · d9445fe
1 parent abb0779
commit d9445fe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
@@ -20,7 +20,7 @@ variables:
 # Note: We repeat the reservation, necessary when jobs are manually re-triggered.
   RUBY_JOB_ALLOC: "--reservation=ci --nodes=1"
 # Project specific variants for ruby
-  PROJECT_RUBY_VARIANTS: "~shared +openmp"
+  PROJECT_RUBY_VARIANTS: "~shared +mpi +openmp"
 # Project specific deps for ruby
   PROJECT_RUBY_DEPS: "^blt@develop "
 
@@ -30,7 +30,7 @@ variables:
 # Arguments for job level allocation
   POODLE_JOB_ALLOC: "--nodes=1"
 # Project specific variants for poodle
-  PROJECT_POODLE_VARIANTS: "~shared +openmp"
+  PROJECT_POODLE_VARIANTS: "~shared +mpi +openmp"
 # Project specific deps for poodle
   PROJECT_POODLE_DEPS: "^blt@develop "
 
@@ -40,7 +40,7 @@ variables:
 # Arguments for job level allocation
   CORONA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
 # Project specific variants for corona
-  PROJECT_CORONA_VARIANTS: "~shared ~openmp"
+  PROJECT_CORONA_VARIANTS: "~shared +mpi ~openmp"
 # Project specific deps for corona
   PROJECT_CORONA_DEPS: "^blt@develop "
 
@@ -50,7 +50,7 @@ variables:
 # Arguments for job level allocation
   TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
 # Project specific variants for tioga
-  PROJECT_TIOGA_VARIANTS: "~shared +openmp"
+  PROJECT_TIOGA_VARIANTS: "~shared +mpi +openmp"
 # Project specific deps for tioga
   PROJECT_TIOGA_DEPS: "^blt@develop "
 
@@ -59,7 +59,7 @@ variables:
 # Arguments for job level allocation
   LASSEN_JOB_ALLOC: "1 -W 20 -q pci"
 # Project specific variants for lassen
-  PROJECT_LASSEN_VARIANTS: "~shared +openmp cuda_arch=70"
+  PROJECT_LASSEN_VARIANTS: "~shared +mpi +openmp cuda_arch=70"
 # Project specific deps for lassen
   PROJECT_LASSEN_DEPS: "^blt@develop "
 

diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml
@@ -29,6 +29,6 @@
 
 clang_19_0_0_sycl_gcc_10_3_1_rocmcc_5_7_1_hip:
   variables:
-    SPEC: " ~shared +sycl ~openmp tests=basic %clang@=19.0.0 cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\" ^blt@develop"
+    SPEC: " ~shared +mpi +sycl ~openmp tests=basic %clang@=19.0.0 cxxflags==\"-w -fsycl -fsycl-unnamed-lambda -fsycl-targets=amdgcn-amd-amdhsa -Xsycl-target-backend --offload-arch=gfx906\" ^blt@develop"
     MODULE_LIST: "rocm/5.7.1"
   extends: .job_on_corona
diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
@@ -29,20 +29,20 @@
 
 gcc_8_3_1:
   variables:
-    SPEC: " ~shared +openmp %gcc@=8.3.1 ^blt@develop"
+    SPEC: " ~shared +mpi +openmp %gcc@=8.3.1 ^blt@develop"
   extends: .job_on_lassen
 
 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 ^[email protected]+allow-unsupported-compilers ^blt@develop"
+    SPEC: " ~shared +mpi +openmp +cuda %gcc@=8.3.1 cuda_arch=70 ^[email protected]+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_7_0_ats_disabled_mpi:
   extends: .job_on_lassen
   variables:
-    SPEC: " ~shared +openmp +cuda +mpi %gcc@=8.3.1 cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^spectrum-mpi ^blt@develop"
+    SPEC: " ~shared +mpi +openmp +cuda +mpi %gcc@=8.3.1 cuda_arch=70 ^[email protected]+allow-unsupported-compilers ^spectrum-mpi ^blt@develop"
     MODULE_LIST: "cuda/11.7.0"
     LASSEN_JOB_ALLOC: "1 --atsdisable -W 30 -q pci"
 
@@ -52,17 +52,17 @@ gcc_8_3_1_cuda_11_7_0_ats_disabled_mpi:
 
 clang_13_0_1_libcpp:
   variables:
-    SPEC: " ~shared +openmp %clang@=13.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^blt@develop"
+    SPEC: " ~shared +mpi +openmp %clang@=13.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^blt@develop"
   extends: .job_on_lassen
 
 #clang_14_0_5_asan:
 #  variables:
-#    SPEC: " ~shared +openmp %clang@=14.0.5 cxxflags==\"-fsanitize=address\" ${PROJECT_LASSEN_DEPS}"
+#    SPEC: " ~shared +mpi +openmp %clang@=14.0.5 cxxflags==\"-fsanitize=address\" ${PROJECT_LASSEN_DEPS}"
 #    ASAN_OPTIONS: "detect_leaks=1"
 #    LSAN_OPTIONS: "suppressions=${CI_PROJECT_DIR}/tpl/RAJA/suppressions.asan"
 #  extends: .job_on_lassen
 
 clang_16_0_6_omptarget:
   variables:
-    SPEC: " ~shared +openmp +omptarget %clang@=16.0.6.cuda.11.8.0.gcc.11.2.1 ^blt@develop"
+    SPEC: " ~shared +mpi +openmp +omptarget %clang@=16.0.6.cuda.11.8.0.gcc.11.2.1 ^blt@develop"
   extends: .job_on_lassen
diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml
@@ -45,5 +45,5 @@ gcc_10_3_1:
 
 intel_2023_2_1_mpi:
   variables:
-    SPEC: "~shared +openmp +mpi +lowopttest cxxflags==-fp-model=precise %intel@=2023.2.1 ^mvapich2 ^blt@develop"
+    SPEC: "~shared +mpi +openmp +mpi +lowopttest cxxflags==-fp-model=precise %intel@=2023.2.1 ^mvapich2 ^blt@develop"
   extends: .job_on_poodle
diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
@@ -29,12 +29,12 @@
 
 cce_17_0_1:
   variables:
-    SPEC: "~shared +openmp %cce@=17.0.1 ^blt@develop"
+    SPEC: "~shared +mpi +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 ^[email protected] ^blt@develop"
+    SPEC: "~shared +mpi +rocm +openmp amdgpu_target=gfx90a %rocmcc@=6.2.0 ^[email protected] ^blt@develop"
   extends: .job_on_tioga
 
 rocmcc_6_2_0_hip_openmp_mpi: