Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various updates in RADIUSS Spack Configs #627

Merged
merged 19 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
85b54e6
From RSC: split config files + update toolchain on tioga
adrienbernede Nov 26, 2024
41cc2a7
From RSC: update calipre and care packages
adrienbernede Nov 26, 2024
853ed61
Export hostconfig file as artifact
adrienbernede Nov 28, 2024
1f3a798
From RSC: Sync with Spack@develop-2024-12-01
adrienbernede Dec 2, 2024
06c3bfb
From RSC: Fix Caliper package
adrienbernede Dec 2, 2024
37a9a4b
Do not unload rocm module
adrienbernede Dec 3, 2024
22ff702
Revert updating Spack because of problem with develop-2024-12-01
adrienbernede Dec 10, 2024
6465b18
Update Shared CI
adrienbernede Dec 19, 2024
4c20b4f
From RSC: update to rocm 6.3.0 on tioga + sync with spack@develop + c…
adrienbernede Jan 8, 2025
6b99e3c
From RSC: workarounds (rpath for missing lib) (requirement to enforce…
adrienbernede Jan 10, 2025
3cd1298
From RSC: SYCL compiler update + Update w.r.t. spack@develop-2024-01-12
adrienbernede Jan 13, 2025
38a6a2e
Update RADIUSS Spack Configs
adrienbernede Jan 22, 2025
bd2ddd6
From RSC: change tioga gcc to be coherent with available cray-mpich
adrienbernede Jan 22, 2025
0d5d934
Update RADIUSS Spack Configs to new release
adrienbernede Jan 22, 2025
68e836e
Update Spack and Uberenv to support split environments
adrienbernede Feb 4, 2025
4dab6af
Update Uberenv + Update Spack to fix bug
adrienbernede Feb 6, 2025
2ba3a99
From RSC: Set upper limit for FMT version in Umpire due to bug
adrienbernede Feb 7, 2025
1189039
Update Spack to snapshot release + RSC merge
adrienbernede Feb 10, 2025
5745264
Fix
adrienbernede Feb 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.07.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.07.0'
ref: 'v2024.12.0'
file: 'utilities/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 @@ -70,6 +70,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
4 changes: 2 additions & 2 deletions .gitlab/jobs/tioga.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ variables:
# This compiler is not considered reliable per issue in RAJA
# https://github.com/LLNL/RAJA/pull/1712#issuecomment-2316335119
# We allow failure and keep the cce 17.0.1 job below.
cce_18_0_0:
cce_18_0_1:
variables:
SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.0 ${PROJECT_TIOGA_DEPS}"
SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.1 ${PROJECT_TIOGA_DEPS}"
extends: .job_on_tioga
allow_failure: true

Expand Down
6 changes: 2 additions & 4 deletions .uberenv_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
"package_source_dir" : "../..",
"package_final_phase" : "initconfig",
"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",
"spack_setup_clingo": false,
"debug": true
"spack_setup_clingo": false
}
4 changes: 0 additions & 4 deletions scripts/gitlab/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,6 @@ then
mkdir -p ${build_dir} && cd ${build_dir}

timed_message "Building Caliper"
if [[ "${truehostname}" == "corona" || "${truehostname}" == "tioga" ]]
then
module unload rocm
fi
if [[ "${truehostname}" == "lassen" || "${truehostname}" == "tioga" ]]
then
$cmake_exe \
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