Merge pull request #1255 from aprokop/fix_predicate_helpers

Author: aprokop

src/spatial/detail/ArborX_PredicateHelpers.hpp

@@ -28,6 +28,8 @@ class PrimitivesIntersect
   using Primitives = Details::AccessValues<UserPrimitives>;
 
 public:
+  using memory_space = typename Primitives::memory_space;
+
   KOKKOS_FUNCTION PrimitivesIntersect(UserPrimitives const &primitives)
       : _primitives(primitives)
   {}
@@ -41,6 +43,8 @@ class PrimitivesOrderedIntersect
   using Primitives = Details::AccessValues<UserPrimitives>;
 
 public:
+  using memory_space = typename Primitives::memory_space;
+
   KOKKOS_FUNCTION PrimitivesOrderedIntersect(UserPrimitives const &primitives)
       : _primitives(primitives)
   {}
@@ -57,6 +61,8 @@ class PrimitivesWithRadius
   using Coordinate = typename GeometryTraits::coordinate_type<Point>::type;
 
 public:
+  using memory_space = typename Primitives::memory_space;
+
   PrimitivesWithRadius(UserPrimitives const &user_primitives, Coordinate r)
       : _primitives(user_primitives)
       , _r(r)
@@ -72,6 +78,8 @@ class PrimitivesNearestK
   using Primitives = Details::AccessValues<UserPrimitives>;
 
 public:
+  using memory_space = typename Primitives::memory_space;
+
   PrimitivesNearestK(UserPrimitives const &user_primitives, int k)
       : _primitives(user_primitives)
       , _k(k)
@@ -119,7 +127,7 @@ struct AccessTraits<Experimental::PrimitivesIntersect<Primitives>>
   using Self = Experimental::PrimitivesIntersect<Primitives>;
 
 public:
-  using memory_space = typename Primitives::memory_space;
+  using memory_space = typename Self::memory_space;
   using size_type = typename memory_space::size_type;
 
   static KOKKOS_FUNCTION size_type size(Self const &x)
@@ -139,7 +147,7 @@ struct AccessTraits<Experimental::PrimitivesOrderedIntersect<Primitives>>
   using Self = Experimental::PrimitivesOrderedIntersect<Primitives>;
 
 public:
-  using memory_space = typename Primitives::memory_space;
+  using memory_space = typename Self::memory_space;
   using size_type = typename memory_space::size_type;
 
   static KOKKOS_FUNCTION size_type size(Self const &x)
@@ -159,7 +167,7 @@ struct AccessTraits<Experimental::PrimitivesWithRadius<Primitives>>
   using Self = Experimental::PrimitivesWithRadius<Primitives>;
 
 public:
-  using memory_space = typename Primitives::memory_space;
+  using memory_space = typename Self::memory_space;
   using size_type = typename memory_space::size_type;
 
   static KOKKOS_FUNCTION size_type size(Self const &x)
@@ -184,7 +192,7 @@ struct AccessTraits<Experimental::PrimitivesNearestK<Primitives>>
   using Self = Experimental::PrimitivesNearestK<Primitives>;
 
 public:
-  using memory_space = typename Primitives::memory_space;
+  using memory_space = typename Self::memory_space;
   using size_type = typename memory_space::size_type;
 
   static KOKKOS_FUNCTION size_type size(Self const &x)

test/tstPredicateHelpers.cpp

@@ -30,6 +30,11 @@ struct Placeholder
   int n;
 };
 
+struct PlaceholderWithoutMemory
+{
+  int n;
+};
+
 template <typename MemorySpace>
 struct ArborX::AccessTraits<Placeholder<MemorySpace>>
 {
@@ -43,6 +48,19 @@ struct ArborX::AccessTraits<Placeholder<MemorySpace>>
   }
 };
 
+template <>
+struct ArborX::AccessTraits<PlaceholderWithoutMemory>
+{
+  using Self = PlaceholderWithoutMemory;
+  using memory_space = Kokkos::DefaultExecutionSpace::memory_space;
+
+  KOKKOS_FUNCTION static auto size(Self const &self) { return self.n; }
+  KOKKOS_FUNCTION static auto get(Self const &, int i)
+  {
+    return ArborX::Point<2>{(float)i, (float)i};
+  }
+};
+
 struct IntersectsTag
 {};
 struct IntersectsWithRadiusTag
@@ -131,22 +149,32 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(make_predicates, DeviceType, ARBORX_DEVICE_TYPES)
           v.data(), v.size()));
 
   Placeholder<MemorySpace> points_access{3};
+  PlaceholderWithoutMemory points_access_nomem{3};
 
   BOOST_TEST(checkPredicates(IntersectsTag{}, space,
                              make_intersects(points_view), points_view));
   BOOST_TEST(checkPredicates(IntersectsTag{}, space,
                              make_intersects(points_access), points_access));
+  BOOST_TEST(checkPredicates(IntersectsTag{}, space,
+                             make_intersects(points_access_nomem),
+                             points_access_nomem));
 
   float r = 1.f;
   BOOST_TEST(checkPredicates(IntersectsWithRadiusTag{}, space,
                              make_intersects(points_view, r), points_view, r));
   BOOST_TEST(checkPredicates(IntersectsWithRadiusTag{}, space,
                              make_intersects(points_access, r), points_access,
                              r));
+  BOOST_TEST(checkPredicates(IntersectsWithRadiusTag{}, space,
+                             make_intersects(points_access_nomem, r),
+                             points_access_nomem, r));
 
   int const k = 3;
   BOOST_TEST(checkPredicates(NearestTag{}, space, make_nearest(points_view, k),
                              points_view, k));
   BOOST_TEST(checkPredicates(NearestTag{}, space,
                              make_nearest(points_access, k), points_access, k));
+  BOOST_TEST(checkPredicates(NearestTag{}, space,
+                             make_nearest(points_access_nomem, k),
+                             points_access_nomem, k));
 }