Change Indexables to operate on array-like Values

arborx · Oct 24, 2023 · 6320774 · 6320774
1 parent 89f01f2
commit 6320774
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/ArborX_LinearBVH.hpp b/src/ArborX_LinearBVH.hpp
@@ -225,8 +225,8 @@ BasicBoundingVolumeHierarchy<MemorySpace, Value, IndexableGetter,
     return;
   }
 
-  Details::Indexables<Values, IndexableGetter> indexables{user_values,
-                                                          indexable_getter};
+  Details::Indexables<decltype(values), IndexableGetter> indexables{
+      values, indexable_getter};
 
   Kokkos::Profiling::pushRegion(
       "ArborX::BVH::BVH::calculate_scene_bounding_box");

diff --git a/src/details/ArborX_IndexableGetter.hpp b/src/details/ArborX_IndexableGetter.hpp
@@ -52,15 +52,14 @@ struct Indexables
   Values _values;
   IndexableGetter _indexable_getter;
 
-  using Access = AccessTraits<Values, PrimitivesTag>;
-  using memory_space = typename Access::memory_space;
+  using memory_space = typename Values::memory_space;
 
   KOKKOS_FUNCTION decltype(auto) operator()(int i) const
   {
-    return _indexable_getter(Access::get(_values, i));
+    return _indexable_getter(_values(i));
   }
 
-  KOKKOS_FUNCTION auto size() const { return Access::size(_values); }
+  KOKKOS_FUNCTION auto size() const { return _values.size(); }
 };
 
 } // namespace ArborX::Details