Skip to content

Main mergeback to develop #1965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhornung67 merged 9 commits into from
Dec 22, 2025
+31 −6
Merged

Main mergeback to develop #1965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e82faa4
Update version numbers, add skeleton release notes
rhornung67 Dec 5, 2025
63bd700
Update camp submodule to v2025.12.0 release
rhornung67 Dec 5, 2025
e79198f
Merge branch 'develop' into v2025.12.0-RC
rhornung67 Dec 19, 2025
1811c21
Update release notes file
rhornung67 Dec 19, 2025
dd3f72f
Insert release date
rhornung67 Dec 19, 2025
931e1db
Bump min cmake required
rhornung67 Dec 19, 2025
1ffefda
Address review comments
rhornung67 Dec 19, 2025
0526708
Go back to previous min cmake required since docker images don't support
rhornung67 Dec 19, 2025
e827035
Merge pull request #1962 from llnl/v2025.12.0-RC
rhornung67 Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
25 changes: 25 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
============================================

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tpl/camp
Open in desktop
Submodule camp updated 38 files
+1 −0 .clang-format
+1 −1 CMakeLists.txt
+2 −2 docs/conf.py
+8 −0 docs/sphinx/user_guide/feature/resource.rst
+313 −276 include/camp/array.hpp
+40 −21 include/camp/camp.hpp
+28 −46 include/camp/concepts.hpp
+3 −3 include/camp/config.in.hpp
+64 −67 include/camp/defines.hpp
+4 −4 include/camp/detail/sfinae.hpp
+3 −0 include/camp/detail/test.hpp
+172 −164 include/camp/helpers.hpp
+2 −1 include/camp/lambda.hpp
+6 −4 include/camp/list/at.hpp
+2 −0 include/camp/list/find_if.hpp
+2 −0 include/camp/list/list.hpp
+5 −7 include/camp/make_unique.hpp
+0 −1 include/camp/map.hpp
+6 −7 include/camp/number.hpp
+2 −2 include/camp/number/if.hpp
+2 −0 include/camp/number/number.hpp
+132 −31 include/camp/resource.hpp
+87 −33 include/camp/resource/cuda.hpp
+18 −11 include/camp/resource/event.hpp
+80 −27 include/camp/resource/hip.hpp
+57 −16 include/camp/resource/host.hpp
+69 −23 include/camp/resource/omp_target.hpp
+1 −6 include/camp/resource/platform.hpp
+138 −65 include/camp/resource/sycl.hpp
+210 −174 include/camp/tuple.hpp
+5 −5 src/errors.cpp
+113 −92 test/Test.hpp
+230 −271 test/array.cpp
+113 −72 test/errors.cpp
+3 −0 test/find_if.cpp
+1 −2 test/flatten.cpp
+204 −27 test/resource.cpp
+255 −216 test/tuple.cpp