Remove applyPermutation from the BatchedQueries

arborx · Oct 10, 2024 · 6971baf · 6971baf
1 parent 0975b50
commit 6971baf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 27 deletions.
diff --git a/examples/viz/tree_visualization.cpp b/examples/viz/tree_visualization.cpp
@@ -165,8 +165,7 @@ void viz(std::string const &prefix, std::string const &infile, int n_neighbors)
       sortPredicatesAlongSpaceFillingCurve(ExecutionSpace{},
                                            ArborX::Experimental::Morton32(),
                                            bvh.bounds(), queries);
-  queries = ArborX::Details::BatchedQueries<DeviceType>::applyPermutation(
-      ExecutionSpace{}, permute, queries);
+  ArborX::Details::applyPermutation(ExecutionSpace{}, permute, queries);
   performQueries(prefix + "sorted_", suffix);
 }
 

diff --git a/src/spatial/detail/ArborX_BatchedQueries.hpp b/src/spatial/detail/ArborX_BatchedQueries.hpp
@@ -67,31 +67,6 @@ struct BatchedQueries
 
     return sortObjects(space, linear_ordering_indices);
   }
-
-  // NOTE  trailing return type seems required :(
-  // error: The enclosing parent function ("applyPermutation") for an extended
-  // __host__ __device__ lambda must not have deduced return type
-  template <typename ExecutionSpace, typename Predicates>
-  static auto
-  applyPermutation(ExecutionSpace const &space,
-                   Kokkos::View<unsigned int const *, DeviceType> permute,
-                   Predicates const &v)
-      -> Kokkos::View<typename Predicates::value_type *, DeviceType>
-  {
-    auto const n = v.size();
-    ARBORX_ASSERT(permute.extent(0) == n);
-
-    Kokkos::View<typename Predicates::value_type *, DeviceType> w(
-        Kokkos::view_alloc(space, Kokkos::WithoutInitializing,
-                           "ArborX::permuted_predicates"),
-        n);
-    Kokkos::parallel_for(
-        "ArborX::BatchedQueries::permute_entries",
-        Kokkos::RangePolicy(space, 0, n),
-        KOKKOS_LAMBDA(int i) { w(i) = v(permute(i)); });
-
-    return w;
-  }
 };
 
 } // namespace ArborX::Details