Fix examples, benchmarks, tests

arborx · Oct 5, 2024 · 7d044fb · 7d044fb
1 parent b00ebda
commit 7d044fb
Show file tree

Hide file tree

Showing 17 changed files with 134 additions and 102 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
@@ -23,44 +23,51 @@ using MemorySpace = ExecutionSpace::memory_space;
 
 namespace ArborXBenchmark
 {
-template <int DIM, typename FloatingPoint>
+struct PrimitivesTag
+{};
+struct PredicatesTag
+{};
+
+template <int DIM, typename FloatingPoint, typename Tag>
 struct Placeholder
 {
   int count;
 };
 } // namespace ArborXBenchmark
 
-// Primitives are a set of points located at (i, i, i),
-// with i = 0, ..., n-1
-template <int DIM, typename FloatingPoint>
-struct ArborX::AccessTraits<ArborXBenchmark::Placeholder<DIM, FloatingPoint>,
-                            ArborX::PrimitivesTag>
+template <int DIM, typename FloatingPoint, typename Tag>
+struct ArborX::AccessTraits<
+    ArborXBenchmark::Placeholder<DIM, FloatingPoint, Tag>>
 {
-  using Primitives = ArborXBenchmark::Placeholder<DIM, FloatingPoint>;
   using memory_space = MemorySpace;
   using size_type = typename MemorySpace::size_type;
-  static KOKKOS_FUNCTION size_type size(Primitives d) { return d.count; }
-  static KOKKOS_FUNCTION auto get(Primitives, size_type i)
+
+  static KOKKOS_FUNCTION size_type
+  size(ArborXBenchmark::Placeholder<DIM, FloatingPoint, Tag> d)
+  {
+    return d.count;
+  }
+
+  static KOKKOS_FUNCTION auto
+  get(ArborXBenchmark::Placeholder<DIM, FloatingPoint,
+                                   ArborXBenchmark::PrimitivesTag>,
+      size_type i)
   {
+    // Primitives are a set of points located at (i, i, i),
+    // with i = 0, ..., n-1
     ArborX::Point<DIM, FloatingPoint> point;
     for (int d = 0; d < DIM; ++d)
       point[d] = i;
     return point;
   }
-};
 
