Get rid of generic lambdas not supported by CUDA

masterleinad · Apr 9, 2024 · fb2ec1f · fb2ec1f
1 parent fd39c11
commit fb2ec1f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/details/ArborX_NeighborList.hpp b/src/details/ArborX_NeighborList.hpp
@@ -67,7 +67,9 @@ void findHalfNeighborList(ExecutionSpace const &space,
   Points points{primitives}; // NOLINT
   int const n = points.size();
 
-  BoundingVolumeHierarchy<MemorySpace, PairValueIndex<Point>> bvh(
+  using Value = PairValueIndex<Point>;
+
+  BoundingVolumeHierarchy<MemorySpace, Value> bvh(
       space, Experimental::attach_indices(points));
 
   Kokkos::Profiling::pushRegion(
@@ -77,7 +79,7 @@ void findHalfNeighborList(ExecutionSpace const &space,
   Kokkos::deep_copy(space, offsets, 0);
   HalfTraversal(
       space, bvh,
-      KOKKOS_LAMBDA(auto, auto const &value) {
+      KOKKOS_LAMBDA(Value const &, Value const &value) {
         Kokkos::atomic_increment(&offsets(value.index));
       },
       NeighborListPredicateGetter{radius});
@@ -93,7 +95,7 @@ void findHalfNeighborList(ExecutionSpace const &space,
                        "ArborX::Experimental::HalfNeighborList::counts");
   HalfTraversal(
       space, bvh,
-      KOKKOS_LAMBDA(auto const &value1, auto const &value2) {
+      KOKKOS_LAMBDA(Value const &value1, Value const &value2) {
         indices(Kokkos::atomic_fetch_inc(&counts(value2.index))) = value1.index;
       },
       NeighborListPredicateGetter{radius});
@@ -125,7 +127,9 @@ void findFullNeighborList(ExecutionSpace const &space,
   Points points{primitives}; // NOLINT
   int const n = points.size();
 
-  BoundingVolumeHierarchy<MemorySpace, PairValueIndex<Point>> bvh(
+  using Value = PairValueIndex<Point>;
+
+  BoundingVolumeHierarchy<MemorySpace, Value> bvh(
       space, Experimental::attach_indices(points));
 
   Kokkos::Profiling::pushRegion(
@@ -135,7 +139,7 @@ void findFullNeighborList(ExecutionSpace const &space,
   Kokkos::deep_copy(space, offsets, 0);
   HalfTraversal(
       space, bvh,
-      KOKKOS_LAMBDA(auto const &value1, auto const &value2) {
+      KOKKOS_LAMBDA(Value const &value1, Value const &value2) {
         Kokkos::atomic_increment(&offsets(value1.index));
         Kokkos::atomic_increment(&offsets(value2.index));
       },
@@ -152,7 +156,7 @@ void findFullNeighborList(ExecutionSpace const &space,
                        "ArborX::Experimental::FullNeighborList::counts");
   HalfTraversal(
       space, bvh,
-      KOKKOS_LAMBDA(auto const &value1, auto const &value2) {
+      KOKKOS_LAMBDA(Value const &value1, Value const &value2) {
         indices(Kokkos::atomic_fetch_inc(&counts(value2.index))) = value1.index;
       },
       NeighborListPredicateGetter{radius});

diff --git a/test/tstDetailsHalfTraversal.cpp b/test/tstDetailsHalfTraversal.cpp
@@ -81,9 +81,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(half_traversal, DeviceType, ARBORX_DEVICE_TYPES)
   // [n] 1  1  1  1  1  1  1  1  1  0
 
   using ArborX::Details::HalfTraversal;
+  using Value = ArborX::PairValueIndex<ArborX::Box>;
   HalfTraversal(
       exec_space, bvh,
-      KOKKOS_LAMBDA(auto const &value1, auto const &value2) {
+      KOKKOS_LAMBDA(Value const &value1, Value const &value2) {
         int i = value1.index;
         int j = value2.index;
         auto [min_ij, max_ij] = Kokkos::minmax(i, j);