diff --git a/test/Search_UnitTestHelpers.hpp b/test/Search_UnitTestHelpers.hpp index ffee07ef5..75e4bc479 100644 --- a/test/Search_UnitTestHelpers.hpp +++ b/test/Search_UnitTestHelpers.hpp @@ -146,91 +146,114 @@ makeDistributedTree(MPI_Comm comm, std::vector const &b) #endif template -auto makeIntersectsBoxQueries(std::vector const &boxes) +auto makeIntersectsBoxQueries( + std::vector const &boxes, + typename DeviceType::execution_space const &exec_space = {}) { int const n = boxes.size(); Kokkos::View - queries("Testing::intersecting_with_box_predicates", n); - auto queries_host = Kokkos::create_mirror_view(queries); + queries(Kokkos::view_alloc(Kokkos::WithoutInitializing, + "Testing::intersecting_with_box_predicates"), + n); + auto queries_host = + Kokkos::create_mirror_view(Kokkos::WithoutInitializing, queries); for (int i = 0; i < n; ++i) queries_host(i) = ArborX::intersects(boxes[i]); - Kokkos::deep_copy(queries, queries_host); + Kokkos::deep_copy(exec_space, queries, queries_host); return queries; } template auto makeIntersectsBoxWithAttachmentQueries( - std::vector const &boxes, std::vector const &data) + std::vector const &boxes, std::vector const &data, + typename DeviceType::execution_space const &exec_space = {}) { int const n = boxes.size(); Kokkos::View - queries("Testing::intersecting_with_box_with_attachment_predicates", n); - auto queries_host = Kokkos::create_mirror_view(queries); + queries(Kokkos::view_alloc( + Kokkos::WithoutInitializing, + "Testing::intersecting_with_box_with_attachment_predicates"), + n); + auto queries_host = + Kokkos::create_mirror_view(Kokkos::WithoutInitializing, queries); for (int i = 0; i < n; ++i) queries_host(i) = ArborX::attach(ArborX::intersects(boxes[i]), data[i]); - Kokkos::deep_copy(queries, queries_host); + Kokkos::deep_copy(exec_space, queries, queries_host); return queries; } template auto makeNearestQueries( - std::vector> const &points) + std::vector> const &points, + typename DeviceType::execution_space const &exec_space = {}) { // NOTE: `points` is not a very descriptive name here. It stores both the // actual point and the number k of neighbors to query for. int const n = points.size(); Kokkos::View *, DeviceType> queries( - "Testing::nearest_queries", n); - auto queries_host = Kokkos::create_mirror_view(queries); + Kokkos::view_alloc(Kokkos::WithoutInitializing, + "Testing::nearest_queries"), + n); + auto queries_host = + Kokkos::create_mirror_view(Kokkos::WithoutInitializing, queries); for (int i = 0; i < n; ++i) queries_host(i) = ArborX::nearest(points[i].first, points[i].second); - Kokkos::deep_copy(queries, queries_host); + Kokkos::deep_copy(exec_space, queries, queries_host); return queries; } template auto makeBoxNearestQueries( - std::vector> const &boxes) + std::vector> const &boxes, + typename DeviceType::execution_space const &exec_space = {}) { // NOTE: `boxes` is not a very descriptive name here. It stores both the // corners of the boxe and the number k of neighbors to query for. int const n = boxes.size(); Kokkos::View *, DeviceType> queries( - "Testing::nearest_queries", n); - auto queries_host = Kokkos::create_mirror_view(queries); + Kokkos::view_alloc(Kokkos::WithoutInitializing, + "Testing::nearest_queries"), + n); + auto queries_host = + Kokkos::create_mirror_view(Kokkos::WithoutInitializing, queries); for (int i = 0; i < n; ++i) queries_host(i) = ArborX::nearest( ArborX::Box{std::get<0>(boxes[i]), std::get<1>(boxes[i])}, std::get<2>(boxes[i])); - Kokkos::deep_copy(queries, queries_host); + Kokkos::deep_copy(exec_space, queries, queries_host); return queries; } template auto makeSphereNearestQueries( - std::vector> const &spheres) + std::vector> const &spheres, + typename DeviceType::execution_space const &exec_space = {}) { // NOTE: `sphere` is not a very descriptive name here. It stores both the // center and the radius of the sphere and the number k of neighbors to query // for. int const n = spheres.size(); Kokkos::View *, DeviceType> queries( - "Testing::nearest_queries", n); - auto queries_host = Kokkos::create_mirror_view(queries); + Kokkos::view_alloc(Kokkos::WithoutInitializing, + "Testing::nearest_queries"), + n); + auto queries_host = + Kokkos::create_mirror_view(Kokkos::WithoutInitializing, queries); for (int i = 0; i < n; ++i) queries_host(i) = ArborX::nearest( ArborX::Sphere{std::get<0>(spheres[i]), std::get<1>(spheres[i])}, std::get<2>(spheres[i])); - Kokkos::deep_copy(queries, queries_host); + Kokkos::deep_copy(exec_space, queries, queries_host); return queries; } template auto makeNearestWithAttachmentQueries( std::vector> const &points, - std::vector const &data) + std::vector const &data, + typename DeviceType::execution_space const &exec_space = {}) { // NOTE: `points` is not a very descriptive name here. It stores both the // actual point and the number k of neighbors to query for. @@ -238,30 +261,37 @@ auto makeNearestWithAttachmentQueries( Kokkos::View{}, Data{})) *, DeviceType> - queries("Testing::nearest_queries", n); - auto queries_host = Kokkos::create_mirror_view(queries); + queries(Kokkos::view_alloc(Kokkos::WithoutInitializing, + "Testing::nearest_queries"), + n); + auto queries_host = + Kokkos::create_mirror_view(Kokkos::WithoutInitializing, queries); for (int i = 0; i < n; ++i) queries_host(i) = ArborX::attach( ArborX::nearest(points[i].first, points[i].second), data[i]); - Kokkos::deep_copy(queries, queries_host); + Kokkos::deep_copy(exec_space, queries, queries_host); return queries; } template -Kokkos::View -makeIntersectsSphereQueries( - std::vector> const &points) +auto makeIntersectsSphereQueries( + std::vector> const &points, + typename DeviceType::execution_space const &exec_space = {}) { // NOTE: `points` is not a very descriptive name here. It stores both the // actual point and the radius for the search around that point. int const n = points.size(); Kokkos::View - queries("Testing::intersecting_with_sphere_predicates", n); - auto queries_host = Kokkos::create_mirror_view(queries); + queries( + Kokkos::view_alloc(Kokkos::WithoutInitializing, + "Testing::intersecting_with_sphere_predicates"), + n); + auto queries_host = + Kokkos::create_mirror_view(Kokkos::WithoutInitializing, queries); for (int i = 0; i < n; ++i) queries_host(i) = ArborX::intersects(ArborX::Sphere{points[i].first, points[i].second}); - Kokkos::deep_copy(queries, queries_host); + Kokkos::deep_copy(exec_space, queries, queries_host); return queries; }