Include KokkosExt through kokkos_ext/header

CMakeLists.txt

@@ -74,7 +74,6 @@ cmake_dependent_option(ARBORX_ENABLE_GPU_AWARE_MPI
 target_include_directories(ArborX INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/geometry>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/kokkos_ext>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/cluster>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/distributed>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/interpolation>

benchmarks/dbscan/ArborX_DBSCANVerification.hpp

@@ -12,8 +12,8 @@
 #ifndef ARBORX_DETAILSDBSCANVERIFICATION_HPP
 #define ARBORX_DETAILSDBSCANVERIFICATION_HPP
 
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 

benchmarks/dbscan/dbscan_timpl.hpp

@@ -12,9 +12,9 @@
 #include <ArborX_DBSCAN.hpp>
 #include <ArborX_DBSCANVerification.hpp>
 #include <ArborX_HDBSCAN.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_MinimumSpanningTree.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 

benchmarks/union_find/union_find.cpp

@@ -9,12 +9,12 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtVersion.hpp>
 #include <ArborX_SortUtils.hpp>
 #include <ArborX_Utils.hpp>
 #include <ArborX_Version.hpp>
 #include <details/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtVersion.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Random.hpp>

examples/viz/tree_visualization.cpp

@@ -9,9 +9,9 @@
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <details/ArborX_TreeVisualization.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 

src/ArborX_Version.hpp.in

@@ -14,7 +14,7 @@
 
 #include <ArborX_Config.hpp>
 
-#include <ArborX_KokkosExtVersion.hpp>
+#include <kokkos_ext/ArborX_KokkosExtVersion.hpp>
 
 #include <string>
 

src/cluster/ArborX_DBSCAN.hpp

@@ -13,8 +13,6 @@
 #define ARBORX_DBSCAN_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <ArborX_SortUtils.hpp>
 #include <ArborX_Sphere.hpp>
@@ -25,6 +23,8 @@
 #include <details/ArborX_FDBSCANDenseBox.hpp>
 #include <details/ArborX_HalfTraversal.hpp>
 #include <details/ArborX_PredicateHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 namespace ArborX
 {

src/cluster/ArborX_Dendrogram.hpp

@@ -11,10 +11,10 @@
 #ifndef ARBORX_DENDROGRAM_HPP
 #define ARBORX_DENDROGRAM_HPP
 
-#include <ArborX_KokkosExtSort.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_Dendrogram.hpp>
 #include <details/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 

src/cluster/ArborX_MinimumSpanningTree.hpp

@@ -12,15 +12,15 @@
 #ifndef ARBORX_MINIMUM_SPANNING_TREE_HPP
 #define ARBORX_MINIMUM_SPANNING_TREE_HPP
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_MinimumSpanningTree.hpp>
 #include <details/ArborX_MutualReachabilityDistance.hpp>
 #include <details/ArborX_PredicateHelpers.hpp>
 #include <details/ArborX_TreeNodeLabeling.hpp>
 #include <details/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/cluster/details/ArborX_Dendrogram.hpp

@@ -12,8 +12,8 @@
 #ifndef ARBORX_DETAILS_DENDROGRAM_HPP
 #define ARBORX_DETAILS_DENDROGRAM_HPP
 
-#include <ArborX_KokkosExtStdAlgorithms.hpp> // iota
 #include <details/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
 
 #include <Kokkos_Core.hpp>
 

src/cluster/details/ArborX_FDBSCANDenseBox.hpp

@@ -12,12 +12,12 @@
 #ifndef ARBORX_DETAILSFDBSCANDENSEBOX_HPP
 #define ARBORX_DETAILSFDBSCANDENSEBOX_HPP
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_Callbacks.hpp>
 #include <details/ArborX_CartesianGrid.hpp>
 #include <details/ArborX_Predicates.hpp>
 #include <details/ArborX_UnionFind.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 

src/cluster/details/ArborX_MinimumSpanningTree.hpp

@@ -12,11 +12,11 @@
 #ifndef ARBORX_DETAILS_MINIMUM_SPANNING_TREE_HPP
 #define ARBORX_DETAILS_MINIMUM_SPANNING_TREE_HPP
 
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Utils.hpp>
 #include <details/ArborX_Algorithms.hpp>
 #include <details/ArborX_HappyTreeFriends.hpp>
 #include <details/ArborX_WeightedEdge.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/distributed/ArborX_DistributedTree.hpp

@@ -13,12 +13,12 @@
 #define ARBORX_DISTRIBUTED_TREE_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
 #include <ArborX_LinearBVH.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_DistributedTreeNearest.hpp>
 #include <details/ArborX_DistributedTreeSpatial.hpp>
 #include <details/ArborX_PairValueIndex.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 
 #include <Kokkos_Core.hpp>
 

src/distributed/details/ArborX_DistributedTreeNearest.hpp

@@ -11,13 +11,13 @@
 #ifndef ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HPP
 #define ARBORX_DETAILS_DISTRIBUTED_TREE_NEAREST_HPP
 
-#include <ArborX_KokkosExtKernelStdAlgorithms.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_DistributedTreeImpl.hpp>
 #include <details/ArborX_DistributedTreeNearestHelpers.hpp>
 #include <details/ArborX_DistributedTreeUtils.hpp>
 #include <details/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtKernelStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/distributed/details/ArborX_DistributedTreeUtils.hpp

@@ -14,11 +14,11 @@
 #include <ArborX_Config.hpp>
 
 #include <ArborX_Containers.hpp>
-#include <ArborX_KokkosExtSort.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_PriorityQueue.hpp>
 #include <details/ArborX_Distributor.hpp>
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/distributed/details/ArborX_Distributor.hpp

@@ -14,9 +14,9 @@
 #include <ArborX_Config.hpp>
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtMinMaxReduce.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_SortUtils.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/geometry/ArborX_Box.hpp

@@ -13,8 +13,8 @@
 #define ARBORX_BOX_HPP
 
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Macros.hpp>
 #include <Kokkos_ReductionIdentity.hpp>

src/geometry/ArborX_KDOP.hpp

@@ -14,10 +14,10 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Vector.hpp>
 #include <details/ArborX_Algorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Array.hpp>
 #include <Kokkos_Macros.hpp>

src/geometry/ArborX_Ray.hpp

@@ -12,12 +12,12 @@
 #define ARBORX_RAY_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <ArborX_Sphere.hpp>
 #include <ArborX_Triangle.hpp>
 #include <ArborX_Vector.hpp>
 #include <details/ArborX_Algorithms.hpp> // equal
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Assert.hpp> // KOKKOS_ASSERT
 #include <Kokkos_Macros.hpp>

src/geometry/details/ArborX_Algorithms.hpp

@@ -13,8 +13,8 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtArithmeticTraits.hpp>
 #include <ArborX_Vector.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_MathematicalFunctions.hpp> // isfinite

src/interpolation/details/ArborX_InterpDetailsMovingLeastSquaresCoefficients.hpp

@@ -13,12 +13,12 @@
 #define ARBORX_INTERP_DETAILS_MOVING_LEAST_SQUARES_COEFFICIENTS_HPP
 
 #include <ArborX_GeometryTraits.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <ArborX_Point.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
 #include <details/ArborX_InterpDetailsPolynomialBasis.hpp>
 #include <details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/interpolation/details/ArborX_InterpDetailsSymmetricPseudoInverseSVD.hpp

@@ -13,7 +13,7 @@
 #define ARBORX_INTERP_DETAILS_SYMMETRIC_PSEUDO_INVERSE_SVD_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp

@@ -13,7 +13,7 @@
 #define ARBORX_DETAILS_KOKKOS_EXT_MIN_MAX_REDUCTIONS_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 

src/kokkos_ext/ArborX_KokkosExtSort.hpp

@@ -14,7 +14,7 @@
 
 #include <ArborX_Config.hpp> // ARBORX_ENABLE_ROCTHRUST
 
-#include <ArborX_KokkosExtMinMaxReduce.hpp>
+#include <kokkos_ext/ArborX_KokkosExtMinMaxReduce.hpp>
 
 #include <Kokkos_Profiling_ScopedRegion.hpp>
 #include <Kokkos_Sort.hpp>

src/kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp

@@ -12,7 +12,7 @@
 #ifndef ARBORX_DETAILS_KOKKOS_EXT_STD_ALGORITHMS_HPP
 #define ARBORX_DETAILS_KOKKOS_EXT_STD_ALGORITHMS_HPP
 
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_StdAlgorithms.hpp>

src/misc/ArborX_SortUtils.hpp

@@ -13,9 +13,9 @@
 #define ARBORX_DETAILS_SORT_UTILS_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtSort.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp> // iota
-#include <ArborX_KokkosExtViewHelpers.hpp>   // clone
+#include <kokkos_ext/ArborX_KokkosExtSort.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp> // iota
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>   // clone
 
 #include <Kokkos_Core.hpp>
 

src/misc/ArborX_Utils.hpp

@@ -13,8 +13,8 @@
 #define ARBORX_DETAILS_UTILS_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 

src/spatial/ArborX_BruteForce.hpp

@@ -14,7 +14,6 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <details/ArborX_AccessTraits.hpp>
 #include <details/ArborX_AttachIndices.hpp>
 #include <details/ArborX_BruteForceImpl.hpp>
@@ -23,6 +22,7 @@
 #include <details/ArborX_IndexableGetter.hpp>
 #include <details/ArborX_PairValueIndex.hpp>
 #include <details/ArborX_PredicateHelpers.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/spatial/ArborX_LinearBVH.hpp

@@ -14,7 +14,6 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_CrsGraphWrapper.hpp>
-#include <ArborX_KokkosExtAccessibilityTraits.hpp>
 #include <ArborX_SortUtils.hpp>
 #include <ArborX_SpaceFillingCurves.hpp>
 #include <details/ArborX_AccessTraits.hpp>
@@ -30,6 +29,7 @@
 #include <details/ArborX_TraversalPolicy.hpp>
 #include <details/ArborX_TreeConstruction.hpp>
 #include <details/ArborX_TreeTraversal.hpp>
+#include <kokkos_ext/ArborX_KokkosExtAccessibilityTraits.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/spatial/details/ArborX_BruteForceImpl.hpp

@@ -13,12 +13,12 @@
 #define ARBORX_DETAILS_BRUTE_FORCE_IMPL_HPP
 
 #include <ArborX_Exception.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <ArborX_PriorityQueue.hpp>
 #include <details/ArborX_Algorithms.hpp> // expand
 #include <details/ArborX_NearestBufferProvider.hpp>
 #include <details/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Kokkos_Profiling_ScopedRegion.hpp>

src/spatial/details/ArborX_CrsGraphWrapperImpl.hpp

@@ -13,13 +13,13 @@
 #define ARBORX_DETAIL_CRS_GRAPH_WRAPPER_IMPL_HPP
 
 #include <ArborX_Box.hpp>
-#include <ArborX_KokkosExtStdAlgorithms.hpp>
-#include <ArborX_KokkosExtViewHelpers.hpp>
 #include <details/ArborX_BatchedQueries.hpp>
 #include <details/ArborX_Callbacks.hpp>
 #include <details/ArborX_PermutedData.hpp>
 #include <details/ArborX_Predicates.hpp>
 #include <details/ArborX_TraversalPolicy.hpp>
+#include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
+#include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 
 namespace ArborX
 {