Skip to content

Commit

Permalink
Fix DistributedTree to call query_crs
Browse files Browse the repository at this point in the history
  • Loading branch information
aprokop committed Dec 8, 2020
1 parent 827fcfe commit eefb737
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/details/ArborX_DetailsDistributedTreeImpl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ void DistributedTreeImpl<DeviceType>::deviseStrategy(
auto const &bottom_tree_sizes = tree._bottom_tree_sizes;

// Find the k nearest local trees.
top_tree.query(space, queries, indices, offset);
query_crs(space, top_tree, queries, indices, offset);

// Accumulate total leave count in the local trees until it reaches k which
// is the number of neighbors queried for. Stop if local trees get
Expand Down Expand Up @@ -380,7 +380,7 @@ void DistributedTreeImpl<DeviceType>::reassessStrategy(
getGeometry(Access::get(queries, i)), farthest_distances(i)});
});

top_tree.query(space, radius_searches, indices, offset);
query_crs(space, top_tree, radius_searches, indices, offset);
// NOTE: in principle, we could perform radius searches on the bottom_tree
// rather than nearest queries.

Expand Down Expand Up @@ -448,7 +448,7 @@ DistributedTreeImpl<DeviceType>::queryDispatchImpl(
ranks);

// Perform queries that have been received
bottom_tree.query(space, fwd_queries, indices, offset, distances);
query_crs(space, bottom_tree, fwd_queries, indices, offset, distances);

// Communicate results back
communicateResultsBack(comm, space, indices, offset, ranks, ids,
Expand Down Expand Up @@ -490,7 +490,7 @@ DistributedTreeImpl<DeviceType>::queryDispatch(
"ArborX::DistributedTree::query::spatial::indices", 0);
Kokkos::View<int *, DeviceType> ranks(
"ArborX::DistributedTree::query::spatial::ranks", 0);
top_tree.query(space, queries, indices, offset);
query_crs(space, top_tree, queries, indices, offset);

{
// NOTE_COMM_SPATIAL: The communication pattern here for the spatial search
Expand All @@ -511,7 +511,7 @@ DistributedTreeImpl<DeviceType>::queryDispatch(
ranks);

// Perform queries that have been received
bottom_tree.query(space, fwd_queries, callback, out, offset);
query_crs(space, bottom_tree, fwd_queries, callback, out, offset);

// Communicate results back
communicateResultsBack(comm, space, out, offset, ranks, ids);
Expand Down

0 comments on commit eefb737

Please sign in to comment.