-// Predicates are sphere intersections with spheres of radius i
-// centered at (i, i, i), with i = 0, ..., n-1
-template <int DIM, typename FloatingPoint>
-struct ArborX::AccessTraits<ArborXBenchmark::Placeholder<DIM, FloatingPoint>,
-                            ArborX::PredicatesTag>
-{
-  using Predicates = ArborXBenchmark::Placeholder<DIM, FloatingPoint>;
-  using memory_space = MemorySpace;
-  using size_type = typename MemorySpace::size_type;
-  static KOKKOS_FUNCTION size_type size(Predicates d) { return d.count; }
-  static KOKKOS_FUNCTION auto get(Predicates, size_type i)
+  static KOKKOS_FUNCTION auto
+  get(ArborXBenchmark::Placeholder<DIM, FloatingPoint,
+                                   ArborXBenchmark::PredicatesTag>,
+      size_type i)
   {
+    // Predicates are sphere intersections with spheres of radius i
+    // centered at (i, i, i), with i = 0, ..., n-1
     ArborX::Point<DIM, FloatingPoint> center;
     for (int d = 0; d < DIM; ++d)
       center[d] = i;
@@ -75,8 +82,8 @@ template <int DIM, typename FloatingPoint>
 static void run_fp(int nprimitives, int nqueries, int nrepeats)
 {
   ExecutionSpace space{};
-  Placeholder<DIM, FloatingPoint> primitives{nprimitives};
-  Placeholder<DIM, FloatingPoint> predicates{nqueries};
+  Placeholder<DIM, FloatingPoint, PrimitivesTag> primitives{nprimitives};
+  Placeholder<DIM, FloatingPoint, PredicatesTag> predicates{nqueries};
 
   for (int i = 0; i < nrepeats; i++)
   {

diff --git a/benchmarks/dbscan/ArborX_DBSCANVerification.hpp b/benchmarks/dbscan/ArborX_DBSCANVerification.hpp
@@ -284,7 +284,7 @@ bool verifyDBSCAN(ExecutionSpace exec_space, Primitives const &primitives,
 
   static_assert(Kokkos::is_view<LabelsView>{});
 
-  using Points = Details::AccessValues<Primitives, PrimitivesTag>;
+  using Points = Details::AccessValues<Primitives>;
   using MemorySpace = typename Points::memory_space;
 
   static_assert(std::is_same<typename LabelsView::value_type, int>{});

diff --git a/benchmarks/triangulated_surface_distance/triangulated_surface_distance.cpp b/benchmarks/triangulated_surface_distance/triangulated_surface_distance.cpp
@@ -35,7 +35,7 @@ struct Triangles
 };
 
 template <typename MemorySpace>
-class ArborX::AccessTraits<Triangles<MemorySpace>, ArborX::PrimitivesTag>
+class ArborX::AccessTraits<Triangles<MemorySpace>>
 {
   using Self = Triangles<MemorySpace>;
 

diff --git a/examples/access_traits/example_cuda_access_traits.cpp b/examples/access_traits/example_cuda_access_traits.cpp
@@ -35,7 +35,7 @@ struct Spheres
 };
 
 template <>
-struct ArborX::AccessTraits<PointCloud, ArborX::PrimitivesTag>
+struct ArborX::AccessTraits<PointCloud>
 {
   static KOKKOS_FUNCTION std::size_t size(PointCloud const &cloud)
   {
@@ -49,7 +49,7 @@ struct ArborX::AccessTraits<PointCloud, ArborX::PrimitivesTag>
 };
 
 template <>
-struct ArborX::AccessTraits<Spheres, ArborX::PredicatesTag>
+struct ArborX::AccessTraits<Spheres>
 {
   static KOKKOS_FUNCTION std::size_t size(Spheres const &d) { return d.N; }
   static KOKKOS_FUNCTION auto get(Spheres const &d, std::size_t i)

diff --git a/examples/access_traits/example_host_access_traits.cpp b/examples/access_traits/example_host_access_traits.cpp
@@ -17,8 +17,8 @@
 #include <random>
 #include <vector>
 
-template <typename T, typename Tag>
-struct ArborX::AccessTraits<std::vector<T>, Tag>
+template <typename T>
+struct ArborX::AccessTraits<std::vector<T>>
 {
   static std::size_t size(std::vector<T> const &v) { return v.size(); }
   static T const &get(std::vector<T> const &v, std::size_t i) { return v[i]; }

diff --git a/examples/brute_force/example_brute_force.cpp b/examples/brute_force/example_brute_force.cpp
@@ -15,6 +15,12 @@
 
 #include <iostream>
 
+struct PrimitivesTag
+{};
+struct PredicatesTag
+{};
+
+template <typename Tag>
 struct Dummy
 {
   int count;
@@ -23,26 +29,17 @@ struct Dummy
 using ExecutionSpace = Kokkos::DefaultExecutionSpace;
 using MemorySpace = ExecutionSpace::memory_space;
 
-template <>
-struct ArborX::AccessTraits<Dummy, ArborX::PrimitivesTag>
+template <typename Tag>
+struct ArborX::AccessTraits<Dummy<Tag>>
 {
   using memory_space = MemorySpace;
   using size_type = typename MemorySpace::size_type;
-  static KOKKOS_FUNCTION size_type size(Dummy const &d) { return d.count; }
-  static KOKKOS_FUNCTION auto get(Dummy const &, size_type i)
+  static KOKKOS_FUNCTION size_type size(Dummy<Tag> const &d) { return d.count; }
+  static KOKKOS_FUNCTION auto get(Dummy<PrimitivesTag> const &, size_type i)
   {
     return ArborX::Point{(float)i, (float)i, (float)i};
   }
-};
-
-template <>
-struct ArborX::AccessTraits<Dummy, ArborX::PredicatesTag>
-{
-  using memory_space = MemorySpace;
-  using size_type = typename MemorySpace::size_type;
-
-  static KOKKOS_FUNCTION size_type size(Dummy const &d) { return d.count; }
-  static KOKKOS_FUNCTION auto get(Dummy const &, size_type i)
+  static KOKKOS_FUNCTION auto get(Dummy<PredicatesTag> const &, size_type i)
   {
     ArborX::Point center{(float)i, (float)i, (float)i};
     return ArborX::intersects(Sphere{center, (float)i});
@@ -69,8 +66,8 @@ int main(int argc, char *argv[])
   int nprimitives = 5;
   int npredicates = 5;
 
-  Dummy primitives{nprimitives};
-  Dummy predicates{npredicates};
+  Dummy<PrimitivesTag> primitives{nprimitives};
+  Dummy<PredicatesTag> predicates{npredicates};
 
   unsigned int out_count;
   {

diff --git a/examples/callback/example_callback.cpp b/examples/callback/example_callback.cpp
@@ -29,7 +29,7 @@ struct NearestToOrigin
 };
 
 template <>
-struct ArborX::AccessTraits<FirstOctant, ArborX::PredicatesTag>
+struct ArborX::AccessTraits<FirstOctant>
 {
   static KOKKOS_FUNCTION std::size_t size(FirstOctant) { return 1; }
   static KOKKOS_FUNCTION auto get(FirstOctant, std::size_t)
@@ -40,7 +40,7 @@ struct ArborX::AccessTraits<FirstOctant, ArborX::PredicatesTag>
 };
 
 template <>
-struct ArborX::AccessTraits<NearestToOrigin, ArborX::PredicatesTag>
+struct ArborX::AccessTraits<NearestToOrigin>
 {
   static KOKKOS_FUNCTION std::size_t size(NearestToOrigin) { return 1; }
   static KOKKOS_FUNCTION auto get(NearestToOrigin d, std::size_t)

diff --git a/examples/molecular_dynamics/example_molecular_dynamics.cpp b/examples/molecular_dynamics/example_molecular_dynamics.cpp
@@ -24,7 +24,7 @@ struct Neighbors
 };
 
 template <class MemorySpace>
-struct ArborX::AccessTraits<Neighbors<MemorySpace>, ArborX::PredicatesTag>
+struct ArborX::AccessTraits<Neighbors<MemorySpace>>
 {
   using memory_space = MemorySpace;
   using size_type = std::size_t;

diff --git a/examples/raytracing/example_raytracing.cpp b/examples/raytracing/example_raytracing.cpp
@@ -87,8 +87,7 @@ struct DepositEnergy
 } // namespace OrderedIntersectsBased
 
 template <typename MemorySpace>
-struct ArborX::AccessTraits<OrderedIntersectsBased::Rays<MemorySpace>,
-                            ArborX::PredicatesTag>
+struct ArborX::AccessTraits<OrderedIntersectsBased::Rays<MemorySpace>>
 {
   using memory_space = MemorySpace;
   using size_type = std::size_t;

diff --git a/test/ArborXTest_LegacyTree.hpp b/test/ArborXTest_LegacyTree.hpp
@@ -26,7 +26,7 @@ template <typename Primitives, typename BoundingVolume>
 class LegacyValues
 {
   Primitives _primitives;
-  using Access = ArborX::AccessTraits<Primitives, ArborX::PrimitivesTag>;
+  using Access = ArborX::AccessTraits<Primitives>;
 
 public:
   using memory_space = typename Access::memory_space;
@@ -67,8 +67,7 @@ class LegacyValues
 };
 
 template <typename Primitives, typename BoundingVolume>
-struct ArborX::AccessTraits<LegacyValues<Primitives, BoundingVolume>,
-                            ArborX::PrimitivesTag>
+struct ArborX::AccessTraits<LegacyValues<Primitives, BoundingVolume>>
 {
   using self_type = LegacyValues<Primitives, BoundingVolume>;
 

diff --git a/test/ArborX_BoostRTreeHelpers.hpp b/test/ArborX_BoostRTreeHelpers.hpp
@@ -192,8 +192,7 @@ performQueries(RTree<Indexable> const &rtree, UserPredicates const &predicates)
 {
   namespace KokkosExt = ArborX::Details::KokkosExt;
 
-  using Predicates =
-      ArborX::Details::AccessValues<UserPredicates, ArborX::PredicatesTag>;
+  using Predicates = ArborX::Details::AccessValues<UserPredicates>;
   static_assert(Kokkos::SpaceAccessibility<typename Predicates::memory_space,
                                            Kokkos::HostSpace>::accessible);
 

diff --git a/test/tstAttachIndices.cpp b/test/tstAttachIndices.cpp
@@ -23,8 +23,7 @@ BOOST_AUTO_TEST_CASE(attach_indices_to_primitives)
 
   Kokkos::View<ArborX::Point<3> *, Kokkos::HostSpace> p("Testing::p", 10);
   auto p_with_indices = attach_indices(p);
-  AccessValues<decltype(p_with_indices), ArborX::PrimitivesTag> p_values{
-      p_with_indices};
+  AccessValues<decltype(p_with_indices)> p_values{p_with_indices};
   static_assert(std::is_same_v<decltype(p_values(0).index), unsigned>);
   BOOST_TEST(p_values(0).index == 0);
   BOOST_TEST(p_values(9).index == 9);
@@ -38,8 +37,7 @@ BOOST_AUTO_TEST_CASE(attach_indices_to_predicates)
   using IntersectsPredicate = decltype(ArborX::intersects(ArborX::Point<3>{}));
   Kokkos::View<IntersectsPredicate *, Kokkos::HostSpace> q("Testing::q", 10);
   auto q_with_indices = attach_indices<long>(q);
-  AccessValues<decltype(q_with_indices), ArborX::PredicatesTag> q_values{
-      q_with_indices};
+  AccessValues<decltype(q_with_indices)> q_values{q_with_indices};
   BOOST_TEST(ArborX::getData(q_values(0)) == 0);
   BOOST_TEST(ArborX::getData(q_values(9)) == 9);
 }