Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Header only API for polygon-polygon distance #1065

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
move files out of experimental folder
isVoid committed Apr 26, 2023
commit 6c827b37da3009002797316c6b69f6cc2d68c2fa
1 change: 1 addition & 0 deletions cpp/include/cuspatial/detail/distance_utils.cuh
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
* limitations under the License.
*/

#include <cuspatial/detail/algorithm/is_point_in_polygon.cuh>
#include <cuspatial/detail/utility/zero_data.cuh>
#include <cuspatial/geometry/vec_2d.hpp>
#include <cuspatial/iterator_factory.cuh>
1 change: 1 addition & 0 deletions cpp/include/cuspatial/detail/linestring_distance.cuh
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@

#pragma once

#include <cuspatial/detail/algorithm/linestring_distance.cuh>
#include <cuspatial/error.hpp>
#include <cuspatial/geometry/vec_2d.hpp>
#include <cuspatial/traits.hpp>
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@

#include <cuspatial/cuda_utils.hpp>
#include <cuspatial/error.hpp>
#include <cuspatial/vec_2d.hpp>
#include <cuspatial/geometry/vec_2d.hpp>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_uvector.hpp>
2 changes: 2 additions & 0 deletions cpp/include/cuspatial/detail/range/multipolygon_range.cuh
Original file line number Diff line number Diff line change
@@ -23,6 +23,8 @@
#include <cuspatial/geometry/segment.cuh>
#include <cuspatial/geometry/vec_2d.hpp>
#include <cuspatial/geometry_collection/multipolygon_ref.cuh>
#include <cuspatial/range/multilinestring_range.cuh>
#include <cuspatial/range/multipoint_range.cuh>
#include <cuspatial/traits.hpp>

#include <thrust/binary_search.h>
Original file line number Diff line number Diff line change
@@ -44,4 +44,4 @@ OutputIt pairwise_polygon_distance(MultipolygonRangeA lhs,
rmm::cuda_stream_view stream = rmm::cuda_stream_default);
} // namespace cuspatial

#include <cuspatial/experimental/detail/polygon_distance.cuh>
#include <cuspatial/detail/polygon_distance.cuh>
3 changes: 2 additions & 1 deletion cpp/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -148,6 +148,7 @@ ConfigureTest(POINT_QUADTREE_TEST_EXP
# join
ConfigureTest(JOIN_QUADTREE_AND_BOUNDING_BOXES_TEST_EXP
join/join_quadtree_and_bounding_boxes_test.cu)

ConfigureTest(JOIN_POINT_IN_POLYGON_SMALL_TEST_EXP
join/quadtree_point_in_polygon_test_small.cu)

@@ -204,7 +205,7 @@ ConfigureTest(LINESTRING_DISTANCE_TEST_EXP
spatial/distance/linestring_distance_test_medium.cu)

ConfigureTest(POLYGON_DISTANCE_TEST_EXP
spatial/polygon_distance_test.cu)
spatial/distance/polygon_distance_test.cu)

# intersection
ConfigureTest(LINESTRING_INTERSECTION_TEST_EXP
Original file line number Diff line number Diff line change
@@ -19,9 +19,9 @@
#include <cuspatial_test/vector_factories.cuh>

#include <cuspatial/detail/iterator.hpp>
#include <cuspatial/experimental/polygon_distance.cuh>
#include <cuspatial/experimental/ranges/range.cuh>
#include <cuspatial/vec_2d.hpp>
#include <cuspatial/geometry/vec_2d.hpp>
#include <cuspatial/polygon_distance.cuh>
#include <cuspatial/range/range.cuh>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/exec_policy.hpp>