diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a2d862ab0..9438c31cdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,8 @@ include(CMakeDependentOption) # Set version number set(RAJA_VERSION_MAJOR 2025) -set(RAJA_VERSION_MINOR 09) -set(RAJA_VERSION_PATCHLEVEL 1) +set(RAJA_VERSION_MINOR 12) +set(RAJA_VERSION_PATCHLEVEL 0) if (RAJA_LOADED AND (NOT RAJA_LOADED STREQUAL "${RAJA_VERSION_MAJOR}.${RAJA_VERSION_MINOR}.${RAJA_VERSION_PATCHLEVEL}")) message(FATAL_ERROR "You are mixing RAJA versions. Loaded is ${RAJA_LOADED}, expected ${RAJA_VERSION_MAJOR}.${RAJA_VERSION_MINOR}.${RAJA_VERSION_PATCHLEVEL}") diff --git a/RELEASE b/RELEASE index 74b3e9c0b8..ff39101772 100644 --- a/RELEASE +++ b/RELEASE @@ -1,6 +1,6 @@ ******************************************************************************* -RAJA: ................................, version 2025.09.0 +RAJA: ................................, version 2025.12.0 Copyright (c) 2016-25, Lawrence Livermore National Security, LLC. Produced at the Lawrence Livermore National Laboratory. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 950b701469..c72ac952b0 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -20,6 +20,31 @@ Notable changes include: * Bug fixes/improvements: +Version 2025.12.0 -- Release date 2025-12-19 +============================================ + +This release contains mostly improvements to code robustness and testing, +including evolving internal code implementations to use C++17. + +Notable changes include: + + * New features / API changes: + + * Build changes/improvements: + * Update Camp submodule to v2025.12.0 release. + * Improve CMake support for configuring with Caliper and fix issue reported + by a user. + * Bump minimum CMake version required to 3.24. + + * Bug fixes/improvements: + * Fix compilation failue when a downstream library or applications is + built without OpenMP enabled when RAJA was built with OpenMP enabled. + There may still be some corner cases that violate C++ ODR that we have not + resolved and are not being exposed by users. + * Various internal code cleanups, simplifications, and improvements using + C++17 features, with an eye toward C++20. + + Version 2025.09.1 -- Release date 2025-10-01 ============================================ diff --git a/docs/conf.py b/docs/conf.py index 3e98107236..6df0fef485 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -87,9 +87,9 @@ # built documents. # # The short X.Y version. -version = u'2025.09' +version = u'2025.12' # The full version, including alpha/beta/rc tags. -release = u'2025.09.1' +release = u'2025.12.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tpl/camp b/tpl/camp index 4070ce93a8..a8caefa9f4 160000 --- a/tpl/camp +++ b/tpl/camp @@ -1 +1 @@ -Subproject commit 4070ce93a802849d61037310a87c50cc24c9e498 +Subproject commit a8caefa9f4c811b1a114b4ed2c9b681d40f12325