Skip to content

Commit 5ba0944

Browse files
adayton1adrienbernedeliu15
authored
Merge pull request #267 from LLNL/v2024.02.2-RC
* Compiler wrappers + update packages + use spack environments (#255) * Update radiuss-shared-ci, fix reproducer, update spack, update RSC * From RSC: Update BLT requirement, change RAJA default variants, Remove CUDA_ARCH, Fix MPI utility function (used by RAJAPerf) * From RSC: Restore basic MPI support in RAJAPerf * From RSC: RAJAPerf, Umpire, Caliper MPI handling like Axom * From RSC: Fix missing import * Move to Environments in RSC * From RSC: add CARE * From RSC: Fix merge with CARE package * Point at RADIUSS Spack Configs @ main * Use new pci queue on tioga * Apply CI queue to top level allocation * Increase lassen allocation * Apply changes required by LC (token handling) * Allow failure for jobs using dependencies@develop --------- Co-authored-by: Alan Dayton <[email protected]> * Add CHAI_GLOBAL macro (#260) * Improvements for gpu_sim mode, especially with managed ptrs (#262) * Update RSC with rocm 6.1.1 and Spack accordingly (#261) * Update RSC with rocm 6.1.1 and Spack accordingly * From RSC: Fix typo * Do not test installation with HIP * Point at RSC@main --------- Co-authored-by: Alan Dayton <[email protected]> * Use GitLab container registry as a Spack build cache (#263) * Use seq_exec in place of loop_exec (#266) * Tick release number * Update to RAJA v2024.02.2 --------- Co-authored-by: Adrien Bernede <[email protected]> Co-authored-by: Ben Liu <[email protected]>
2 parents 7597134 + d74f44a commit 5ba0944

25 files changed

+306
-156
lines changed

‎.gitlab-ci.yml

Lines changed: 4 additions & 2 deletions
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: 'v2023.12.3'
76+
ref: 'v2024.04.0'
7777
file: 'pipelines/${CI_MACHINE}.yml'
7878
- artifact: '${CI_MACHINE}-jobs.yml'
7979
job: 'generate-job-lists'
@@ -82,9 +82,11 @@ stages:
8282
pipeline_variables: true
8383

8484
include:
85+
- project: 'lc-templates/id_tokens'
86+
file: 'id_tokens.yml'
8587
# [Optional] checks preliminary to running the actual CI test
8688
#- project: 'radiuss/radiuss-shared-ci'
87-
# ref: 'v2023.12.3'
89+
# ref: 'v2024.04.0'
8890
# file: 'preliminary-ignore-draft-pr.yml'
8991
# pipelines subscribed by the project
9092
- local: '.gitlab/subscribed-pipelines.yml'

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ variables:
4646

4747
# Tioga
4848
# Arguments for top level allocation
49-
TIOGA_SHARED_ALLOC: "--exclusive --time-limit=16m --nodes=1"
49+
TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=16m --nodes=1"
5050
# Arguments for job level allocation
5151
TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
5252
# Project specific variants for tioga
@@ -57,7 +57,7 @@ variables:
5757
# Lassen and Butte use a different job scheduler (spectrum lsf) that does not
5858
# allow pre-allocation the same way slurm does.
5959
# Arguments for job level allocation
60-
LASSEN_JOB_ALLOC: "1 -W 8 -q pci"
60+
LASSEN_JOB_ALLOC: "1 -W 10 -q pci"
6161
# Project specific variants for lassen
6262
PROJECT_LASSEN_VARIANTS: "~shared +raja cuda_arch=70 tests=basic"
6363
# Project specific deps for lassen
@@ -71,3 +71,15 @@ variables:
7171
artifacts:
7272
reports:
7373
junit: junit.xml
74+
75+
.reproducer_vars:
76+
script:
77+
- |
78+
echo -e "
79+
# Required variables \n
80+
export MODULE_LIST=\"${MODULE_LIST}\" \n
81+
export SPEC=\"${SPEC//\"/\\\"}\" \n
82+
# Allow to set job script for debugging (only this differs from CI) \n
83+
export DEBUG_MODE=true \n
84+
# Using the CI build cache is optional and requires a token. Set it like so: \n
85+
# export REGISTRY_TOKEN=\"<your token here>\" \n"

‎.gitlab/jobs/corona.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
# Override reproducer section to define project specific variables.
99
.corona_reproducer_vars:
1010
script:
11-
- |
12-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
13-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
11+
- !reference [.reproducer_vars, script]
1412

1513
########################
1614
# Overridden shared jobs

‎.gitlab/jobs/lassen.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
# Override reproducer section to define project specific variables.
99
.lassen_reproducer_vars:
1010
script:
11-
- |
12-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
13-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
11+
- !reference [.reproducer_vars, script]
1412

1513
########################
1614
# Overridden shared jobs

‎.gitlab/jobs/poodle.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
# Override reproducer section to define projet specific variables.
99
.poodle_reproducer_vars:
1010
script:
11-
- |
12-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
13-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
11+
- !reference [.reproducer_vars, script]
1412

1513
########################
1614
# Overridden shared jobs
@@ -32,3 +30,4 @@ clang_14_0_6_develop_tpls:
3230
variables:
3331
SPEC: " %[email protected] ^umpire@develop ^raja@develop ^camp@main"
3432
extends: .job_on_poodle
33+
allow_failure: true

‎.gitlab/jobs/ruby.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
# Override reproducer section to define project specific variables.
99
.ruby_reproducer_vars:
1010
script:
11-
- |
12-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
13-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
11+
- !reference [.reproducer_vars, script]
1412

1513
########################
1614
# Overridden shared jobs
@@ -32,3 +30,4 @@ clang_14_0_6_develop_tpls:
3230
variables:
3331
SPEC: " %[email protected] ^umpire@develop ^raja@develop ^camp@main"
3432
extends: .job_on_ruby
33+
allow_failure: true

‎.gitlab/jobs/tioga.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
# Override reproducer section to define project specific variables.
99
.tioga_reproducer_vars:
1010
script:
11-
- |
12-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
13-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
11+
- !reference [.reproducer_vars, script]
1412

1513
########################
1614
# Overridden shared jobs

‎.uberenv_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"package_final_phase" : "initconfig",
55
"package_source_dir" : "../..",
66
"spack_url": "https://github.com/spack/spack.git",
7-
"spack_branch": "develop-2024-02-18",
7+
"spack_branch": "develop-2024-05-26",
88
"spack_activate" : {},
99
"spack_configs_path": "scripts/radiuss-spack-configs",
1010
"spack_packages_path": "scripts/radiuss-spack-configs/packages",

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cmake_policy(SET CMP0025 NEW)
1111
include(CMakeDependentOption)
1212
include(CMakePackageConfigHelpers)
1313

14-
project(Chai LANGUAGES C CXX VERSION 2024.02.1)
14+
project(Chai LANGUAGES C CXX VERSION 2024.02.2)
1515
cmake_minimum_required(VERSION 3.14)
1616

1717
include(cmake/SetupChaiOptions.cmake)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
77
[comment]: # (#################################################################)
88

9-
# CHAI v2024.02.1
9+
# CHAI v2024.02.2
1010

1111
[![Azure Build Status](https://dev.azure.com/davidbeckingsale/CHAI/_apis/build/status/LLNL.CHAI?branchName=develop)](https://dev.azure.com/davidbeckingsale/CHAI/_build/latest?definitionId=2&branchName=develop)
1212
[![Build Status](https://travis-ci.org/LLNL/CHAI.svg?branch=develop)](https://travis-ci.org/LLNL/CHAI)

‎RELEASE_NOTES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ in this file.
1313

1414
The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
1515

16+
## [Version 2024.02.2] - Release date 2024-06-26
17+
18+
### Changed
19+
- Updated to RAJA v2024.02.2
20+
- Improved debugging with GPU simulation mode
21+
1622
## [Version 2024.02.1] - Release date 2024-04-19
1723

1824
### Changed

‎docs/sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
# The short X.Y version.
6464
version = u'2024.02'
6565
# The full version, including alpha/beta/rc tags.
66-
release = u'2024.02.1'
66+
release = u'2024.02.2'
6767

6868
# The language for content autogenerated by Sphinx. Refer to documentation
6969
# for a list of supported languages.

‎docs/sphinx/conf.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ author = u''
6262
# The short X.Y version.
6363
version = u'2024.02'
6464
# The full version, including alpha/beta/rc tags.
65-
release = u'2024.02.1'
65+
release = u'2024.02.2'
6666

6767
# The language for content autogenerated by Sphinx. Refer to documentation
6868
# for a list of supported languages.

0 commit comments

Comments
 (0)