Migrate Sort

aprokop · Dec 26, 2023 · 835ab9a · 835ab9a
1 parent e8f3835
commit 835ab9a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/details/ArborX_Dendrogram.hpp b/src/details/ArborX_Dendrogram.hpp
@@ -64,7 +64,8 @@ struct Dendrogram
     splitEdges(exec_space, edges, unweighted_edges, _parent_heights);
 
     Kokkos::Profiling::pushRegion("ArborX::Dendrogram::sort_edges");
-    KokkosBlah::sortByKey(exec_space, _parent_heights, unweighted_edges);
+    Details::KokkosExt::sortByKey(exec_space, _parent_heights,
+                                  unweighted_edges);
     Kokkos::Profiling::popRegion();
 
     using ConstEdges =

diff --git a/src/details/ArborX_DetailsSortUtils.hpp b/src/details/ArborX_DetailsSortUtils.hpp
@@ -36,7 +36,7 @@ auto sortObjects(ExecutionSpace const &space, ViewType &view)
       view.extent(0));
   ArborX::iota(space, permute);
 
-  KokkosBlah::sortByKey(space, view, permute);
+  KokkosExt::sortByKey(space, view, permute);
 
   Kokkos::Profiling::popRegion();
 

diff --git a/src/kokkos_ext/ArborX_DetailsKokkosExtSort.hpp b/src/kokkos_ext/ArborX_DetailsKokkosExtSort.hpp
@@ -73,14 +73,13 @@
 #include <oneapi/dpl/iterator>
 #endif
 
-namespace KokkosBlah
+namespace ArborX::Details::KokkosExt
 {
 
 template <typename ExecutionSpace, typename Keys, typename Values>
 void sortByKey(ExecutionSpace const &space, Keys &keys, Values &values)
 {
-  Kokkos::Profiling::ScopedRegion guard(
-      "ArborX::KokkosBlah::sortByKey::Kokkos");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::Kokkos");
 
   static_assert(Kokkos::is_view<Keys>::value);
   static_assert(Kokkos::is_view<Values>::value);
@@ -121,8 +120,7 @@ void sortByKey(
 #endif
     Keys &keys, Values &values)
 {
-  Kokkos::Profiling::ScopedRegion guard(
-      "ArborX::KokkosBlah::sortByKey::Thrust");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::Thrust");
 
   using ExecutionSpace = std::decay_t<decltype(space)>;
   static_assert(Kokkos::is_view<Keys>::value);
@@ -155,8 +153,7 @@ template <typename Keys, typename Values>
 void sortByKey(Kokkos::Experimental::SYCL const &space, Keys &keys,
                Values &values)
 {
-  Kokkos::Profiling::ScopedRegion guard(
-      "ArborX::KokkosBlah::sortByKey::OneDPL");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::OneDPL");
 
   using ExecutionSpace = std::decay_t<decltype(space)>;
   static_assert(Kokkos::is_view<Keys>::value);
@@ -188,6 +185,6 @@ void sortByKey(Kokkos::Experimental::SYCL const &space, Keys &keys,
 }
 #endif
 
-} // namespace KokkosBlah
+} // namespace ArborX::Details::KokkosExt
 
 #endif