address review comment

tcclevenger · Oct 10, 2023 · 5b693fd · 5b693fd
1 parent 1f4e3d5
commit 5b693fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/algorithms/src/std_algorithms/impl/Kokkos_CopyIf.hpp b/algorithms/src/std_algorithms/impl/Kokkos_CopyIf.hpp
@@ -124,8 +124,8 @@ KOKKOS_FUNCTION OutputIterator copy_if_team_impl(
   }
 
   const std::size_t num_elements = Kokkos::Experimental::distance(first, last);
-  if constexpr (stdalgo_must_use_kokkos_single_for_team_scan<
-                    typename TeamHandleType::execution_space>::value) {
+  if constexpr (stdalgo_must_use_kokkos_single_for_team_scan_v<
+                    typename TeamHandleType::execution_space>) {
     std::size_t count = 0;
     Kokkos::single(
         Kokkos::PerTeam(teamHandle),

diff --git a/algorithms/src/std_algorithms/impl/Kokkos_MustUseKokkosSingleInTeam.hpp b/algorithms/src/std_algorithms/impl/Kokkos_MustUseKokkosSingleInTeam.hpp
@@ -50,12 +50,9 @@ struct stdalgo_must_use_kokkos_single_for_team_scan<Kokkos::Experimental::HPX>
     : std::true_type {};
 #endif
 
-// FIXME_THREADS
-#if defined(KOKKOS_ENABLE_THREADS)
-template <>
-struct stdalgo_must_use_kokkos_single_for_team_scan<Kokkos::Threads>
-    : std::true_type {};
-#endif
+template <typename T>
+inline constexpr bool stdalgo_must_use_kokkos_single_for_team_scan_v =
+    stdalgo_must_use_kokkos_single_for_team_scan<T>::value;
 
 }  // namespace Impl
 }  // namespace Experimental

diff --git a/algorithms/src/std_algorithms/impl/Kokkos_UniqueCopy.hpp b/algorithms/src/std_algorithms/impl/Kokkos_UniqueCopy.hpp
@@ -142,8 +142,8 @@ KOKKOS_FUNCTION OutputIterator unique_copy_team_impl(
   }
 
   else {
-    if constexpr (stdalgo_must_use_kokkos_single_for_team_scan<
-                      typename TeamHandleType::execution_space>::value) {
+    if constexpr (stdalgo_must_use_kokkos_single_for_team_scan_v<
+                      typename TeamHandleType::execution_space>) {
       std::size_t count = 0;
       Kokkos::single(
           Kokkos::PerTeam(teamHandle),