Skip to content

Commit 97ab08d

Browse files
Various updates in RADIUSS Spack Configs (#627)
* From RSC: split config files + update toolchain on tioga * From RSC: update calipre and care packages * Export hostconfig file as artifact * From RSC: Sync with Spack@develop-2024-12-01 * From RSC: Fix Caliper package * Do not unload rocm module * Revert updating Spack because of problem with develop-2024-12-01 * Update Shared CI * From RSC: update to rocm 6.3.0 on tioga + sync with spack@develop + compiler rpaths * From RSC: workarounds (rpath for missing lib) (requirement to enforce single compiler) + fix intel->oneapi missing migration * From RSC: SYCL compiler update + Update w.r.t. spack@develop-2024-01-12 * Update RADIUSS Spack Configs * From RSC: change tioga gcc to be coherent with available cray-mpich * Update RADIUSS Spack Configs to new release * Update Spack and Uberenv to support split environments * Update Uberenv + Update Spack to fix bug * From RSC: Set upper limit for FMT version in Umpire due to bug * Update Spack to snapshot release + RSC merge * Fix
1 parent 7b17f96 commit 97ab08d

7 files changed

+11
-14
lines changed

.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
include:
7474
- local: '.gitlab/custom-jobs-and-variables.yml'
7575
- project: 'radiuss/radiuss-shared-ci'
76-
ref: 'v2024.07.0'
76+
ref: 'v2024.12.0'
7777
file: 'pipelines/${CI_MACHINE}.yml'
7878
- artifact: '${CI_MACHINE}-jobs.yml'
7979
job: 'generate-job-lists'
@@ -86,7 +86,7 @@ include:
8686
file: 'id_tokens.yml'
8787
# [Optional] checks preliminary to running the actual CI test
8888
- project: 'radiuss/radiuss-shared-ci'
89-
ref: 'v2024.07.0'
89+
ref: 'v2024.12.0'
9090
file: 'utilities/preliminary-ignore-draft-pr.yml'
9191
# pipelines subscribed by the project
9292
- local: '.gitlab/subscribed-pipelines.yml'

.gitlab/custom-jobs-and-variables.yml

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ variables:
7070
artifacts:
7171
reports:
7272
junit: junit.xml
73+
name: "${CI_PROJECT_NAME}-${CI_MACHINE}-${CI_JOB_NAME}-${CI_PIPELINE_ID}"
74+
paths:
75+
- ./*.cmake
7376

7477
.reproducer_vars:
7578
script:

.gitlab/jobs/tioga.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ variables:
2424
# This compiler is not considered reliable per issue in RAJA
2525
# https://github.com/LLNL/RAJA/pull/1712#issuecomment-2316335119
2626
# We allow failure and keep the cce 17.0.1 job below.
27-
cce_18_0_0:
27+
cce_18_0_1:
2828
variables:
29-
SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.0 ${PROJECT_TIOGA_DEPS}"
29+
SPEC: "${PROJECT_TIOGA_VARIANTS} %cce@=18.0.1 ${PROJECT_TIOGA_DEPS}"
3030
extends: .job_on_tioga
3131
allow_failure: true
3232

.uberenv_config.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
"package_source_dir" : "../..",
55
"package_final_phase" : "initconfig",
66
"spack_url": "https://github.com/spack/spack.git",
7-
"spack_branch": "develop-2024-10-06",
8-
"spack_activate" : {},
7+
"spack_branch": "develop-2025-02-09",
98
"spack_configs_path": "scripts/radiuss-spack-configs",
109
"spack_packages_path": "scripts/radiuss-spack-configs/packages",
1110
"spack_concretizer": "clingo",
12-
"spack_setup_clingo": false,
13-
"debug": true
11+
"spack_setup_clingo": false
1412
}

scripts/gitlab/build-and-test.sh

-4
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,6 @@ then
206206
mkdir -p ${build_dir} && cd ${build_dir}
207207

208208
timed_message "Building Caliper"
209-
if [[ "${truehostname}" == "corona" || "${truehostname}" == "tioga" ]]
210-
then
211-
module unload rocm
212-
fi
213209
if [[ "${truehostname}" == "lassen" || "${truehostname}" == "tioga" ]]
214210
then
215211
$cmake_exe \

scripts/radiuss-spack-configs

0 commit comments

Comments
 (0)