Get rid of the Distances template argument

arborx · Jan 9, 2024 · ce3bc3f · ce3bc3f
1 parent f07bea6
commit ce3bc3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/details/ArborX_DetailsDistributedTreeImpl.hpp b/src/details/ArborX_DetailsDistributedTreeImpl.hpp
@@ -43,12 +43,9 @@ struct DistributedTreeImpl
   // nearest neighbors queries
   template <typename DistributedTree, typename ExecutionSpace,
             typename Predicates, typename Indices, typename Offset,
-            typename Ranks,
-            typename Distances =
-                Kokkos::View<float *, typename DistributedTree::memory_space>>
-  static std::enable_if_t<
-      Kokkos::is_view<Indices>{} && Kokkos::is_view<Offset>{} &&
-      Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
+            typename Ranks>
+  static std::enable_if_t<Kokkos::is_view<Indices>{} &&
+                          Kokkos::is_view<Offset>{} && Kokkos::is_view<Ranks>{}>
   queryDispatchImpl(NearestPredicateTag, DistributedTree const &tree,
                     ExecutionSpace const &space, Predicates const &queries,
                     Indices &indices, Offset &offset, Ranks &ranks);

diff --git a/src/details/ArborX_DetailsDistributedTreeNearest.hpp b/src/details/ArborX_DetailsDistributedTreeNearest.hpp
@@ -303,9 +303,9 @@ void DistributedTreeImpl::reassessStrategy(
 }
 
 template <typename Tree, typename ExecutionSpace, typename Predicates,
-          typename Values, typename Offset, typename Ranks, typename Distances>
+          typename Values, typename Offset, typename Ranks>
 std::enable_if_t<Kokkos::is_view<Values>{} && Kokkos::is_view<Offset>{} &&
-                 Kokkos::is_view<Ranks>{} && Kokkos::is_view<Distances>{}>
+                 Kokkos::is_view<Ranks>{}>
 DistributedTreeImpl::queryDispatchImpl(NearestPredicateTag, Tree const &tree,
                                        ExecutionSpace const &space,
                                        Predicates const &queries,
@@ -322,6 +322,7 @@ DistributedTreeImpl::queryDispatchImpl(NearestPredicateTag, Tree const &tree,
   auto const &bottom_tree = tree._bottom_tree;
   auto comm = tree.getComm();
 
+  using Distances = Kokkos::View<float *, MemorySpace>;
   Distances distances("ArborX::DistributedTree::query::nearest::distances", 0);
 
   // "Strategy" is used to determine what ranks to forward queries to.  In