Skip to content

Commit

Permalink
New device_alloc policy:
Browse files Browse the repository at this point in the history 
variant default to off by default.
variant off on ruby and lassen.
variant on on corona and tioga.
  • Loading branch information
@adrienbernede
adrienbernede committed May 2, 2023
1 parent ab05752 commit e11808d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions .gitlab/custom-jobs-and-variables.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ variables:
# Arguments for job level allocation
RUBY_BUILD_AND_TEST_JOB_ALLOC: "--overlap --reservation=ci --qos=ci_ruby --time=10 --nodes=1"
# Project specific variants for ruby
PROJECT_RUBY_VARIANTS: "~shared +fortran ~device_alloc +tools tests=basic "
PROJECT_RUBY_VARIANTS: "~shared +fortran +tools tests=basic "
# Project specific deps for ruby
PROJECT_RUBY_DEPS: ""

Expand All @@ -28,7 +28,7 @@ variables:
# Arguments for job level allocation
CORONA_BUILD_AND_TEST_JOB_ALLOC: "--exclusive --time-limit=10m --nodes=1"
# Project specific variants for corona
PROJECT_CORONA_VARIANTS: "~shared +fortran ~device_alloc tests=basic "
PROJECT_CORONA_VARIANTS: "~shared +fortran +device_alloc tests=basic "
# Project specific deps for corona
PROJECT_CORONA_DEPS: ""

Expand All @@ -38,7 +38,7 @@ variables:
# Arguments for job level allocation
TIOGA_BUILD_AND_TEST_JOB_ALLOC: "--time-limit=10m --nodes=1"
# Project specific variants for tioga
PROJECT_TIOGA_VARIANTS: "~shared +fortran ~device_alloc tests=basic "
PROJECT_TIOGA_VARIANTS: "~shared +fortran +device_alloc tests=basic "
# Project specific deps for tioga
PROJECT_TIOGA_DEPS: ""

Expand All @@ -47,7 +47,7 @@ variables:
# Arguments for job level allocation
LASSEN_BUILD_AND_TEST_JOB_ALLOC: "1 -W 18"
# Project specific variants for lassen
PROJECT_LASSEN_VARIANTS: "~shared +fortran ~device_alloc +tools tests=basic "
PROJECT_LASSEN_VARIANTS: "~shared +fortran +tools tests=basic "
# Project specific deps for lassen
PROJECT_LASSEN_DEPS: ""

Expand Down
24 changes: 12 additions & 12 deletions .gitlab/lassen-build-and-test-extra.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@

ibm_clang_14_0_5_mpi_shmem:
variables:
SPEC: "~shared ~device_alloc +tools tests=basic +ipc_shmem +mpi %clang@14.0.5.ibm.gcc.8.3.1 ^spectrum-mpi"
SPEC: "~shared +tools tests=basic +ipc_shmem +mpi %clang@14.0.5.ibm.gcc.8.3.1 ^spectrum-mpi"
extends: .build_and_test_on_lassen

ibm_clang_14_0_5_mpi:
variables:
SPEC: "~shared +fortran ~device_alloc +tools +mpi tests=basic %clang@14.0.5.ibm.gcc.8.3.1 ^spectrum-mpi"
SPEC: "~shared +fortran +tools +mpi tests=basic %clang@14.0.5.ibm.gcc.8.3.1 ^spectrum-mpi"
extends: .build_and_test_on_lassen

ibm_clang_14_0_5_gcc_8_3_1_cuda_11_7_0_mpi_shmem:
variables:
SPEC: "~shared ~device_alloc +tools +cuda +ipc_shmem +mpi tests=basic %clang@14.0.5.ibm.gcc.8.3.1 ^spectrum-mpi ^cuda@11.7.0+allow-unsupported-compilers"
SPEC: "~shared +tools +cuda +ipc_shmem +mpi tests=basic %clang@14.0.5.ibm.gcc.8.3.1 ^spectrum-mpi ^cuda@11.7.0+allow-unsupported-compilers"
MODULE_LIST: "cuda/11.7.0"
extends: .build_and_test_on_lassen

clang_12_0_1_libcpp:
variables:
SPEC: "~shared ~device_alloc +tools tests=basic +libcpp %clang@12.0.1"
SPEC: "~shared +tools tests=basic +libcpp %clang@12.0.1"
extends: .build_and_test_on_lassen

clang_12_0_1_gcc_8_3_1_memleak:
variables:
SPEC: "~shared +asan +sanitizer_tests +tools ~device_alloc tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==-fsanitize=address"
SPEC: "~shared +asan +sanitizer_tests +tools tests=basic %clang@12.0.1.gcc.8.3.1 cxxflags==-fsanitize=address"
ASAN_OPTIONS: "detect_leaks=1"
extends: .build_and_test_on_lassen

Expand All @@ -55,41 +55,41 @@ clang_12_0_1_gcc_8_3_1_memleak:

