From b257854a446ee989289881f355a413059fe531a5 Mon Sep 17 00:00:00 2001
From: Andrey Prokopenko <prokopenkoav@ornl.gov>
Date: Mon, 8 Apr 2024 16:29:00 -0400
Subject: [PATCH] Get rid of LegacyDefaultCallback in benchmarks

---
 .../brute_force_vs_bvh/brute_force_vs_bvh_timpl.hpp   | 11 +++++------
 benchmarks/dbscan/ArborX_DBSCANVerification.hpp       |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/benchmarks/brute_force_vs_bvh/brute_force_vs_bvh_timpl.hpp b/benchmarks/brute_force_vs_bvh/brute_force_vs_bvh_timpl.hpp
index 5a6018651..6276ee136 100644
--- a/benchmarks/brute_force_vs_bvh/brute_force_vs_bvh_timpl.hpp
+++ b/benchmarks/brute_force_vs_bvh/brute_force_vs_bvh_timpl.hpp
@@ -93,10 +93,10 @@ static void run_fp(int nprimitives, int nqueries, int nrepeats)
                                       ArborX::PairValueIndex<Point>>
           bvh{space, ArborX::Experimental::attach_indices(primitives)};
 
-      Kokkos::View<int *, ExecutionSpace> indices("Benchmark::indices_ref", 0);
+      Kokkos::View<unsigned *, ExecutionSpace> indices("Benchmark::indices_ref",
+                                                       0);
       Kokkos::View<int *, ExecutionSpace> offset("Benchmark::offset_ref", 0);
-      bvh.query(space, predicates, ArborX::Details::LegacyDefaultCallback{},
-                indices, offset);
+      bvh.query(space, predicates, indices, offset);
 
       space.fence();
       double time = timer.seconds();
@@ -112,10 +112,9 @@ static void run_fp(int nprimitives, int nqueries, int nrepeats)
       ArborX::BruteForce<MemorySpace, ArborX::PairValueIndex<Point>> brute{
           space, ArborX::Experimental::attach_indices(primitives)};
 
-      Kokkos::View<int *, ExecutionSpace> indices("Benchmark::indices", 0);
+      Kokkos::View<unsigned *, ExecutionSpace> indices("Benchmark::indices", 0);
       Kokkos::View<int *, ExecutionSpace> offset("Benchmark::offset", 0);
-      brute.query(space, predicates, ArborX::Details::LegacyDefaultCallback{},
-                  indices, offset);
+      brute.query(space, predicates, indices, offset);
 
       space.fence();
       double time = timer.seconds();
diff --git a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
index 42dfbca4e..3033b67e6 100644
--- a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
+++ b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
@@ -317,10 +317,9 @@ bool verifyDBSCAN(ExecutionSpace exec_space, Primitives const &primitives,
   auto const predicates = ArborX::Experimental::attach_indices(
       ArborX::Experimental::make_intersects(points, eps));
 
-  Kokkos::View<int *, MemorySpace> indices("ArborX::DBSCAN::indices", 0);
+  Kokkos::View<unsigned *, MemorySpace> indices("ArborX::DBSCAN::indices", 0);
   Kokkos::View<int *, MemorySpace> offset("ArborX::DBSCAN::offset", 0);
-  ArborX::query(bvh, exec_space, predicates,
-                ArborX::Details::LegacyDefaultCallback{}, indices, offset);
+  ArborX::query(bvh, exec_space, predicates, indices, offset);
 
   auto passed = Details::verifyClusters(exec_space, indices, offset, labels,
                                         core_min_size);