Skip to content

Commit

Permalink
Various updates in RADIUSS Spack Configs (#290)
Browse files Browse the repository at this point in the history
* Spack environments split in separate files so that users can access packages.yaml and compilers.yaml directly

* Update externals, add new externals to support building other projects (axom)

* Make sure we do not reuse specs already installed (concretization is not influenced by what's already built)

* Update rocm tioga toolchain

* Update with improved job command handling

* Export host config as artifacts

* More uniform CI specs (build raja without examples)

---------

Co-authored-by: Alan Dayton <[email protected]>
  • Loading branch information
adrienbernede and adayton1 authored Feb 13, 2025
1 parent a3c1915 commit a989bd2
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 30 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ stages:
include:
- local: '.gitlab/custom-jobs-and-variables.yml'
- project: 'radiuss/radiuss-shared-ci'
ref: 'v2024.04.0'
ref: 'v2024.12.0'
file: 'pipelines/${CI_MACHINE}.yml'
- artifact: '${CI_MACHINE}-jobs.yml'
job: 'generate-job-lists'
Expand All @@ -86,7 +86,7 @@ include:
file: 'id_tokens.yml'
# [Optional] checks preliminary to running the actual CI test
#- project: 'radiuss/radiuss-shared-ci'
# ref: 'v2024.04.0'
# ref: 'v2024.12.0'
# file: 'preliminary-ignore-draft-pr.yml'
# pipelines subscribed by the project
- local: '.gitlab/subscribed-pipelines.yml'
3 changes: 3 additions & 0 deletions .gitlab/custom-jobs-and-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ variables:
artifacts:
reports:
junit: junit.xml
name: "${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID}"
paths:
- ./*.cmake

.reproducer_vars:
script:
Expand Down
12 changes: 6 additions & 6 deletions .gitlab/jobs/lassen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,32 +36,32 @@ gcc_11_2_1_cuda_11_8_0:
clang_12_0_1_libcpp:
extends: .job_on_lassen
variables:
SPEC: "~shared +raja tests=basic %[email protected] cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\""
SPEC: "~shared +raja tests=basic %[email protected] cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"

clang_16_0_6_libcpp:
extends: .job_on_lassen
variables:
SPEC: "~shared +raja tests=basic %[email protected] cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\""
SPEC: "~shared +raja tests=basic %[email protected] cflags==\"-DGTEST_HAS_CXXABI_H_=0\" cxxflags==\"-stdlib=libc++ -DGTEST_HAS_CXXABI_H_=0\" ^raja~examples~exercises"

clang_12_0_1_gcc_8_3_1_memleak:
extends: .job_on_lassen
variables:
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=address\""
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
ASAN_OPTIONS: "detect_leaks=1"

clang_16_0_6_gcc_8_3_1_memleak:
extends: .job_on_lassen
variables:
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=address\""
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=address\" ^raja~examples~exercises"
ASAN_OPTIONS: "detect_leaks=1"

clang_12_0_1_datarace:
extends: .job_on_lassen
variables:
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=thread\""
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"

clang_16_0_6_datarace:
extends: .job_on_lassen
variables:
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=thread\""
SPEC: "~shared +raja tests=basic %[email protected] cxxflags==\"-fsanitize=thread\" ^raja~examples~exercises"

8 changes: 1 addition & 7 deletions .gitlab/jobs/poodle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@

clang_14_0_6_develop_tpls:
variables:
SPEC: " %[email protected] ^umpire@develop ^raja@develop ^camp@main"
extends: .job_on_poodle
allow_failure: true

clang_16_0_6_develop_tpls:
variables:
SPEC: " %[email protected] ^umpire@develop ^raja@develop ^camp@main"
SPEC: " ~shared +raja tests=basic %clang@=14.0.6 ^umpire@develop ^raja@develop~examples~exercises ^camp@main"
extends: .job_on_poodle
allow_failure: true
8 changes: 1 addition & 7 deletions .gitlab/jobs/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@

clang_14_0_6_develop_tpls:
variables:
SPEC: " %[email protected] ^umpire@develop ^raja@develop ^camp@main"
extends: .job_on_ruby
allow_failure: true

clang_16_0_6_develop_tpls:
variables:
SPEC: " %[email protected] ^umpire@develop ^raja@develop ^camp@main"
SPEC: " ~shared +raja tests=basic %[email protected] ^umpire@develop ^raja@develop~examples~exercises ^camp@main"
extends: .job_on_ruby
allow_failure: true
3 changes: 1 addition & 2 deletions .uberenv_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"package_final_phase" : "initconfig",
"package_source_dir" : "../..",
"spack_url": "https://github.com/spack/spack.git",
"spack_branch": "develop-2024-10-06",
"spack_activate" : {},
"spack_branch": "develop-2025-02-09",
"spack_configs_path": "scripts/radiuss-spack-configs",
"spack_packages_path": "scripts/radiuss-spack-configs/packages",
"spack_concretizer": "clingo",
Expand Down
4 changes: 0 additions & 4 deletions scripts/gitlab/build_and_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,6 @@ then
mkdir -p ${build_dir} && cd ${build_dir}

timed_message "Building CHAI"
if [[ "${truehostname}" == "corona" || "${truehostname}" == "tioga" ]]
then
module unload rocm
fi
$cmake_exe \
-C ${hostconfig_path} \
-DCMAKE_INSTALL_PREFIX=${install_dir} \
Expand Down
2 changes: 1 addition & 1 deletion scripts/radiuss-spack-configs
Submodule radiuss-spack-configs updated 50 files
+41 −0 RELEASE_NOTES.md
+599 −0 blueos_3_ppc64le_ib/compilers.yaml
+24 −0 blueos_3_ppc64le_ib/config.yaml
+1 −0 blueos_3_ppc64le_ib/lassen/compilers.yaml
+1 −0 blueos_3_ppc64le_ib/lassen/config.yaml
+382 −0 blueos_3_ppc64le_ib/lassen/packages.yaml
+1 −0 blueos_3_ppc64le_ib/lassen/spack.yaml
+384 −0 blueos_3_ppc64le_ib/packages.yaml
+8 −791 blueos_3_ppc64le_ib/spack.yaml
+1 −1 darwin/spack.yaml
+2 −2 gitlab/radiuss-jobs/poodle.yml
+2 −2 gitlab/radiuss-jobs/ruby.yml
+4 −4 gitlab/radiuss-jobs/tioga.yml
+1 −1 packages/blt/package.py
+36 −5 packages/caliper/package.py
+12 −8 packages/camp/package.py
+20 −1 packages/care/package.py
+2 −1 packages/chai/package.py
+0 −13 packages/fmt/fmt-attributes-cpp11_4.1.0.patch
+0 −13 packages/fmt/fmt-no-export-cpp11flag_3.0.0.patch
+0 −22 packages/fmt/fmt-no-variable-initialize_10.0.0.patch
+0 −15 packages/fmt/fmt-use-cmake-cxx-standard_3.0.0.patch
+0 −141 packages/fmt/package.py
+7 −3 packages/raja-perf/package.py
+7 −2 packages/raja/package.py
+3 −3 packages/umpire/package.py
+324 −0 toss_4_x86_64_ib/compilers.yaml
+21 −0 toss_4_x86_64_ib/config.yaml
+311 −0 toss_4_x86_64_ib/corona/compilers.yaml
+1 −0 toss_4_x86_64_ib/corona/config.yaml
+424 −0 toss_4_x86_64_ib/corona/packages.yaml
+1 −0 toss_4_x86_64_ib/corona/spack.yaml
+439 −0 toss_4_x86_64_ib/packages.yaml
+1 −0 toss_4_x86_64_ib/poodle/compilers.yaml
+1 −0 toss_4_x86_64_ib/poodle/config.yaml
+282 −0 toss_4_x86_64_ib/poodle/packages.yaml
+1 −0 toss_4_x86_64_ib/poodle/spack.yaml
+194 −0 toss_4_x86_64_ib/ruby/compilers.yaml
+1 −0 toss_4_x86_64_ib/ruby/config.yaml
+282 −0 toss_4_x86_64_ib/ruby/packages.yaml
+1 −0 toss_4_x86_64_ib/ruby/spack.yaml
+8 −551 toss_4_x86_64_ib/spack.yaml
+261 −0 toss_4_x86_64_ib_cray/compilers.yaml
+20 −0 toss_4_x86_64_ib_cray/config.yaml
+436 −0 toss_4_x86_64_ib_cray/packages.yaml
+8 −566 toss_4_x86_64_ib_cray/spack.yaml
+1 −0 toss_4_x86_64_ib_cray/tioga/compilers.yaml
+1 −0 toss_4_x86_64_ib_cray/tioga/config.yaml
+436 −0 toss_4_x86_64_ib_cray/tioga/packages.yaml
+1 −0 toss_4_x86_64_ib_cray/tioga/spack.yaml

0 comments on commit a989bd2

Please sign in to comment.