Improved the checks for reduction reset methods.

homerdin · May 14, 2020 · 4f554c2 · 4f554c2
1 parent 22f5f0b
commit 4f554c2
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 35 deletions.
diff --git a/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-max.hpp b/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-max.hpp
@@ -59,18 +59,24 @@ void ForallReduceMaxSanityTest(RAJA::Index_type first, RAJA::Index_type last)
   ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), ref_max);
 
 #if !defined(RAJA_ENABLE_TARGET_OPENMP)
+  //
+  // Note: RAJA OpenMP target reductions do not currently support reset
+  //
   max.reset(max_init);
+  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), max_init);
 #endif
 
-  const int nloops = 2;
-
-  for (int j = nloops; j > 0; --j) {
-    RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
-      max.max( working_array[idx] / j);
-    });
-  }
-
-  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), ref_max);
+  DATA_TYPE factor = 2;
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
+    max.max( working_array[idx] * factor);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), ref_max * factor);
+
+  factor = 3;
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
+    max.max( working_array[idx] * factor);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), ref_max * factor);
 
 
   deallocateForallTestData<DATA_TYPE>(working_res,

diff --git a/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-maxloc.hpp b/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-maxloc.hpp
@@ -72,20 +72,28 @@ void ForallReduceMaxLocSanityTest(RAJA::Index_type first, RAJA::Index_type last)
   ASSERT_EQ(static_cast<RAJA::Index_type>(max.getLoc()), ref_maxloc);
 
 #if !defined(RAJA_ENABLE_TARGET_OPENMP)
+  //
+  // Note: RAJA OpenMP target reductions do not currently support reset
+  //
   max.reset(max_init, maxloc_init);
+  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), max_init);
+  ASSERT_EQ(static_cast<RAJA::Index_type>(max.getLoc()), maxloc_init);
 #endif
 
-  const int nloops = 2;
-
-  for (int j = nloops; j > 0; --j) {
-    RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
-      max.maxloc( working_array[idx] * j, idx);
-    });
-  }
-
-  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), ref_max * nloops);
+  DATA_TYPE factor = 2;
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
+    max.maxloc( working_array[idx] * factor, idx);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), ref_max * factor);
+  ASSERT_EQ(static_cast<RAJA::Index_type>(max.getLoc()), ref_maxloc);
+
+  factor = 3;
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) { 
+    max.maxloc( working_array[idx] * factor, idx);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(max.get()), ref_max * factor);
   ASSERT_EQ(static_cast<RAJA::Index_type>(max.getLoc()), ref_maxloc);
-   
+
 
   deallocateForallTestData<DATA_TYPE>(working_res,
                                       working_array,

diff --git a/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-min.hpp b/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-min.hpp
@@ -60,18 +60,24 @@ void ForallReduceMinSanityTest(RAJA::Index_type first, RAJA::Index_type last)
   ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), ref_min);
 
 #if !defined(RAJA_ENABLE_TARGET_OPENMP)
+  //
+  // Note: RAJA OpenMP target reductions do not currently support reset
+  //
   min.reset(min_init);
+  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), min_init);
 #endif
 
-  const int nloops = 2;
-
-  for (int j = nloops; j > 0; --j) {
-    RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
-      min.min( working_array[idx] * j);
-    });
-  }
+  DATA_TYPE factor = 3; 
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
+    min.min( working_array[idx] * factor);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), ref_min * factor);
 
-  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), ref_min);
+  factor = 2;
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) { 
+    min.min( working_array[idx] * factor);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), ref_min * factor);
 
 
   deallocateForallTestData<DATA_TYPE>(working_res,

diff --git a/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-minloc.hpp b/test/functional/forall/reduce-sanity/tests/test-forall-reduce-sanity-minloc.hpp
@@ -72,18 +72,26 @@ void ForallReduceMinLocSanityTest(RAJA::Index_type first, RAJA::Index_type last)
   ASSERT_EQ(static_cast<RAJA::Index_type>(min.getLoc()), ref_minloc);
 
 #if !defined(RAJA_ENABLE_TARGET_OPENMP)
+  //
+  // Note: RAJA OpenMP target reductions do not currently support reset
+  //
   min.reset(min_init, minloc_init);
+  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), min_init);
+  ASSERT_EQ(static_cast<RAJA::Index_type>(min.getLoc()), minloc_init);
 #endif
 
-  const int nloops = 2;
-
-  for (int j = nloops; j > 0; --j) {
-    RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
-      min.minloc( working_array[idx] * j, idx);
-    });
-  }
+  DATA_TYPE factor = 2;
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) {
+    min.minloc( working_array[idx] * factor, idx);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), ref_min * factor);
+  ASSERT_EQ(static_cast<RAJA::Index_type>(min.getLoc()), ref_minloc);
 
-  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), ref_min * nloops);
+  factor = 3;
+  RAJA::forall<EXEC_POLICY>(r1, [=] RAJA_HOST_DEVICE(RAJA::Index_type idx) { 
+    min.minloc( working_array[idx] * factor, idx);
+  });
+  ASSERT_EQ(static_cast<DATA_TYPE>(min.get()), ref_min * factor);
   ASSERT_EQ(static_cast<RAJA::Index_type>(min.getLoc()), ref_minloc);