gcc_8_3_1_dev_benchmarks:
variables:
SPEC: "~shared +dev_benchmarks +tools ~device_alloc build_type=Release %gcc@8.3.1"
SPEC: "~shared +dev_benchmarks +tools build_type=Release %gcc@8.3.1"
extends: .build_and_test_on_lassen

xl_2022_08_19_default_omp_target:
variables:
SPEC: "~shared ~device_alloc +tools +openmp +openmp_target tests=basic %xl@16.1.1.12"
SPEC: "~shared +tools +openmp +openmp_target tests=basic %xl@16.1.1.12"
allow_failure: true
extends: .build_and_test_on_lassen

gcc_8_3_1_numa:
variables:
SPEC: "~shared +fortran +numa +tools ~device_alloc tests=basic %gcc@8.3.1"
SPEC: "~shared +fortran +numa +tools tests=basic %gcc@8.3.1"
extends: .build_and_test_on_lassen

gcc_8_3_1_cuda_11_7_0:
variables:
SPEC: "+fortran +cuda +tools +backtrace ~device_alloc tests=basic %gcc@8.3.1 ^cuda@11.7.0+allow-unsupported-compilers"
SPEC: "+fortran +cuda +tools +backtrace tests=basic %gcc@8.3.1 ^cuda@11.7.0+allow-unsupported-compilers"
MODULE_LIST: "cuda/11.7.0"
extends: .build_and_test_on_lassen

# Develop/main builds against specific tpl versions.

gcc_8_3_1_tpls:
variables:
SPEC: "~shared +fortran ~device_alloc +tools tests=basic %gcc@8.3.1"
SPEC: "~shared +fortran +tools tests=basic %gcc@8.3.1"
extends: .build_and_test_on_lassen

ibm_clang_14_0_5_gcc_8_3_1_cuda_11_7_0_tpls:
variables:
SPEC: "~shared +fortran +cuda ~device_alloc +tools tests=basic %clang@14.0.5.ibm.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers"
SPEC: "~shared +fortran +cuda +tools tests=basic %clang@14.0.5.ibm.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers"
MODULE_LIST: "cuda/11.7.0"
extends: .build_and_test_on_lassen

xl_2022_08_19_gcc_8_3_1_cuda_11_7_tpls:
variables:
SPEC: "~shared +fortran +cuda ~device_alloc +tools tests=basic %xl@16.1.1.12.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers"
SPEC: "~shared +fortran +cuda +tools tests=basic %xl@16.1.1.12.gcc.8.3.1 ^cuda@11.7.0+allow-unsupported-compilers"
MODULE_LIST: "cuda/11.7.0"
extends: .build_and_test_on_lassen
10 changes: 5 additions & 5 deletions .gitlab/ruby-build-and-test-extra.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@

gcc_10_2_1_numa:
variables:
SPEC: "~shared +fortran +numa ~device_alloc +tools tests=basic %gcc@10.2.1"
SPEC: "~shared +fortran +numa +tools tests=basic %gcc@10.2.1"
extends: .build_and_test_on_ruby

clang_14_0_4_gcc_8_3_1_sqlite_experimental:
variables:
SPEC: "~shared +sqlite_experimental ~device_alloc +tools tests=basic %clang@14.0.4.gcc.8.3.1"
SPEC: "~shared +sqlite_experimental +tools tests=basic %clang@14.0.4.gcc.8.3.1"
extends: .build_and_test_on_ruby

# Develop builds against specific tpl version.
clang_14_0_4_gcc_8_3_1_tpls:
variables:
SPEC: "~shared +fortran ~device_alloc +tools tests=basic %clang@14.0.4.gcc.8.3.1"
SPEC: "~shared +fortran +tools tests=basic %clang@14.0.4.gcc.8.3.1"
extends: .build_and_test_on_ruby

gcc_10_2_1_tpls:
variables:
SPEC: "~shared +fortran ~device_alloc +tools tests=basic %gcc@10.2.1"
SPEC: "~shared +fortran +tools tests=basic %gcc@10.2.1"
extends: .build_and_test_on_ruby

# We deactivate this job as it is known to fail with Umpire: needs gcc toolchain.
Expand All @@ -51,7 +51,7 @@ intel_oneapi_2022_2:

intel_oneapi_2022_2_gcc_8_3_1:
variables:
SPEC: "~shared +fortran ~device_alloc +tools tests=basic %oneapi@2022.2.gcc.8.3.1"
SPEC: "~shared +fortran +tools tests=basic %oneapi@2022.2.gcc.8.3.1"
extends: .build_and_test_on_ruby
allow_failure: true

Expand Down
2 changes: 1 addition & 1 deletion scripts/radiuss-spack-configs
Submodule radiuss-spack-configs updated 1 files
+1 −1 packages/umpire/package.py

0 comments on commit e11808d

Please sign in to comment.