Skip to content

Commit

Permalink
Merge pull request #257 from LLNL/v2024.02.1-RC
Browse files Browse the repository at this point in the history 
V2024.02.1 RC merge to main
  • Loading branch information
@adayton1
adayton1 authored Apr 19, 2024
2 parents 4234114 + 3d339e2 commit 7597134
Show file tree
Hide file tree
Showing 17 changed files with 28 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
View file
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: 'v2023.12.0'
ref: 'v2023.12.3'
file: 'pipelines/${CI_MACHINE}.yml'
- artifact: '${CI_MACHINE}-jobs.yml'
job: 'generate-job-lists'
Expand All @@ -84,7 +84,7 @@ stages:
include:
# [Optional] checks preliminary to running the actual CI test
#- project: 'radiuss/radiuss-shared-ci'
# ref: 'v2023.12.0'
# ref: 'v2023.12.3'
# file: 'preliminary-ignore-draft-pr.yml'
# pipelines subscribed by the project
- local: '.gitlab/subscribed-pipelines.yml'
3 changes: 2 additions & 1 deletion .gitlab/jobs/corona.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.corona_reproducer_vars: &corona_reproducer_vars
.corona_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/lassen.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.lassen_reproducer_vars: &lassen_reproducer_vars
.lassen_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/poodle.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
###############################################################################

# Override reproducer section to define projet specific variables.
.poodle_reproducer_vars: &poodle_reproducer_vars
.poodle_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/ruby.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
###############################################################################

# Override reproducer section to define project specific variables.
.ruby_reproducer_vars: &ruby_reproducer_vars
.ruby_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
3 changes: 2 additions & 1 deletion .gitlab/jobs/tioga.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
##############################################################################

# Override reproducer section to define project specific variables.
.tioga_reproducer_vars: &tioga_reproducer_vars
.tioga_reproducer_vars:
script:
- |
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
Expand Down
5 changes: 2 additions & 3 deletions .uberenv_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
"package_final_phase" : "initconfig",
"package_source_dir" : "../..",
"spack_url": "https://github.com/spack/spack.git",
"spack_branch": "develop-2024-01-21",
"spack_branch": "develop-2024-02-18",
"spack_activate" : {},
"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
}
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cmake_policy(SET CMP0025 NEW)
include(CMakeDependentOption)
include(CMakePackageConfigHelpers)

project(Chai LANGUAGES C CXX VERSION 2024.02.0)
project(Chai LANGUAGES C CXX VERSION 2024.02.1)
cmake_minimum_required(VERSION 3.14)

include(cmake/SetupChaiOptions.cmake)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[comment]: # (# SPDX-License-Identifier: BSD-3-Clause)
[comment]: # (#################################################################)

# CHAI v2024.02.0
# CHAI v2024.02.1

