From 13f02551610989be34d421e1e283e018965e7ef8 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Tue, 29 Nov 2022 11:55:32 -0800 Subject: [PATCH 1/7] Update release notes and version number to prepare for patch release. --- CMakeLists.txt | 2 +- RELEASE_NOTES.md | 27 +++++++++++++++++++++++++++ docs/conf.py | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8ebfb77e1..ff6600cd13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ include(CMakeDependentOption) # Set version number set(RAJA_VERSION_MAJOR 2022) set(RAJA_VERSION_MINOR 10) -set(RAJA_VERSION_PATCHLEVEL 2) +set(RAJA_VERSION_PATCHLEVEL 3) 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_NOTES.md b/RELEASE_NOTES.md index 0f6b40cdf4..05bc1d6e35 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -19,6 +19,33 @@ Notable changes include: * Bug fixes/improvements: +Version 2022.10.3 -- Release date 2022-12-xx +============================================ + +This release fixes a few issues that were found after the v2022.10.2 release. + +Notable changes include: + + * Update camp submodule to .... + * Update BLT submodule to .... + + * Properly export 'roctx' target when CMake variable RAJA_ENABLE_ROCTX is on. + * Add missing template parameter pack argument in RAJA::statement::For + execution policy construct used in RAJA::kernel implementation for OpenMP + target back-end. + * Change to use compile-time GPU thread block size in RAJA::forall + implementation. This improves performance of GPU kernels, especially + those using the RAJA HIP back-end. + * Added RAJA plugin support, including CHAI support, for RAJA::launch. + * Renamed 'DEVICE' macro to 'RAJA_DEVICE_BACKEND' to prevent name conflicts + with other libraries. + * Updated User Guide documentation about CMake variable used to pass + compiler flags for OpenMP target back-end. This changed with CMake + minimum required version bump in v2022.10.0. + * Adjust ordering of BLT and camp target inclusion in RAJA CMake usage to + fix an issue with projects using external camp vs. RAJA submodule. + + Version 2022.10.2 -- Release date 2022-11-08 ============================================ diff --git a/docs/conf.py b/docs/conf.py index 20c5ef60e0..51e0336b1a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -88,7 +88,7 @@ # The short X.Y version. version = u'2022.10' # The full version, including alpha/beta/rc tags. -release = u'2022.10.2' +release = u'2022.10.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 9943ae45ac490d8ba78b317965b8637e31710e40 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Wed, 30 Nov 2022 13:30:07 -0800 Subject: [PATCH 2/7] Bump camp version and BLT to match camp --- RELEASE_NOTES.md | 4 ++-- blt | 2 +- tpl/camp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 05bc1d6e35..107abdc759 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -26,8 +26,8 @@ This release fixes a few issues that were found after the v2022.10.2 release. Notable changes include: - * Update camp submodule to .... - * Update BLT submodule to .... + * Update camp submodule to v2022.10.1 + * Update BLT submodule to commit 8c229991 (includes fixes for crayftn + hip) * Properly export 'roctx' target when CMake variable RAJA_ENABLE_ROCTX is on. * Add missing template parameter pack argument in RAJA::statement::For diff --git a/blt b/blt index e35f490a8a..8c229991e6 160000 --- a/blt +++ b/blt @@ -1 +1 @@ -Subproject commit e35f490a8a8b1689e99b5f4308b5251f97eb36cf +Subproject commit 8c229991e65e7a9603c621b47cb3ba158bb7468c diff --git a/tpl/camp b/tpl/camp index 3a7486edb8..a1c74aade4 160000 --- a/tpl/camp +++ b/tpl/camp @@ -1 +1 @@ -Subproject commit 3a7486edb8b1c50ce36ecace56384d32a1009e4f +Subproject commit a1c74aade443c6332e953e1ca5ad5e9e5b5baf21 From f0f75fb3dae41ff0d31ec262bb6ac040b547ae95 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Wed, 30 Nov 2022 13:55:09 -0800 Subject: [PATCH 3/7] Squash compiler warnings --- .../tests/test-dynamic-forall-resource-RangeSegment.hpp | 2 ++ test/integration/plugin/tests/test-plugin-launch.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/functional/dynamic_forall/resource-segment/tests/test-dynamic-forall-resource-RangeSegment.hpp b/test/functional/dynamic_forall/resource-segment/tests/test-dynamic-forall-resource-RangeSegment.hpp index 0b09079093..fccdf6880b 100644 --- a/test/functional/dynamic_forall/resource-segment/tests/test-dynamic-forall-resource-RangeSegment.hpp +++ b/test/functional/dynamic_forall/resource-segment/tests/test-dynamic-forall-resource-RangeSegment.hpp @@ -66,7 +66,9 @@ TYPED_TEST_P(DynamicForallResourceRangeSegmentTest, RangeSegmentForallResource) using POLICY_LIST = typename camp::at>::type; +#if defined(RAJA_DEVICE_ACTIVE) constexpr int N = camp::size::value; +#endif //If N == 2 host, no openmp is available //If N == 3 host, openmp is available diff --git a/test/integration/plugin/tests/test-plugin-launch.hpp b/test/integration/plugin/tests/test-plugin-launch.hpp index 44b3191265..6aa1744b6c 100644 --- a/test/integration/plugin/tests/test-plugin-launch.hpp +++ b/test/integration/plugin/tests/test-plugin-launch.hpp @@ -39,7 +39,7 @@ void PluginLaunchTestImpl() RAJA::launch (RAJA::LaunchParams(RAJA::Teams(1), RAJA::Threads(1)), - [=] RAJA_HOST_DEVICE(RAJA::LaunchContext ctx) + [=] RAJA_HOST_DEVICE(RAJA::LaunchContext RAJA_UNUSED_ARG(ctx)) { p_callable(i); }); From 172eb7f0988265700dfd4f1aff16e17b36fcbf8a Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Wed, 30 Nov 2022 15:48:19 -0800 Subject: [PATCH 4/7] Finalize release notes for patch release. --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 107abdc759..71ca9d8b5e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -30,6 +30,7 @@ Notable changes include: * Update BLT submodule to commit 8c229991 (includes fixes for crayftn + hip) * Properly export 'roctx' target when CMake variable RAJA_ENABLE_ROCTX is on. + * Fix CMake logic for exporting desul targets when desul atomics are enabled. * Add missing template parameter pack argument in RAJA::statement::For execution policy construct used in RAJA::kernel implementation for OpenMP target back-end. From f6c366c131e2d311c659e4cf19b0fa4d6f0bfdfa Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Wed, 30 Nov 2022 15:50:52 -0800 Subject: [PATCH 5/7] Update release date --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 71ca9d8b5e..60c58ac4d7 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -19,7 +19,7 @@ Notable changes include: * Bug fixes/improvements: -Version 2022.10.3 -- Release date 2022-12-xx +Version 2022.10.3 -- Release date 2022-12-01 ============================================ This release fixes a few issues that were found after the v2022.10.2 release. From bf26690fe602a390dca993bb92089ed7af8712b7 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Thu, 1 Dec 2022 09:23:24 -0800 Subject: [PATCH 6/7] Modifications based on reviewer comments. --- RELEASE_NOTES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 60c58ac4d7..60259de6ae 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -38,8 +38,8 @@ Notable changes include: implementation. This improves performance of GPU kernels, especially those using the RAJA HIP back-end. * Added RAJA plugin support, including CHAI support, for RAJA::launch. - * Renamed 'DEVICE' macro to 'RAJA_DEVICE_BACKEND' to prevent name conflicts - with other libraries. + * Replaced 'DEVICE' macro with alias to 'device_mem_pool_t' to prevent name + conflicts with other libraries. * Updated User Guide documentation about CMake variable used to pass compiler flags for OpenMP target back-end. This changed with CMake minimum required version bump in v2022.10.0. From c80f1a5f6cc7a789cee23e4b87535d67efcbe788 Mon Sep 17 00:00:00 2001 From: Rich Hornung Date: Mon, 5 Dec 2022 13:38:24 -0800 Subject: [PATCH 7/7] Final update of release notes. --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 60259de6ae..f34f191608 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -19,6 +19,7 @@ Notable changes include: * Bug fixes/improvements: + Version 2022.10.3 -- Release date 2022-12-01 ============================================ @@ -31,6 +32,8 @@ Notable changes include: * Properly export 'roctx' target when CMake variable RAJA_ENABLE_ROCTX is on. * Fix CMake logic for exporting desul targets when desul atomics are enabled. + * Fix the way we use CMake to find the rocPRIM module to follow CMake + best practices. * Add missing template parameter pack argument in RAJA::statement::For execution policy construct used in RAJA::kernel implementation for OpenMP target back-end.