Do not enforce blt@develop anymore

LLNL · Sep 5, 2024 · ac40ebd · ac40ebd
1 parent ad48eb6
commit ac40ebd
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
@@ -21,7 +21,7 @@ variables:
 # Project specific variants for ruby
   PROJECT_RUBY_VARIANTS: "~shared +openmp +vectorization +tests"
 # Project specific deps for ruby
-  PROJECT_RUBY_DEPS: "^blt@develop "
+  PROJECT_RUBY_DEPS:
 
 # Poodle
 # Arguments for top level allocation
@@ -31,7 +31,7 @@ variables:
 # Project specific variants for poodle
   PROJECT_POODLE_VARIANTS: "~shared +openmp +vectorization +tests"
 # Project specific deps for poodle
-  PROJECT_POODLE_DEPS: "^blt@develop "
+  PROJECT_POODLE_DEPS:
 
 # Corona
 # Arguments for top level allocation
@@ -41,7 +41,7 @@ variables:
 # Project specific variants for corona
   PROJECT_CORONA_VARIANTS: "~shared ~openmp +vectorization +tests"
 # Project specific deps for corona
-  PROJECT_CORONA_DEPS: "^blt@develop "
+  PROJECT_CORONA_DEPS:
 
 # Tioga
 # Arguments for top level allocation
@@ -51,7 +51,7 @@ variables:
 # Project specific variants for corona
   PROJECT_TIOGA_VARIANTS: "~shared +openmp +vectorization +tests"
 # Project specific deps for corona
-  PROJECT_TIOGA_DEPS: "^blt@develop "
+  PROJECT_TIOGA_DEPS:
 
 # Lassen and Butte use a different job scheduler (spectrum lsf) that does not
 # allow pre-allocation the same way slurm does.
@@ -60,7 +60,7 @@ variables:
 # Project specific variants for lassen
   PROJECT_LASSEN_VARIANTS: "~shared +openmp +vectorization +tests cuda_arch=70"
 # Project specific deps for lassen
-  PROJECT_LASSEN_DEPS: "^blt@develop "
+  PROJECT_LASSEN_DEPS:
 
 # Configuration shared by build and test jobs specific to this project.
 # Not all configuration can be shared. Here projects can fine tune the

diff --git a/.gitlab/jobs/corona.yml b/.gitlab/jobs/corona.yml
@@ -28,12 +28,12 @@
 
 rocmcc_5_7_1_hip_desul_atomics:
   variables:
-    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %rocmcc@=5.7.1 ^hip@5.7.1 ^blt@develop"
+    SPEC: " ~shared +rocm ~openmp +tests +desul amdgpu_target=gfx906 %rocmcc@=5.7.1 ^hip@5.7.1"
   extends: .job_on_corona
 
 clang_19_0_0_sycl_gcc_10_3_1_rocmcc_5_7_1_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\" ^blt@develop"
+    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"
   extends: .job_on_corona
 
diff --git a/.gitlab/jobs/lassen.yml b/.gitlab/jobs/lassen.yml
@@ -28,13 +28,13 @@
 
 gcc_8_3_1_omptask:
   variables:
-    SPEC: " ~shared +openmp +omptask +tests %gcc@=8.3.1 ^blt@develop"
+    SPEC: " ~shared +openmp +omptask +tests %gcc@=8.3.1 ${PROJECT_LASSEN_DEPS}"
   extends: .job_on_lassen
 
 gcc_8_3_1_cuda_11_7_0_ats_disabled:
   extends: .job_on_lassen
   variables:
-    SPEC: " ~shared +openmp +tests +cuda %gcc@=8.3.1 cuda_arch=70 ^cuda@11.7.0+allow-unsupported-compilers ^blt@develop"
+    SPEC: " ~shared +openmp +tests +cuda %gcc@=8.3.1 cuda_arch=70 ^cuda@11.7.0+allow-unsupported-compilers ${PROJECT_LASSEN_DEPS}"
     MODULE_LIST: "cuda/11.7.0"
     LASSEN_JOB_ALLOC: "1 --atsdisable -W 30 -q pci"
 
@@ -44,7 +44,7 @@ gcc_8_3_1_cuda_11_7_0_ats_disabled:
 
 clang_13_0_1_libcpp:
   variables:
