fix quoted includes to be only relative paths, move public hausdorff …

…detail headers into src
rapidsai · Dec 8, 2020 · 8cfee0f · 8cfee0f
1 parent fdb6a78
commit 8cfee0f
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 25 deletions.
diff --git a/cpp/include/cuspatial/point_in_polygon.hpp b/cpp/include/cuspatial/point_in_polygon.hpp
@@ -18,8 +18,9 @@
 
 #include <cudf/column/column.hpp>
 #include <cudf/column/column_view.hpp>
+#include <cudf/types.hpp>
+
 #include <memory>
-#include "cudf/types.hpp"
 
 namespace cuspatial {
 

diff --git a/cpp/src/indexing/construction/detail/phase_1.cuh b/cpp/src/indexing/construction/detail/phase_1.cuh
@@ -16,8 +16,9 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/z_order.cuh"
+#include "utilities.cuh"
+
+#include <utility/z_order.cuh>
 
 #include <cudf/column/column_factories.hpp>
 #include <cudf/types.hpp>

diff --git a/cpp/src/indexing/construction/detail/phase_2.cuh b/cpp/src/indexing/construction/detail/phase_2.cuh
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
+#include "utilities.cuh"
 
 #include <cudf/column/column_factories.hpp>
 #include <cudf/types.hpp>

diff --git a/cpp/src/indexing/construction/point_quadtree.cu b/cpp/src/indexing/construction/point_quadtree.cu
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "indexing/construction/detail/phase_1.cuh"
-#include "indexing/construction/detail/phase_2.cuh"
-#include "indexing/construction/detail/utilities.cuh"
+#include "detail/phase_1.cuh"
+#include "detail/phase_2.cuh"
+#include "detail/utilities.cuh"
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/point_quadtree.hpp>

diff --git a/cpp/src/join/detail/intersection.cuh b/cpp/src/join/detail/intersection.cuh
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/z_order.cuh"
+#include <indexing/construction/detail/utilities.cuh>
+#include <utility/z_order.cuh>
 
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/table/table_view.hpp>

diff --git a/cpp/src/join/detail/traversal.cuh b/cpp/src/join/detail/traversal.cuh
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/z_order.cuh"
+#include <indexing/construction/detail/utilities.cuh>
+#include <utility/z_order.cuh>
 
 #include <rmm/thrust_rmm_allocator.h>
 #include <rmm/cuda_stream_view.hpp>

diff --git a/cpp/src/join/quadtree_point_in_polygon.cu b/cpp/src/join/quadtree_point_in_polygon.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "indexing/construction/detail/utilities.cuh"
-#include "utility/point_in_polygon.cuh"
+#include <indexing/construction/detail/utilities.cuh>
+#include <utility/point_in_polygon.cuh>
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/spatial_join.hpp>

diff --git a/cpp/src/join/quadtree_point_to_nearest_polyline.cu b/cpp/src/join/quadtree_point_to_nearest_polyline.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "indexing/construction/detail/utilities.cuh"
+#include <indexing/construction/detail/utilities.cuh>
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/spatial_join.hpp>

diff --git a/cpp/src/join/quadtree_poly_filtering.cu b/cpp/src/join/quadtree_poly_filtering.cu
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "join/detail/intersection.cuh"
-#include "join/detail/traversal.cuh"
+#include "detail/intersection.cuh"
+#include "detail/traversal.cuh"
 
 #include <cuspatial/error.hpp>
 #include <cuspatial/spatial_join.hpp>

diff --git a/...artesian_product_group_index_iterator.cuh → ...artesian_product_group_index_iterator.cuh b/...artesian_product_group_index_iterator.cuh → ...artesian_product_group_index_iterator.cuh
@@ -16,12 +16,13 @@
 
 #pragma once
 
+#include <utility/size_from_offsets.cuh>
+
 #include <thrust/binary_search.h>
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/iterator/transform_iterator.h>
 #include <thrust/pair.h>
 #include <utility>
-#include "utility/size_from_offsets.cuh"
 
 namespace cuspatial {
 namespace detail {

diff --git a/cpp/include/cuspatial/detail/hausdorff.cuh → cpp/src/spatial/detail/hausdorff.cuh b/cpp/include/cuspatial/detail/hausdorff.cuh → cpp/src/spatial/detail/hausdorff.cuh
diff --git a/cpp/src/spatial/hausdorff.cu b/cpp/src/spatial/hausdorff.cu
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include "utility/scatter_output_iterator.cuh"
-#include "utility/size_from_offsets.cuh"
+#include "detail/cartesian_product_group_index_iterator.cuh"
+#include "detail/hausdorff.cuh"
+
+#include <utility/scatter_output_iterator.cuh>
+#include <utility/size_from_offsets.cuh>
 
-#include <cuspatial/detail/cartesian_product_group_index_iterator.cuh>
-#include <cuspatial/detail/hausdorff.cuh>
 #include <cuspatial/error.hpp>
 
 #include <cudf/column/column_device_view.cuh>

diff --git a/cpp/tests/spatial/cartesian_product_group_index_iterator_test.cpp b/cpp/tests/spatial/cartesian_product_group_index_iterator_test.cpp
@@ -16,9 +16,10 @@
 
 #include <vector>
 
-#include <cuspatial/detail/cartesian_product_group_index_iterator.cuh>
 #include <cuspatial/error.hpp>
 
+#include <spatial/detail/cartesian_product_group_index_iterator.cuh>
+
 #include <thrust/binary_search.h>
 #include <thrust/iterator/constant_iterator.h>
 #include <thrust/iterator/counting_iterator.h>

diff --git a/cpp/tests/trajectory/test_derive_trajectories.cu b/cpp/tests/trajectory/test_derive_trajectories.cu
@@ -17,7 +17,7 @@
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/table_utilities.hpp>
 
-#include "tests/trajectory/trajectory_utilities.cuh"
+#include "trajectory_utilities.cuh"
 
 struct DeriveTrajectoriesTest : public cudf::test::BaseFixture {
 };

diff --git a/cpp/tests/trajectory/test_trajectory_bounding_boxes.cu b/cpp/tests/trajectory/test_trajectory_bounding_boxes.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "tests/trajectory/trajectory_utilities.cuh"
+#include "trajectory_utilities.cuh"
 
 #include <cudf/utilities/traits.hpp>
 

diff --git a/cpp/tests/trajectory/test_trajectory_distances_and_speeds.cu b/cpp/tests/trajectory/test_trajectory_distances_and_speeds.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "tests/trajectory/trajectory_utilities.cuh"
+#include "trajectory_utilities.cuh"
 
 #include <cudf_test/column_utilities.hpp>
 #include <cudf_test/type_lists.hpp>