Few more changes

aprokop · Apr 4, 2024 · d43722c · d43722c
1 parent 9167cf7
commit d43722c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/details/ArborX_DetailsBruteForceImpl.hpp b/src/details/ArborX_DetailsBruteForceImpl.hpp
@@ -206,11 +206,11 @@ struct BruteForceImpl
               radius = heap.top().second;
             }
           }
-          while (!heap.empty())
-          {
-            callback(predicate, values(heap.top().first));
-            heap.pop();
-          }
+
+          // Match the logic in TreeTraversal and do the sorting
+          sortHeap(heap.data(), heap.data() + heap.size(), heap.valueComp());
+          for (decltype(heap.size()) i = 0; i < heap.size(); ++i)
+            callback(predicate, values((heap.data() + i)->first));
         });
   }
 };

diff --git a/src/details/ArborX_DetailsNearestBufferProvider.hpp b/src/details/ArborX_DetailsNearestBufferProvider.hpp
@@ -46,6 +46,11 @@ struct NearestBufferProvider
                            Kokkos::make_pair(*offset_ptr, *(offset_ptr + 1)));
   }
 
+  // Enclosing function for an extended __host__ __device__ lambda cannot have
+  // private or protected access within its class
+#ifndef KOKKOS_COMPILER_NVCC
+private:
+#endif
   template <typename ExecutionSpace, typename Predicates>
   void allocateBuffer(ExecutionSpace const &space, Predicates const &predicates)
   {