Skip to content

Commit b25dcd2

Browse files
Merge pull request #275 from LLNL/v0.13.2-RC
* CARE v0.13.2 release --------- Co-authored-by: Adrien Bernede <51493078+adrienbernede@users.noreply.github.com>
2 parents 0fd0d47 + e5e9a12 commit b25dcd2

File tree

14 files changed

+26
-118
lines changed

14 files changed

+26
-118
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- name: Set up CMake
2020
uses: jwlawson/actions-setup-cmake@v1.13.1
2121
with:
22-
cmake-version: '3.20.x'
22+
cmake-version: '3.23.x'
2323
- name: Run CMake
24-
run: cmake ../ -DCMAKE_BUILD_TYPE=Debug
24+
run: cmake ../ -DCMAKE_BUILD_TYPE=Debug -DCARE_ENABLE_SUBMODULE_TESTS=Off -DCARE_ENABLE_SUBMODULE_BENCHMARKS=Off -DCARE_ENABLE_SUBMODULE_EXAMPLES=Off -DCARE_ENABLE_SUBMODULE_EXERCISES=Off -DCARE_ENABLE_SUBMODULE_DOCS=Off
2525
working-directory: build
2626
- name: Run make
2727
run: make -j

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ variables:
2121
# Project specific variants for ruby
2222
PROJECT_RUBY_VARIANTS: ""
2323
# Project specific deps for ruby
24-
PROJECT_RUBY_DEPS: ""
24+
PROJECT_RUBY_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
2525

2626
# Poodle
2727
# Arguments for top level allocation
@@ -31,7 +31,7 @@ variables:
3131
# Project specific variants for poodle
3232
PROJECT_POODLE_VARIANTS: ""
3333
# Project specific deps for poodle
34-
PROJECT_POODLE_DEPS: ""
34+
PROJECT_POODLE_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
3535

3636
# Corona
3737
# Arguments for top level allocation
@@ -41,7 +41,7 @@ variables:
4141
# Project specific variants for corona
4242
PROJECT_CORONA_VARIANTS: ""
4343
# Project specific deps for corona
44-
PROJECT_CORONA_DEPS: ""
44+
PROJECT_CORONA_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
4545

4646
# Tioga
4747
# Arguments for top level allocation
@@ -51,7 +51,7 @@ variables:
5151
# Project specific variants for tioga
5252
PROJECT_TIOGA_VARIANTS: ""
5353
# Project specific deps for tioga
54-
PROJECT_TIOGA_DEPS: ""
54+
PROJECT_TIOGA_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
5555

5656
# Lassen and Butte use a different job scheduler (spectrum lsf) that does not
5757
# allow pre-allocation the same way slurm does.
@@ -60,7 +60,7 @@ variables:
6060
# Project specific variants for lassen
6161
PROJECT_LASSEN_VARIANTS: " cuda_arch=70"
6262
# Project specific deps for lassen
63-
PROJECT_LASSEN_DEPS: ""
63+
PROJECT_LASSEN_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
6464

6565
# Configuration shared by build and test jobs specific to this project.
6666
# Not all configuration can be shared. Here projects can fine tune the

.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-05-26",
7+
"spack_branch": "develop-2024-07-07",
88
"spack_activate": {},
99
"spack_configs_path": "scripts/radiuss-spack-configs",
1010
"spack_packages_path": ["scripts/radiuss-spack-configs/packages", "scripts/spack_packages/packages"],

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
# Set up CMake
1010
##########################################################################
1111

12-
cmake_minimum_required(VERSION 3.18)
12+
cmake_minimum_required(VERSION 3.23)
1313

1414
##########################################################################
1515
# Set up project
1616
##########################################################################
1717

1818
project(CARE
1919
LANGUAGES C CXX
20-
VERSION 0.13.1)
20+
VERSION 0.13.2)
2121

2222
include(${PROJECT_SOURCE_DIR}/cmake/Setup.cmake)
2323

README.md

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

8-
# CARE v0.13.1
8+
# CARE v0.13.2
99

1010
CARE: CHAI and RAJA Extensions
1111
===============================

RELEASE_NOTES.md

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

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

15+
## [Version 0.13.2] - Release date 2024-07-29
16+
17+
### Changed
18+
- Updated to Umpire/RAJA/CHAI v2024.07.0
19+
- Updated minimum required CMake to 3.23
20+
1521
## [Version 0.13.1] - Release date 2024-06-27
1622

1723
### Changed

docs/sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
# The short X.Y version.
5858
version = '0.13'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '0.13.1'
60+
release = '0.13.2'
6161

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

scripts/make_release_tarball.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
##############################################################################
99

1010
TAR_CMD=gtar
11-
VERSION=0.13.1
11+
VERSION=0.13.2
1212

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

tpl/patches/chai/CMakeLists.txt

Lines changed: 0 additions & 98 deletions
This file was deleted.

tpl/raja

Submodule raja updated 143 files

tpl/umpire

Submodule umpire updated 51 files

tpl/versions.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
##############################################################################
77

88
BLT: 0.6.2
9-
CHAI: v2024.02.2
10-
RAJA: v2024.02.2
11-
Umpire: v2024.02.1
9+
CHAI: v2024.07.0
10+
RAJA: v2024.07.0
11+
Umpire: v2024.07.0

0 commit comments

Comments
 (0)