Merge pull request #275 from LLNL/v0.13.2-RC

* CARE v0.13.2 release --------- Co-authored-by: Adrien Bernede <[email protected]>
LLNL · Jul 29, 2024 · b25dcd2 · b25dcd2
2 parents 0fd0d47 + e5e9a12
commit b25dcd2
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 118 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,9 +19,9 @@ jobs:
     - name: Set up CMake
       uses: jwlawson/[email protected]
       with:
-        cmake-version: '3.20.x'
+        cmake-version: '3.23.x'
     - name: Run CMake
-      run: cmake ../ -DCMAKE_BUILD_TYPE=Debug
+      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
       working-directory: build
     - name: Run make
       run: make -j

diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml
@@ -21,7 +21,7 @@ variables:
 # Project specific variants for ruby
   PROJECT_RUBY_VARIANTS: ""
 # Project specific deps for ruby
-  PROJECT_RUBY_DEPS: ""
+  PROJECT_RUBY_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
 
 # Poodle
 # Arguments for top level allocation
@@ -31,7 +31,7 @@ variables:
 # Project specific variants for poodle
   PROJECT_POODLE_VARIANTS: ""
 # Project specific deps for poodle
-  PROJECT_POODLE_DEPS: ""
+  PROJECT_POODLE_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
 
 # Corona
 # Arguments for top level allocation
@@ -41,7 +41,7 @@ variables:
 # Project specific variants for corona
   PROJECT_CORONA_VARIANTS: ""
 # Project specific deps for corona
-  PROJECT_CORONA_DEPS: ""
+  PROJECT_CORONA_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
 
 # Tioga
 # Arguments for top level allocation
@@ -51,7 +51,7 @@ variables:
 # Project specific variants for tioga
   PROJECT_TIOGA_VARIANTS: ""
 # Project specific deps for tioga
-  PROJECT_TIOGA_DEPS: ""
+  PROJECT_TIOGA_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
 
 # Lassen and Butte use a different job scheduler (spectrum lsf) that does not
 # allow pre-allocation the same way slurm does.
@@ -60,7 +60,7 @@ variables:
 # Project specific variants for lassen
   PROJECT_LASSEN_VARIANTS: " cuda_arch=70"
 # Project specific deps for lassen
-  PROJECT_LASSEN_DEPS: ""
+  PROJECT_LASSEN_DEPS: "^umpire~c~shared ^raja~examples~exercises~tests ^chai~shared~examples "
 
 # Configuration shared by build and test jobs specific to this project.
 # Not all configuration can be shared. Here projects can fine tune the

diff --git a/.uberenv_config.json b/.uberenv_config.json
@@ -4,7 +4,7 @@
 "package_final_phase": "initconfig",
 "package_source_dir": "../..",
 "spack_url": "https://github.com/spack/spack.git",
-"spack_branch": "develop-2024-05-26",
+"spack_branch": "develop-2024-07-07",
 "spack_activate": {},
 "spack_configs_path": "scripts/radiuss-spack-configs",
 "spack_packages_path": ["scripts/radiuss-spack-configs/packages", "scripts/spack_packages/packages"],

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,15 +9,15 @@
 # Set up CMake
 ##########################################################################
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.23)
 
 ##########################################################################
 # Set up project
 ##########################################################################
 
 project(CARE
         LANGUAGES C CXX
-        VERSION 0.13.1)
+        VERSION 0.13.2)
 
 include(${PROJECT_SOURCE_DIR}/cmake/Setup.cmake)
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [comment]: # (SPDX-License-Identifier: BSD-3-Clause)
 [comment]: # (#################################################################)
 
-# CARE v0.13.1
+# CARE v0.13.2
 
 CARE: CHAI and RAJA Extensions
 ===============================

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -12,6 +12,12 @@ in this file.
 
 The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [Version 0.13.2] - Release date 2024-07-29
+
+### Changed
+- Updated to Umpire/RAJA/CHAI v2024.07.0
+- Updated minimum required CMake to 3.23
+
 ## [Version 0.13.1] - Release date 2024-06-27
 
 ### Changed

diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
@@ -57,7 +57,7 @@
 # The short X.Y version.
 version = '0.13'
 # The full version, including alpha/beta/rc tags.
-release = '0.13.1'
+release = '0.13.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/scripts/make_release_tarball.sh b/scripts/make_release_tarball.sh
@@ -8,7 +8,7 @@
 ##############################################################################
 
 TAR_CMD=gtar
-VERSION=0.13.1
+VERSION=0.13.2
 
 git archive --prefix=care-${VERSION}/ -o care-${VERSION}.tar HEAD 2> /dev/null
 

diff --git a/scripts/radiuss-spack-configs b/scripts/radiuss-spack-configs
diff --git a/tpl/chai b/tpl/chai
diff --git a/tpl/patches/chai/CMakeLists.txt b/tpl/patches/chai/CMakeLists.txt
diff --git a/tpl/raja b/tpl/raja
diff --git a/tpl/umpire b/tpl/umpire
diff --git a/tpl/versions.txt b/tpl/versions.txt
@@ -6,6 +6,6 @@
 ##############################################################################
 
 BLT: 0.6.2
