Add CTAD for Indexables

arborx · Oct 12, 2024 · b877e85 · b877e85
1 parent 1389d25
commit b877e85
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/src/cluster/ArborX_DBSCAN.hpp b/src/cluster/ArborX_DBSCAN.hpp
@@ -302,8 +302,7 @@ dbscan(ExecutionSpace const &exec_space, Primitives const &primitives,
     Box bounds;
     Details::TreeConstruction::calculateBoundingBoxOfTheScene(
         exec_space,
-        Details::Indexables<Points, Experimental::Indexable<Point>>{points, {}},
-        bounds);
+        Details::Indexables{points, Experimental::Indexable<Point>{}}, bounds);
 
     // The cell length is chosen to be eps/sqrt(dimension), so that any two
     // points within the same cell are within eps distance of each other.

diff --git a/src/spatial/ArborX_BruteForce.hpp b/src/spatial/ArborX_BruteForce.hpp
@@ -198,9 +198,7 @@ void BruteForce<MemorySpace, Value, IndexableGetter, BoundingVolume>::query(
 
   Details::BruteForceImpl::query(
       Tag{}, space, predicates, _values,
-      Details::Indexables<decltype(_values), IndexableGetter>{
-          _values, _indexable_getter},
-      callback);
+      Details::Indexables{_values, _indexable_getter}, callback);
 }
 
 } // namespace ArborX

diff --git a/src/spatial/ArborX_LinearBVH.hpp b/src/spatial/ArborX_LinearBVH.hpp
@@ -238,8 +238,7 @@ BoundingVolumeHierarchy<MemorySpace, Value, IndexableGetter, BoundingVolume>::
     return;
   }
 
-  Details::Indexables<Values, IndexableGetter> indexables{values,
-                                                          indexable_getter};
+  Details::Indexables indexables{values, indexable_getter};
 
   Kokkos::Profiling::pushRegion(
       "ArborX::BVH::BVH::calculate_scene_bounding_box");

diff --git a/src/spatial/detail/ArborX_Indexable.hpp b/src/spatial/detail/ArborX_Indexable.hpp
@@ -75,6 +75,14 @@ struct Indexables
   KOKKOS_FUNCTION auto size() const { return _values.size(); }
 };
 
+template <typename Values, typename IndexableGetter>
+#if KOKKOS_VERSION >= 40400
+KOKKOS_DEDUCTION_GUIDE
+#else
+KOKKOS_FUNCTION
+#endif
+    Indexables(Values, IndexableGetter) -> Indexables<Values, IndexableGetter>;
+
 } // namespace Details
 
 } // namespace ArborX

diff --git a/test/tstDetailsTreeConstruction.cpp b/test/tstDetailsTreeConstruction.cpp
@@ -81,9 +81,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(assign_morton_codes, DeviceType,
 
   using Values = LegacyValues<decltype(boxes), ArborX::Box<3>>;
   Values values{boxes};
-  ArborX::Details::Indexables<
-      Values, ArborX::Experimental::Indexable<typename Values::value_type>>
-      indexables{values, {}};
+  ArborX::Details::Indexables indexables{
+      values, ArborX::Experimental::Indexable<typename Values::value_type>{}};
 
   // Test for a bug where missing move ref operator() in default Indexable
   // results in a default initialized indexable used in scene box calucation.

diff --git a/test/tstIndexableGetter.cpp b/test/tstIndexableGetter.cpp
@@ -112,8 +112,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(indexables, DeviceType, ARBORX_DEVICE_TYPES)
 
     Primitives primitives(points_cloud);
 
-    ArborX::Details::Indexables<Primitives, IndexableGetter> indexables{
-        primitives, IndexableGetter{}};
+    ArborX::Details::Indexables indexables{primitives, IndexableGetter{}};
 
     ArborX::Box<3> box;
     calculateBoundingBoxOfTheScene(ExecutionSpace{}, indexables, box);
@@ -130,8 +129,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(indexables, DeviceType, ARBORX_DEVICE_TYPES)
         ArborX::Experimental::Indexable<typename Primitives::value_type>;
     Primitives primitives(points_cloud);
 
-    ArborX::Details::Indexables<Primitives, IndexableGetter> indexables{
-        primitives, IndexableGetter{}};
+    ArborX::Details::Indexables indexables{primitives, IndexableGetter{}};
 
     ArborX::Box<3> box;
     calculateBoundingBoxOfTheScene(ExecutionSpace{}, indexables, box);