Address review comments

arborx · Sep 24, 2024 · 7559673 · 7559673
1 parent c314080
commit 7559673
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/examples/distributed_tree/distributed_knn.cpp b/examples/distributed_tree/distributed_knn.cpp
@@ -8,6 +8,7 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
+
 #include <ArborX.hpp>
 
 #include <Kokkos_Core.hpp>

diff --git a/test/ArborX_PairIndexRank.hpp → test/ArborXTest_PairIndexRank.hpp b/test/ArborX_PairIndexRank.hpp → test/ArborXTest_PairIndexRank.hpp
@@ -9,16 +9,16 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#ifndef ARBORX_PAIR_INDEX_RANK_HPP
-#define ARBORX_PAIR_INDEX_RANK_HPP
+#ifndef ARBORX_TEST_PAIR_INDEX_RANK_HPP
+#define ARBORX_TEST_PAIR_INDEX_RANK_HPP
 
 #include <Kokkos_Macros.hpp>
 
 #include <boost/test/tools/detail/print_helper.hpp>
 
 #include <iostream>
 
-namespace ArborX
+namespace ArborXTest
 {
 
 struct PairIndexRank
@@ -40,15 +40,15 @@ struct PairIndexRank
   }
 };
 
-} // namespace ArborX
+} // namespace ArborXTest
 
 namespace boost::test_tools::tt_detail
 {
 
 template <>
-struct print_log_value<ArborX::PairIndexRank>
+struct print_log_value<ArborXTest::PairIndexRank>
 {
-  void operator()(std::ostream &os, ArborX::PairIndexRank const &p)
+  void operator()(std::ostream &os, ArborXTest::PairIndexRank const &p)
   {
     os << '(' << p.index << ',' << p.rank << ')';
   }

diff --git a/test/ArborX_BoostRTreeHelpers.hpp b/test/ArborX_BoostRTreeHelpers.hpp
@@ -221,7 +221,7 @@ performQueries(RTree<Indexable> const &rtree, UserPredicates const &predicates)
 #ifdef ARBORX_ENABLE_MPI
 template <typename Indexable, typename InputView,
           typename OutputView1 =
-              Kokkos::View<ArborX::PairIndexRank *, Kokkos::HostSpace>,
+              Kokkos::View<ArborXTest::PairIndexRank *, Kokkos::HostSpace>,
           typename OutputView2 = Kokkos::View<int *, Kokkos::HostSpace>>
 static std::tuple<OutputView2, OutputView1>
 performQueries(ParallelRTree<Indexable> const &rtree, InputView const &queries)

diff --git a/test/Search_UnitTestHelpers.hpp b/test/Search_UnitTestHelpers.hpp
@@ -74,8 +74,8 @@ auto query(ExecutionSpace const &exec_space, Tree const &tree,
 {
   using memory_space = typename Tree::memory_space;
 #ifdef ARBORX_ENABLE_MPI
-  using value_type =
-      std::conditional_t<is_distributed<Tree>{}, ArborX::PairIndexRank, int>;
+  using value_type = std::conditional_t<is_distributed<Tree>{},
+                                        ArborXTest::PairIndexRank, int>;
 #else
   using value_type = int;
 #endif

diff --git a/test/tstDistributedTreeNearest.cpp b/test/tstDistributedTreeNearest.cpp
@@ -23,7 +23,7 @@
 
 #define BOOST_TEST_MODULE DistributedTree
 
-using ArborX::PairIndexRank;
+using ArborXTest::PairIndexRank;
 
 struct PairRankIndex
 {

diff --git a/test/tstDistributedTreeSpatial.cpp b/test/tstDistributedTreeSpatial.cpp
@@ -26,7 +26,7 @@
 
 namespace tt = boost::test_tools;
 
-using ArborX::PairIndexRank;
+using ArborXTest::PairIndexRank;
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(hello_world_spatial, DeviceType,
                               ARBORX_DEVICE_TYPES)