Merge pull request #1309 from LLNL/task/rc-v2022.03.1

RC for v2022.03.1 Patch
LLNL · Aug 10, 2022 · 753e7ce · 753e7ce
2 parents 4351fe6 + 691f5e7
commit 753e7ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ include(CMakeDependentOption)
 # Set version number
 set(RAJA_VERSION_MAJOR 2022)
 set(RAJA_VERSION_MINOR 03)
-set(RAJA_VERSION_PATCHLEVEL 0)
+set(RAJA_VERSION_PATCHLEVEL 1)
 
 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
@@ -20,6 +20,16 @@ Notable changes include:
   * Bug fixes/improvements:
 
 
+Version 2022.03.1 -- Release date 2022-08-10
+============================================
+
+This release contains a bug fix.
+
+Notable changes include:
+
+  * Fix for guarding GPU vectorization when not running on the device.
+
+
 Version 2022.03.0 -- Release date 2022-03-15
 ============================================
 

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

diff --git a/include/RAJA/policy/tensor/arch_impl.hpp b/include/RAJA/policy/tensor/arch_impl.hpp
@@ -45,11 +45,11 @@
 #include<RAJA/policy/tensor/arch/avx.hpp>
 #endif
 
-#ifdef RAJA_ENABLE_CUDA
+#ifdef RAJA_CUDA_ACTIVE
 #include<RAJA/policy/tensor/arch/cuda.hpp>
 #endif
 
-#ifdef RAJA_ENABLE_HIP
+#ifdef RAJA_HIP_ACTIVE
 #include<RAJA/policy/tensor/arch/hip.hpp>
 #endif