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 #924

Open
wants to merge 36 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
81a775b
From RSC: Use llvm-amdgpu instead of hip to determine ROCM_PATH
adrienbernede Nov 14, 2024
d743721
Update RSC with split env files
adrienbernede Nov 19, 2024
78b2b5d
Point at new PR in Uberenv
adrienbernede Nov 22, 2024
e430507
From Uberenv: Fix: support symbolic links
adrienbernede Nov 22, 2024
6f4f635
From RSC: Fix toss4_ib + set view at top level only
adrienbernede Nov 22, 2024
a1f1260
From RSC: Update tioga toolchain: rocm 6.2.4, cray-mpich 8.1.31, cce …
adrienbernede Nov 22, 2024
e077aed
Fix from RST and update local CI specs
adrienbernede Nov 22, 2024
8fe91b5
Export CMakeCache file as artifact
adrienbernede Nov 27, 2024
0c60f8b
Fix attempt
adrienbernede Nov 27, 2024
ce1b2e8
Test: change hostconfig extension to make it readable in UI
adrienbernede Nov 27, 2024
7f93ffd
Revert "Test: change hostconfig extension to make it readable in UI"
adrienbernede Nov 28, 2024
cc66272
Give artifact a unique name
adrienbernede Nov 28, 2024
2b0abe5
Fix: artifact name should be a string
adrienbernede Nov 28, 2024
29dd31a
Update radiuss shared ci
adrienbernede Nov 28, 2024
69349a7
From RSC: Sync with Spack@develop-2024-12-01
adrienbernede Dec 2, 2024
a777286
Do not unload rocm module
adrienbernede Dec 3, 2024
51e56eb
Revert updating Spack because of problem with develop-2024-12-01
adrienbernede Dec 10, 2024
77e2c26
Update RSC with improved compilers definition
adrienbernede Jan 7, 2025
b648b4e
From RSC: Fix: apply intel->oneapi to shared CI jobs
adrienbernede Jan 8, 2025
7b87968
Test Spack@develop with https://github.com/spack/spack/pull/48067 merged
adrienbernede Jan 8, 2025
2103648
From RSC: update to rocm 6.3.0 on tioga
adrienbernede Jan 8, 2025
78a7637
Update RSC
adrienbernede Jan 8, 2025
7fa36ca
From RSC: workarounds (rpath for missing lib) (requirement to enforce…
adrienbernede Jan 10, 2025
d496f71
From RSC: SYCL compiler update + Update w.r.t. spack@develop-2024-01-12
adrienbernede Jan 13, 2025
62ed5d2
Update RADIUSS Spack Configs
adrienbernede Jan 22, 2025
2b7a4bd
From RSC: change tioga gcc to be coherent with available cray-mpich
adrienbernede Jan 22, 2025
b121c5e
Update RADIUSS Spack Configs to new release
adrienbernede Jan 22, 2025
2558bad
Update uberenv and spack, better support of split environments
adrienbernede Feb 4, 2025
8317347
Update uberenv config file
adrienbernede Feb 4, 2025
3a92e3f
Do not try to setup clingo with spack
adrienbernede Feb 4, 2025
d0bcdf5
Test new PR in Uberenv
adrienbernede Feb 4, 2025
3b52b47
Update Uberenv
adrienbernede Feb 5, 2025
83e0b6f
Update Spack to fix bug
adrienbernede Feb 6, 2025
4f81be2
From RSC: Set upper limit for FMT version in Umpire due to bug
adrienbernede Feb 7, 2025
5faccc8
Update Spack to snapshot release + RSC merge
adrienbernede Feb 10, 2025
21d26e5
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 @@ -71,7 +71,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 @@ -85,7 +85,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: '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
8 changes: 4 additions & 4 deletions .gitlab/jobs/tioga.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
# the comparison with the original job is easier.

# We override the cce job because we can’t use +device-alloc with it
cce_18_0_0:
cce_18_0_1:
variables:
SPEC: "~shared +fortran tests=basic %cce@=18.0.0"
SPEC: "~shared +fortran tests=basic %cce@=18.0.1"
extends: .job_on_tioga

############
Expand All @@ -33,8 +33,8 @@ cce_18_0_0:
# This job intentionally tests our umpire package.py because although this job does not
# explicitly have the ~tools, the package.py should still prevent tools from being built.
###
rocmcc_6_2_0_hip_openmp_device_alloc:
rocmcc_6_3_0_hip_openmp_device_alloc:
variables:
SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.2.0 ^hip@6.2.0"
SPEC: "~shared +fortran +openmp +rocm +device_alloc tests=basic amdgpu_target=gfx90a %rocmcc@=6.3.0 ^hip@6.3.0"
extends: .job_on_tioga

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_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",
"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 @@ -203,10 +203,6 @@ then
cmake_options="-DBLT_MPI_COMMAND_APPEND:STRING=--overlap"
fi

if [[ "${truehostname}" == "corona" || "${truehostname}" == "tioga" ]]
then
module unload rocm
fi
$cmake_exe \
-C ${hostconfig_path} \
${cmake_options} \
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
Loading