Merge pull request #1159 from LLNL/task/v0.14.1-rc2

Fixes for RTD docs.
LLNL · Nov 15, 2021 · e44448c · e44448c
2 parents b066137 + f5a55a0
commit e44448c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -0,0 +1,4 @@
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -0,0 +1 @@
+docutils<0.18
diff --git a/include/RAJA/pattern/detail/reduce.hpp b/include/RAJA/pattern/detail/reduce.hpp
@@ -56,7 +56,7 @@ namespace RAJA
 namespace reduce
 {
 
-#if defined(RAJA_RAJA_ENABLE_TARGET_OPENMP)
+#if defined(RAJA_ENABLE_TARGET_OPENMP)
 #pragma omp declare target
 #endif
 
@@ -99,7 +99,7 @@ struct and_bit : detail::op_adapter<T, RAJA::operators::bit_and> {
 };
 
 
-#if defined(RAJA_RAJA_ENABLE_TARGET_OPENMP)
+#if defined(RAJA_ENABLE_TARGET_OPENMP)
 #pragma omp end declare target
 #endif