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.

Sign up for GitHub

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

Jump to bottom

Use [email protected] and update Spack #563

Merged
merged 4 commits into from
Jun 5, 2024
Merged

Use [email protected] and update Spack #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
833381c
Radiuss Spack Configs and Uberenv were reverted to older version
adrienbernede Jun 4, 2024
90882bf
Use [email protected] for local and shared tioga CI jobs
adrienbernede Jun 4, 2024
1ca5944
Point at RSC@main
adrienbernede Jun 4, 2024
a34004b
Merge branch 'master' into woptim/rocm-6-1-1
adrienbernede Jun 5, 2024
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/jobs/tioga.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ master:
SPEC: " +tests %[email protected]"
extends: .job_on_tioga

rocmcc_5_7_1_hip:
rocmcc_6_1_1_hip:
variables:
ON_TIOGA: "OFF"
SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@5.7.1 ^hip@5.7.1 ${PROJECT_TIOGA_DEPS}"
SPEC: "${PROJECT_TIOGA_VARIANTS} +rocm amdgpu_target=gfx90a %rocmcc@6.1.1 ^hip@6.1.1 ${PROJECT_TIOGA_DEPS}"
extends: .job_on_tioga
2 changes: 1 addition & 1 deletion .uberenv_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package_source_dir" : "../..",
"package_final_phase" : "initconfig",
"spack_url": "https://github.com/spack/spack.git",
"spack_branch": "develop-2024-02-18",
"spack_branch": "develop-2024-05-26",
"spack_activate" : {},
"spack_configs_path": "scripts/radiuss-spack-configs",
"spack_packages_path": "scripts/radiuss-spack-configs/packages",
Expand Down
2 changes: 1 addition & 1 deletion scripts/radiuss-spack-configs
Open in desktop
Submodule radiuss-spack-configs updated 6 files
+2 −2 gitlab/radiuss-jobs/tioga.yml
+15 −14 packages/caliper/package.py
+13 −30 packages/camp/package.py
+90 −63 packages/chai/package.py
+8 −6 packages/umpire/package.py
+33 −6 toss_4_x86_64_ib_cray/spack.yaml
Loading