-CHAI: v2024.02.2
-RAJA: v2024.02.2
-Umpire: v2024.02.1
+CHAI: v2024.07.0
+RAJA: v2024.07.0
+Umpire: v2024.07.0
+6 −6		.readthedocs.yml
+3 −0		docs/requirements.txt
+0 −0		docs/sphinx/conf.py
+1 −1		docs/sphinx/index.rst
+15 −0		packages/camp/camp-rocm6.patch
+33 −2		packages/camp/package.py
+109 −72		packages/care/package.py
+19 −1		packages/chai/package.py
+8 −2		packages/fmt/package.py
+48 −13		packages/raja/package.py
+11 −2		packages/umpire/package.py
+26 −0		toss_4_x86_64_ib/spack.yaml
+6 −6		.gitlab/custom-jobs-and-variables.yml
+1 −1		.uberenv_config.json
+2 −2		CMakeLists.txt
+18 −58		Dockerfile
+1 −1		README.md
+8 −0		RELEASE_NOTES.md
+12 −14		azure-pipelines.yml
+3 −3		cmake/SetupChaiOptions.cmake
+2 −0		cmake/thirdparty/SetupChaiThirdparty.cmake
+2 −2		docs/sphinx/conf.py
+2 −2		docs/sphinx/conf.py.in
+1 −1		scripts/make_release_tarball.sh
+1 −1		scripts/radiuss-spack-configs
+1 −1		src/tpl/raja
+1 −1		src/tpl/umpire
+68 −0		.github/workflows/build.yml
+5 −2		.gitlab-ci.yml
+15 −3		.gitlab/custom-jobs-and-variables.yml
+1 −3		.gitlab/jobs/corona.yml
+2 −3		.gitlab/jobs/lassen.yml
+1 −3		.gitlab/jobs/poodle.yml
+1 −3		.gitlab/jobs/ruby.yml
+4 −7		.gitlab/jobs/tioga.yml
+1 −1		.uberenv_config.json
+2 −2		CMakeLists.txt
+17 −71		Dockerfile
+1 −1		README.md
+1 −1		RELEASE
+16 −0		RELEASE_NOTES.md
+0 −116		azure-pipelines.yml
+36 −0		cmake/SetupCompilerFlags.cmake
+1 −1		docs/conf.py
+2 −2		docs/sphinx/conf.py.in
+10 −2		examples/cookbook/CMakeLists.txt
+74 −0		examples/cookbook/recipe_control_granularity.cpp
+104 −64		scripts/gitlab/build_and_test.sh
+1 −1		scripts/make_release_tarball.sh
+1 −1		scripts/radiuss-spack-configs
+1 −1		scripts/uberenv
+1 −1		src/tpl/umpire/camp
+9 −0		src/umpire/ResourceManager.cpp
+1 −0		src/umpire/alloc/CMakeLists.txt
+32 −0		src/umpire/alloc/HipAllocator.hpp
+38 −7		src/umpire/alloc/HipMallocAllocator.hpp
+23 −1		src/umpire/alloc/HipMallocManagedAllocator.hpp
+33 −2		src/umpire/alloc/HipPinnedAllocator.hpp
+1 −0		src/umpire/config.hpp.in
+1 −1		src/umpire/interface/c_fortran/CMakeLists.txt
+0 −2		src/umpire/op/HipAdviseOperation.hpp
+0 −2		src/umpire/op/HipCopyOperation.hpp
+0 −2		src/umpire/op/MemoryOperationRegistry.cpp
+4 −0		src/umpire/resource/CMakeLists.txt
+0 −2		src/umpire/resource/HipConstantMemoryResource.hpp
+1 −1		src/umpire/resource/HipDeviceMemoryResource.cpp
+54 −0		src/umpire/resource/HipPinnedMemoryResource.cpp
+41 −0		src/umpire/resource/HipPinnedMemoryResource.hpp
+1 −3		src/umpire/resource/HipPinnedMemoryResourceFactory.cpp
+1 −0		src/umpire/resource/HipPinnedMemoryResourceFactory.hpp
+54 −0		src/umpire/resource/HipUnifiedMemoryResource.cpp
+41 −0		src/umpire/resource/HipUnifiedMemoryResource.hpp
+2 −4		src/umpire/resource/HipUnifiedMemoryResourceFactory.cpp
+28 −1		src/umpire/resource/MemoryResourceRegistry.cpp
+6 −2		src/umpire/resource/MemoryResourceTypes.hpp
+4 −0		src/umpire/util/MemoryResourceTraits.hpp
+1 −1		tests/install/using-with-cmake/CMakeLists.txt
+27 −0		tests/integration/allocator_integration_tests.cpp