-    SPEC: " ~shared +openmp +tests %clang@=13.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^blt@develop"
+    SPEC: " ~shared +openmp +tests %clang@=13.0.1 cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\""
   extends: .job_on_lassen
 
 #clang_14_0_5_asan:
@@ -56,15 +56,15 @@ clang_13_0_1_libcpp:
 
 gcc_8_3_1_cuda_11_7_desul_atomics:
   variables:
-    SPEC: " ~shared +openmp +tests +cuda +desul %gcc@=8.3.1 cuda_arch=70 ^cuda@11.7.0+allow-unsupported-compilers ^blt@develop"
+    SPEC: " ~shared +openmp +tests +cuda +desul %gcc@=8.3.1 cuda_arch=70 ^cuda@11.7.0+allow-unsupported-compilers"
     MODULE_LIST: "cuda/11.7.0"
   extends: .job_on_lassen
 
 # Warning: Allowed to fail temporarily
 # Deactivated due to issues with OpenMP Target and various tests and compilers.
 clang_16_0_6_ibm_omptarget:
   variables:
-    SPEC: " ~shared +openmp +omptarget +tests %clang@=16.0.6.ibm.gcc.8.3.1 ^blt@develop"
+    SPEC: " ~shared +openmp +omptarget +tests %clang@=16.0.6.ibm.gcc.8.3.1"
     ON_LASSEN: "OFF"
   extends: .job_on_lassen
   allow_failure: true

diff --git a/.gitlab/jobs/poodle.yml b/.gitlab/jobs/poodle.yml
@@ -46,16 +46,16 @@ gcc_10_3_1:
 
 clang_14_0_6_openmp_off:
   variables:
-    SPEC: " ~shared ~openmp +tests %clang@=14.0.6 ^blt@develop"
+    SPEC: " ~shared ~openmp +tests %clang@=14.0.6"
   extends: .job_on_poodle
 
 gcc_10_3_1_openmp_default:
   variables:
-    SPEC: " ~shared +tests %gcc@=10.3.1 ^blt@develop"
+    SPEC: " ~shared +tests %gcc@=10.3.1"
   extends: .job_on_poodle
 
 # OTHERS
 clang_14_0_6_gcc_10_3_1_desul_atomics:
   variables:
-    SPEC: " ~shared +openmp +tests +desul %clang@=14.0.6.gcc.10.3.1 ^blt@develop"
+    SPEC: " ~shared +openmp +tests +desul %clang@=14.0.6.gcc.10.3.1"
   extends: .job_on_poodle
diff --git a/.gitlab/jobs/ruby.yml b/.gitlab/jobs/ruby.yml
@@ -46,16 +46,16 @@ intel_2023_2_1:
 
 clang_14_0_6_openmp_off:
   variables:
-    SPEC: " ~shared ~openmp +tests %clang@=14.0.6 ^blt@develop"
+    SPEC: " ~shared ~openmp +tests %clang@=14.0.6"
   extends: .job_on_ruby
 
 gcc_10_3_1_openmp_default:
   variables:
-    SPEC: " ~shared +tests %gcc@=10.3.1 ^blt@develop"
+    SPEC: " ~shared +tests %gcc@=10.3.1"
   extends: .job_on_ruby
 
 # OTHERS
 clang_14_0_6_gcc_10_3_1_desul_atomics:
   variables:
-    SPEC: " ~shared +openmp +tests +desul %clang@=14.0.6.gcc.10.3.1 ^blt@develop"
+    SPEC: " ~shared +openmp +tests +desul %clang@=14.0.6.gcc.10.3.1"
   extends: .job_on_ruby
diff --git a/.gitlab/jobs/tioga.yml b/.gitlab/jobs/tioga.yml
@@ -39,10 +39,10 @@ cce_17_0_1:
 
 rocmcc_6_2_0_hip_desul_atomics:
   variables:
-    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0 ^blt@develop"
+    SPEC: "~shared +rocm ~openmp +desul +tests amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0"
   extends: .job_on_tioga
 
 rocmcc_6_2_0_hip_openmp:
   variables:
-    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0 ^blt@develop"
+    SPEC: "~shared +rocm +openmp +omptask +tests amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0"
   extends: .job_on_tioga