[![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)
[![Build Status](https://travis-ci.org/LLNL/CHAI.svg?branch=develop)](https://travis-ci.org/LLNL/CHAI)
Expand Down
5 changes: 5 additions & 0 deletions RELEASE_NOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ in this file.

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

## [Version 2024.02.1] - Release date 2024-04-19

### Changed
- Updated to BLT v0.6.2, Umpire v2024.02.1, and RAJA v2024.02.1

## [Version 2024.02.0] - Release date 2024-03-04

### Added
Expand Down
2 changes: 1 addition & 1 deletion blt
Submodule blt updated 25 files
+1 −1 .gitlab-ci.yml
+1 −1 .gitlab/build_lassen.yml
+1 −1 .gitlab/build_quartz.yml
+1 −1 .gitlab/build_tioga.yml
+3 −7 .gitlab/run_project_integration_tests.sh
+16 −1 RELEASE-NOTES.md
+9 −10 SetupBLT.cmake
+7 −19 cmake/BLTMacros.cmake
+0 −77 cmake/BLTPrivateMacros.cmake
+30 −22 cmake/BLTSetupTargets.cmake
+19 −24 cmake/BLTThirdPartyConfigFlags.cmake.in
+30 −10 cmake/SetupCompilerOptions.cmake
+2 −2 cmake/thirdparty/BLTSetupCUDA.cmake
+38 −25 cmake/thirdparty/BLTSetupOpenMP.cmake
+3 −1 host-configs/llnl/toss_4_x86_64_ib/[email protected]
+0 −29 tests/projects/cuda-arch/base/[email protected]_nvcc_c++14_lassen.cmake
+7 −26 tests/projects/cuda-arch/downstream/CMakeLists.txt
+7 −0 tests/projects/cuda-mpi-cpp/downstream/CMakeLists.txt
+0 −21 tests/projects/hip-config-test/base/[email protected]_hip.cmake
+7 −0 tests/projects/hip-config-test/downstream/CMakeLists.txt
+7 −0 tests/projects/mpi-cpp-fortran/downstream/CMakeLists.txt
+0 −4 tests/projects/openmp-cpp-fortran/base/[email protected]
+7 −0 tests/projects/openmp-cpp-fortran/downstream/CMakeLists.txt
+7 −0 tests/projects/openmp-mpi-cpp/downstream/CMakeLists.txt
+218 −217 tests/projects/run_tests.py
2 changes: 1 addition & 1 deletion docs/sphinx/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# The short X.Y version.
version = u'2024.02'
# The full version, including alpha/beta/rc tags.
release = u'2024.02.0'
release = u'2024.02.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/sphinx/conf.py.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ author = u''
# The short X.Y version.
version = u'2024.02'
# The full version, including alpha/beta/rc tags.
release = u'2024.02.0'
release = u'2024.02.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion scripts/make_release_tarball.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
##############################################################################

TAR_CMD=gtar
VERSION=2024.02.0
VERSION=2024.02.1

git archive --prefix=chai-${VERSION}/ -o chai-${VERSION}.tar HEAD 2> /dev/null

Expand Down
2 changes: 1 addition & 1 deletion scripts/radiuss-spack-configs
Submodule radiuss-spack-configs updated 21 files
+4 −3 README.md
+127 −140 blueos_3_ppc64le_ib/compilers.yaml
+72 −12 blueos_3_ppc64le_ib/packages.yaml
+11 −2 docs/sphinx/user_guide/use_spack.rst
+1 −1 gitlab/radiuss-jobs/corona.yml
+6 −5 gitlab/radiuss-jobs/lassen.yml
+4 −4 gitlab/radiuss-jobs/poodle.yml
+4 −4 gitlab/radiuss-jobs/ruby.yml
+2 −2 gitlab/radiuss-jobs/tioga.yml
+48 −0 packages/blt/package.py
+34 −11 packages/caliper/package.py
+24 −0 packages/camp/libstdc++-13-missing-header.patch
+19 −61 packages/camp/package.py
+13 −0 packages/chai/change_mpi_target_name_umpire_patch.patch
+25 −27 packages/chai/package.py
+2 −1 packages/fmt/package.py
+200 −63 packages/raja/package.py
+2 −2 packages/raja_perf/package.py
+106 −0 packages/umpire/dual_blt_import_umpire_2022.10_2023.06.patch
+211 −109 packages/umpire/package.py
+19 −19 toss_4_x86_64_ib_cray/compilers.yaml
2 changes: 1 addition & 1 deletion src/tpl/raja
Submodule raja updated 19 files
+2 −2 .gitlab-ci.yml
+4 −4 .gitlab/custom-jobs-and-variables.yml
+3 −2 .gitlab/jobs/corona.yml
+8 −7 .gitlab/jobs/lassen.yml
+9 −11 .gitlab/jobs/poodle.yml
+9 −11 .gitlab/jobs/ruby.yml
+4 −3 .gitlab/jobs/tioga.yml
+1 −1 .uberenv_config.json
+1 −1 CMakeLists.txt
+1 −2 Dockerfile
+19 −0 RELEASE_NOTES.md
+1 −1 blt
+1 −1 docs/conf.py
+3 −3 host-configs/lc-builds/toss4/corona_sycl.cmake
+4 −6 include/RAJA/policy/sycl/launch.hpp
+11 −11 include/RAJA/policy/sycl/reduce.hpp
+16 −6 scripts/lc-builds/corona_sycl.sh
+1 −1 scripts/radiuss-spack-configs
+1 −1 tpl/camp
2 changes: 1 addition & 1 deletion src/tpl/umpire
Submodule umpire updated 23 files
+2 −2 .gitlab-ci.yml
+1 −1 .gitlab/jobs/corona.yml
+14 −14 .gitlab/jobs/lassen.yml
+6 −6 .gitlab/jobs/poodle.yml
+6 −6 .gitlab/jobs/ruby.yml
+2 −2 .gitlab/jobs/tioga.yml
+1 −1 .uberenv_config.json
+1 −1 CMakeLists.txt
+7 −3 Dockerfile
+1 −1 README.md
+1 −1 RELEASE
+4 −0 RELEASE_NOTES.md
+1 −1 blt
+1 −0 cmake/SetupUmpireOptions.cmake
+1 −1 docs/sphinx/conf.py.in
+1 −1 scripts/make_release_tarball.sh
+1 −1 scripts/radiuss-spack-configs
+3 −3 src/tpl/CMakeLists.txt
+1 −1 src/tpl/umpire/camp
+1 −1 src/umpire/event/CMakeLists.txt
+1 −1 src/umpire/resource/CMakeLists.txt
+1 −1 src/umpire/util/CMakeLists.txt
+1 −1 umpire-config.cmake.in

0 comments on commit 7597134

Please sign in to comment.