Remove KokkosExt::ScopedProfileRegion

src/ArborX_BruteForce.hpp

@@ -18,11 +18,11 @@
 #include <ArborX_DetailsBruteForceImpl.hpp>
 #include <ArborX_DetailsCrsGraphWrapperImpl.hpp>
 #include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
 #include <ArborX_DetailsLegacy.hpp>
 #include <ArborX_IndexableGetter.hpp>
 
 #include <Kokkos_Core.hpp>
+#include <Kokkos_Profiling_ScopedRegion.hpp>
 
 namespace ArborX
 {
@@ -69,7 +69,7 @@ class BasicBruteForce
   query(ExecutionSpace const &space, Predicates const &predicates,
         CallbackOrView &&callback_or_view, View &&view, Args &&...args) const
   {
-    KokkosExt::ScopedProfileRegion guard("ArborX::BruteForce::query_crs");
+    Kokkos::Profiling::ScopedRegion guard("ArborX::BruteForce::query_crs");
 
     Details::CrsGraphWrapperImpl::
         check_valid_callback_if_first_argument_is_not_a_view<value_type>(
@@ -156,7 +156,7 @@ class BruteForce
     }
     else
     {
-      KokkosExt::ScopedProfileRegion guard("ArborX::BruteForce::query_crs");
+      Kokkos::Profiling::ScopedRegion guard("ArborX::BruteForce::query_crs");
 
       Kokkos::View<int *, MemorySpace> indices(
           "ArborX::CrsGraphWrapper::query::indices", 0);
@@ -194,7 +194,7 @@ BasicBruteForce<MemorySpace, Value, IndexableGetter, BoundingVolume>::
                                               ExecutionSpace>::value,
                 "Values must be accessible from the execution space");
 
-  KokkosExt::ScopedProfileRegion guard("ArborX::BruteForce::BruteForce");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::BruteForce::BruteForce");
 
   if (empty())
   {

src/ArborX_HDBSCAN.hpp

@@ -12,9 +12,10 @@
 #define ARBORX_HDBSCAN_HPP
 
 #include <ArborX_Dendrogram.hpp>
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
 #include <ArborX_MinimumSpanningTree.hpp>
 
+#include <Kokkos_Profiling_ScopedRegion.hpp>
+
 namespace ArborX::Experimental
 {
 
@@ -24,7 +25,7 @@ auto hdbscan(ExecutionSpace const &exec_space, Primitives const &primitives,
              DendrogramImplementation dendrogram_impl =
                  DendrogramImplementation::BORUVKA)
 {
-  KokkosExt::ScopedProfileRegion guard("ArborX::HDBSCAN");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::HDBSCAN");
 
   using namespace ArborX::Details;
 

src/ArborX_LinearBVH.hpp

@@ -19,7 +19,6 @@
 #include <ArborX_DetailsBatchedQueries.hpp>
 #include <ArborX_DetailsCrsGraphWrapperImpl.hpp>
 #include <ArborX_DetailsKokkosExtAccessibilityTraits.hpp>
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
 #include <ArborX_DetailsLegacy.hpp>
 #include <ArborX_DetailsNode.hpp>
 #include <ArborX_DetailsPermutedData.hpp>
@@ -32,6 +31,7 @@
 #include <ArborX_TraversalPolicy.hpp>
 
 #include <Kokkos_Core.hpp>
+#include <Kokkos_Profiling_ScopedRegion.hpp>
 
 namespace ArborX
 {
@@ -93,7 +93,7 @@ class BasicBoundingVolumeHierarchy
   query(ExecutionSpace const &space, Predicates const &predicates,
         CallbackOrView &&callback_or_view, View &&view, Args &&...args) const
   {
-    KokkosExt::ScopedProfileRegion guard("ArborX::BVH::query_crs");
+    Kokkos::Profiling::ScopedRegion guard("ArborX::BVH::query_crs");
 
     Details::CrsGraphWrapperImpl::
         check_valid_callback_if_first_argument_is_not_a_view<value_type>(
@@ -206,7 +206,7 @@ class BoundingVolumeHierarchy
     }
     else
     {
-      KokkosExt::ScopedProfileRegion guard("ArborX::BVH::query_crs");
+      Kokkos::Profiling::ScopedRegion guard("ArborX::BVH::query_crs");
 
       Kokkos::View<int *, MemorySpace> indices(
           "ArborX::CrsGraphWrapper::query::indices", 0);
@@ -266,7 +266,7 @@ BasicBoundingVolumeHierarchy<MemorySpace, Value, IndexableGetter,
 
   Details::check_valid_space_filling_curve<DIM>(curve);
 
-  KokkosExt::ScopedProfileRegion guard("ArborX::BVH::BVH");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::BVH::BVH");
 
   if (empty())
   {

src/details/ArborX_DetailsDistributedTreeImpl.hpp

@@ -17,7 +17,6 @@
 #include <ArborX_DetailsDistributor.hpp>
 #include <ArborX_DetailsHappyTreeFriends.hpp>
 #include <ArborX_DetailsKokkosExtMinMaxOperations.hpp>
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
 #include <ArborX_DetailsKokkosExtViewHelpers.hpp>
 #include <ArborX_DetailsPriorityQueue.hpp>
 #include <ArborX_DetailsUtils.hpp>
@@ -28,6 +27,7 @@
 #include <ArborX_Sphere.hpp>
 
 #include <Kokkos_Core.hpp>
+#include <Kokkos_Profiling_ScopedRegion.hpp>
 
 #include <mpi.h>
 
@@ -249,7 +249,7 @@ DistributedTreeImpl<DeviceType>::sendAcrossNetwork(
     ExecutionSpace const &space, Distributor<DeviceType> const &distributor,
     View exports, typename View::non_const_type imports)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::sendAcrossNetwork (" + exports.label() + ")");
 
   ARBORX_ASSERT((exports.extent(0) == distributor.getTotalSendLength()) &&
@@ -319,7 +319,7 @@ void DistributedTreeImpl<DeviceType>::deviseStrategy(
     ExecutionSpace const &space, Predicates const &queries,
     DistributedTree const &tree, Indices &indices, Offset &offset, Distances &)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::deviseStrategy");
 
   auto const &top_tree = tree._top_tree;
@@ -381,7 +381,7 @@ void DistributedTreeImpl<DeviceType>::reassessStrategy(
     DistributedTree const &tree, Indices &indices, Offset &offset,
     Distances &distances)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::reassessStrategy");
 
   auto const &top_tree = tree._top_tree;
@@ -487,7 +487,7 @@ DistributedTreeImpl<DeviceType>::queryDispatchImpl(
     ExecutionSpace const &space, Predicates const &queries, Indices &indices,
     Offset &offset, Ranks &ranks, Distances *distances_ptr)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::query::nearest");
 
   auto const &bottom_tree = tree._bottom_tree;
@@ -590,7 +590,7 @@ DistributedTreeImpl<DeviceType>::queryDispatch(
     ExecutionSpace const &space, Predicates const &queries,
     Callback const &callback, OutputView &out, OffsetView &offset)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::query::spatial");
 
   auto const &top_tree = tree._top_tree;
@@ -701,7 +701,7 @@ void DistributedTreeImpl<DeviceType>::forwardQueries(
     Kokkos::View<Query *, DeviceType> &fwd_queries,
     Kokkos::View<int *, DeviceType> &fwd_ids, Ranks &fwd_ranks)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::forwardQueries");
 
   int comm_rank;
@@ -794,7 +794,7 @@ void DistributedTreeImpl<DeviceType>::communicateResultsBack(
     Kokkos::View<int *, DeviceType> offset, Ranks &ranks,
     Kokkos::View<int *, DeviceType> &ids, Distances *distances_ptr)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::communicateResultsBack");
 
   int comm_rank;
@@ -882,7 +882,7 @@ void DistributedTreeImpl<DeviceType>::filterResults(
     Kokkos::View<float *, DeviceType> distances, Indices &indices,
     Offset &offset, Ranks &ranks)
 {
-  KokkosExt::ScopedProfileRegion guard(
+  Kokkos::Profiling::ScopedRegion guard(
       "ArborX::DistributedTree::filterResults");
 
   using Access = AccessTraits<Predicates, PredicatesTag>;

src/details/ArborX_DetailsMinimumSpanningTree.hpp

@@ -17,13 +17,13 @@
 #include <ArborX_DetailsKokkosExtArithmeticTraits.hpp>
 #include <ArborX_DetailsKokkosExtBitManipulation.hpp>
 #include <ArborX_DetailsKokkosExtMinMaxOperations.hpp>
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
 #include <ArborX_DetailsKokkosExtSwap.hpp>
 #include <ArborX_DetailsUtils.hpp>
 #include <ArborX_DetailsWeightedEdge.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_MathematicalFunctions.hpp> // isfinite, signbit
+#include <Kokkos_Profiling_ScopedRegion.hpp>
 
 namespace ArborX::Details
 {
@@ -503,7 +503,7 @@ void updateSidedParents(ExecutionSpace const &space, Labels const &labels,
                         SidedParents &sided_parents, int edges_start,
                         int edges_end)
 {
-  KokkosExt::ScopedProfileRegion guard("ArborX::MST::update_sided_parents");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::MST::update_sided_parents");
 
   // Same as dendrogram alpha's standalone "updateSidedParents"
   Kokkos::parallel_for(
@@ -559,7 +559,7 @@ template <typename ExecutionSpace, typename Edges, typename SidedParents,
 void computeParents(ExecutionSpace const &space, Edges const &edges,
                     SidedParents const &sided_parents, Parents &parents)
 {
-  KokkosExt::ScopedProfileRegion guard("ArborX::MST::compute_edge_parents");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::MST::compute_edge_parents");
 
   using MemorySpace = typename SidedParents::memory_space;
 

src/details/ArborX_MinimumSpanningTree.hpp

@@ -13,7 +13,6 @@
 #define ARBORX_MINIMUM_SPANNING_TREE_HPP
 
 #include <ArborX_AccessTraits.hpp>
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
 #include <ArborX_DetailsKokkosExtViewHelpers.hpp>
 #include <ArborX_DetailsMinimumSpanningTree.hpp>
 #include <ArborX_DetailsMutualReachabilityDistance.hpp>
@@ -22,6 +21,8 @@
 #include <ArborX_DetailsWeightedEdge.hpp>
 #include <ArborX_LinearBVH.hpp>
 
+#include <Kokkos_Profiling_ScopedRegion.hpp>
+
 namespace ArborX::Details
 {
 
@@ -230,7 +231,7 @@ struct MinimumSpanningTree
                              edges_start, edges_end);
         else
         {
-          KokkosExt::ScopedProfileRegion guard(
+          Kokkos::Profiling::ScopedRegion guard(
               "ArborX::MST::compute_vertex_parents");
           assignVertexParents(space, labels, component_out_edges, edges_mapping,
                               bvh, dendrogram_parents);

src/kokkos_ext/ArborX_DetailsKokkosExtSort.hpp

@@ -14,9 +14,9 @@
 
 #include <ArborX_Config.hpp> // ARBORX_ENABLE_ROCTHRUST
 
-#include <ArborX_DetailsKokkosExtScopedProfileRegion.hpp>
 #include <ArborX_DetailsUtils.hpp> // minMax
 
+#include <Kokkos_Profiling_ScopedRegion.hpp>
 #include <Kokkos_Sort.hpp>
 
 // clang-format off
@@ -79,7 +79,7 @@ namespace KokkosExt
 template <typename ExecutionSpace, typename Keys, typename Values>
 void sortByKey(ExecutionSpace const &space, Keys &keys, Values &values)
 {
-  KokkosExt::ScopedProfileRegion guard("ArborX::KokkosExt::sortByKey::Kokkos");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::Kokkos");
 
   static_assert(Kokkos::is_view<Keys>::value);
   static_assert(Kokkos::is_view<Values>::value);
@@ -120,7 +120,7 @@ void sortByKey(
 #endif
     Keys &keys, Values &values)
 {
-  KokkosExt::ScopedProfileRegion guard("ArborX::KokkosExt::sortByKey::Thrust");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::Thrust");
 
   using ExecutionSpace = std::decay_t<decltype(space)>;
   static_assert(Kokkos::is_view<Keys>::value);
@@ -153,7 +153,7 @@ template <typename Keys, typename Values>
 void sortByKey(Kokkos::Experimental::SYCL const &space, Keys &keys,
                Values &values)
 {
-  KokkosExt::ScopedProfileRegion guard("ArborX::KokkosExt::sortByKey::OneDPL");
+  Kokkos::Profiling::ScopedRegion guard("ArborX::KokkosExt::sortByKey::OneDPL");
 
   using ExecutionSpace = std::decay_t<decltype(space)>;
   static_assert(Kokkos::is_view<Keys>::value);

test/CMakeLists.txt

@@ -146,9 +146,6 @@ list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES
   tstKokkosToolsAnnotations.cpp
   utf_main.cpp
 )
-if (Kokkos_VERSION VERSION_LESS 4.0.99)
-  list(APPEND ARBORX_TEST_QUERY_TREE_SOURCES tstScopedProfileRegion.cpp)
-endif()
 add_executable(ArborX_Test_QueryTree.exe ${ARBORX_TEST_QUERY_TREE_SOURCES})
 target_link_libraries(ArborX_Test_QueryTree.exe PRIVATE ArborX Boost::unit_test_framework)
 target_compile_definitions(ArborX_Test_QueryTree.exe PRIVATE BOOST_TEST_DYN_LINK)