Fix fix for #1905 for Serial backend

My fix for OpenMP broke it for Serial ...
kokkos · Apr 8, 2019 · 5f4f330 · 5f4f330
1 parent 3643229
commit 5f4f330
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/src/impl/Kokkos_HostThreadTeam.hpp b/core/src/impl/Kokkos_HostThreadTeam.hpp
@@ -681,6 +681,8 @@ class HostThreadTeamMember {
           // Copy from root member's buffer:
           reducer.reference() = *((value_type*) m_data.team_reduce());
         }
+      } else {
+        reducer.reference() = contribution;
       }
     }
 #else

diff --git a/core/unit_test/standalone/UnitTestMainInit.cpp b/core/unit_test/standalone/UnitTestMainInit.cpp
@@ -61,6 +61,11 @@
 #ifdef KOKKOS_ENABLE_HPX
 #include <hpx/TestHPX_Category.hpp>
 #endif
+#ifndef TEST_EXECSPACE
+#ifdef KOKKOS_ENABLE_SERIAL
+#include <serial/TestSerial_Category.hpp>
+#endif
+#endif 
 #include <TestTeamVector.hpp>
 
 int main( int argc, char *argv[] ) {