From cdba82848cf0e6791f7cbac4282bcda18e8aee08 Mon Sep 17 00:00:00 2001 From: Alan Dayton Date: Mon, 29 Jul 2024 10:04:31 -0700 Subject: [PATCH] Prepare for 0.13.2 release --- .github/workflows/ci.yml | 4 +- .gitlab/custom-jobs-and-variables.yml | 10 +-- CMakeLists.txt | 4 +- README.md | 2 +- RELEASE_NOTES.md | 6 ++ docs/sphinx/conf.py | 2 +- scripts/make_release_tarball.sh | 2 +- tpl/chai | 2 +- tpl/patches/chai/CMakeLists.txt | 98 --------------------------- tpl/raja | 2 +- tpl/umpire | 2 +- tpl/versions.txt | 6 +- 12 files changed, 24 insertions(+), 116 deletions(-) delete mode 100644 tpl/patches/chai/CMakeLists.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 292a1555..c2e354b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,9 @@ jobs: - name: Set up CMake uses: jwlawson/actions-setup-cmake@v1.13.1 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 index f8c97ab8..240b3f2c 100644 --- 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/CMakeLists.txt b/CMakeLists.txt index 28c9988e..706d2e12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ # Set up CMake ########################################################################## -cmake_minimum_required(VERSION 3.18) +cmake_minimum_required(VERSION 3.23) ########################################################################## # Set up project @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.18) 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 index 4a0fb027..31080231 100644 --- 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 index 1f349ed7..206a8c4d 100644 --- 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 CMake required 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 index afb969d5..63e5eb79 100644 --- 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 index 85d0f7d7..c1fc4c4e 100755 --- 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/tpl/chai b/tpl/chai index 5ba0944d..df7741f1 160000 --- a/tpl/chai +++ b/tpl/chai @@ -1 +1 @@ -Subproject commit 5ba0944d862513f600432c34b009824875df27e5 +Subproject commit df7741f1dbbdc5fff5f7d626151fdf1904e62b19 diff --git a/tpl/patches/chai/CMakeLists.txt b/tpl/patches/chai/CMakeLists.txt deleted file mode 100644 index 0526a926..00000000 --- a/tpl/patches/chai/CMakeLists.txt +++ /dev/null @@ -1,98 +0,0 @@ -############################################################################## -# Copyright (c) 2016-20, Lawrence Livermore National Security, LLC and CHAI -# project contributors. See the COPYRIGHT file for details. -# -# SPDX-License-Identifier: BSD-3-Clause -############################################################################## -cmake_policy(SET CMP0057 NEW) -cmake_policy(SET CMP0048 NEW) -cmake_policy(SET CMP0025 NEW) - -project(Chai LANGUAGES CXX VERSION 2.4.0) - -set(ENABLE_CUDA Off CACHE BOOL "Enable CUDA") -set(ENABLE_HIP Off CACHE BOOL "Enable HIP") -set(ENABLE_GPU_SIMULATION_MODE Off CACHE BOOL "Enable GPU Simulation Mode") -set(ENABLE_OPENMP OFF CACHE BOOL "Enable OpenMP") -set(ENABLE_MPI Off CACHE BOOL "Enable MPI (for umpire replay only)") -set(CHAI_ENABLE_BENCHMARKS On CACHE BOOL "Enable benchmarks") -option(ENABLE_IMPLICIT_CONVERSIONS "Enable implicit conversions to-from raw pointers" On) -option(DISABLE_RM "Make ManagedArray a thin wrapper" Off) -mark_as_advanced(DISABLE_RM) -option(ENABLE_UM "Use CUDA unified (managed) memory" Off) -option(ENABLE_PINNED "Use pinned host memory" Off) -option(ENABLE_RAJA_PLUGIN "Build plugin to set RAJA execution spaces" Off) -option(CHAI_ENABLE_GPU_ERROR_CHECKING "Enable GPU error checking" On) -option(CHAI_ENABLE_MANAGED_PTR "Enable managed_ptr" On) -option(CHAI_DEBUG "Enable Debug Logging.") -set(ENABLE_RAJA_NESTED_TEST ON CACHE BOOL "Enable raja-chai-nested-tests, which fails to build on Debug CUDA builds.") - -set(CHAI_ENABLE_TESTS On CACHE BOOL "") -set(CHAI_ENABLE_EXAMPLES On CACHE BOOL "") -set(CHAI_ENABLE_DOCS Off CACHE BOOL "") - -# options for Umpire as TPL -set(ENABLE_GMOCK On CACHE BOOL "") -set(ENABLE_ASSERTS "Build Umpire with assert() enabled" On) -set(ENABLE_GTEST_DEATH_TESTS ${ENABLE_ASSERTS} CACHE BOOL "") - -if (ENABLE_UM AND NOT ENABLE_CUDA) - message(FATAL_ERROR "Option ENABLE_UM requires ENABLE_CUDA") -endif() - -set(ENABLE_COPY_HEADERS Off CACHE BOOL "") -set(BLT_CXX_STD c++11 CACHE STRING "") - -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI") - message(STATUS "Setting CMAKE_CXX_EXTENSIONS to ON for PGI Compiler") - set( CMAKE_CXX_EXTENSIONS ON ) -endif() - -if (ENABLE_CUDA) - cmake_minimum_required(VERSION 3.9) -else () - cmake_minimum_required(VERSION 3.8) -endif() - -################################ -# BLT -################################ -if (NOT BLT_LOADED) - if (DEFINED BLT_SOURCE_DIR) - if (NOT EXISTS ${BLT_SOURCE_DIR}/SetupBLT.cmake) - message(FATAL_ERROR "Given BLT_SOURCE_DIR does not contain SetupBLT.cmake") - endif() - else () - set (BLT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/blt CACHE PATH "") - - if (NOT EXISTS ${BLT_SOURCE_DIR}/SetupBLT.cmake) - message(FATAL_ERROR "\ - The BLT submodule is not present. \ - If in git repository run the following two commands:\n \ - git submodule init\n \ - git submodule update") - endif () - endif () - - include(${BLT_SOURCE_DIR}/SetupBLT.cmake) -endif() - -include(cmake/ChaiBasics.cmake) - -add_subdirectory(src) - -if (CHAI_ENABLE_TESTS) - add_subdirectory(tests) -endif() - -if (CHAI_ENABLE_BENCHMARKS) - add_subdirectory(benchmarks) -endif() - -if (CHAI_ENABLE_EXAMPLES) - add_subdirectory(examples) -endif () - -if (CHAI_ENABLE_DOCS) - add_subdirectory(docs) -endif() diff --git a/tpl/raja b/tpl/raja index 593f756b..4d7fcba5 160000 --- a/tpl/raja +++ b/tpl/raja @@ -1 +1 @@ -Subproject commit 593f756b14ac57ded33ee61d8d2292d4beb840e6 +Subproject commit 4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1 diff --git a/tpl/umpire b/tpl/umpire index 3058d562..abd729f4 160000 --- a/tpl/umpire +++ b/tpl/umpire @@ -1 +1 @@ -Subproject commit 3058d562fc707650e904f9321b1ee9bcebad3ae2 +Subproject commit abd729f40064175e999a83d11d6b073dac4c01d2 diff --git a/tpl/versions.txt b/tpl/versions.txt index 1cf392d4..078de987 100644 --- 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