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.

Sign up for GitHub

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

Jump to bottom

Header-only quadtree_point_to_nearest_linestring #1005

Merged
merged 53 commits into from
Mar 30, 2023
Merged

Header-only quadtree_point_to_nearest_linestring #1005

merged 53 commits into from
Mar 30, 2023

Conversation

harrism
Copy link
Member

@harrism harrism commented Mar 23, 2023 •
edited
Loading

Description

Closes #986. Depends on #979.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

harrism added 30 commits March 8, 2023 15:52
@harrism
Improve parameter documentation in point_quadtree
3450ecb
@harrism
copyright
1d60510
@harrism
Initial prototype of quadtree_point_in_polygon
85bc49d
@harrism
Remove TODO since this PR is finishing it.
d00773d
@harrism
Templatize
76bbc8e
@harrism
Initial header-only implementation (untested)
b59467a
@harrism
Fix stream/mr parameter order
e61f33b
@harrism
Working header-only refactor
42ca6de
@harrism
Merge branch 'branch-23.04' into fea-header-only-quadtree-pip
411cc35
@harrism
Merge branch 'branch-23.04' into fea-header-only-quadtree-pip
8785316
@harrism
Fix include path.
a37eefc
@harrism
stream, mr
f31fe78
@harrism
stream, mr
dd61ed8
@harrism
Port small test to header-only API.
4c7aede
@harrism
Port large test to header-only API
6659278
@harrism
Add point_quadtree_ref class and use to simplify APIs
3465ada
@harrism
style
8e2b426
@harrism
Replace separate x_min/y_min with vec_2d
a2e2dfb
@harrism
Use c++17 for building tests!
7bb397d
@harrism
Use multipolygon_range
987c56d
@harrism
Style
1c605d3
@harrism
Merge branch 'branch-23.04' into fea-header-only-quadtree-pip
d49366d
@harrism
Fix CUSPATIAL_EXPECTS call
61c330e
@harrism
Add missing includes.
d5455f3
@harrism
Merge branch 'branch-23.04' into fea-header-only-quadtree-pip
d1bc4a8
@harrism
style
17e6223
@harrism
Fix benchmarks build
69381ad
@harrism
Review feedback.
c819ac0
@harrism
style
c2369be
@harrism
Passing C++, failing Pytest
4531c9c
@harrism harrism marked this pull request as ready for review March 28, 2023 05:37
@harrism harrism requested review from a team as code owners March 28, 2023 05:37
@harrism harrism requested review from thomcom, trxcllnt and isVoid March 28, 2023 05:37
@harrism harrism requested a review from a team as a code owner March 28, 2023 11:49
@github-actions github-actions bot added the Python Related to Python code label Mar 28, 2023
isVoid
isVoid approved these changes Mar 29, 2023
View reviewed changes
Copy link
Contributor

@isVoid isVoid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor comments.

cpp/benchmarks/points_in_range.cu Outdated Show resolved Hide resolved
cpp/include/cuspatial/experimental/detail/algorithm/point_linestring_distance.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial/experimental/detail/quadtree_point_to_nearest_linestring.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial/experimental/detail/quadtree_point_to_nearest_linestring.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial/experimental/spatial_join.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial/experimental/detail/algorithm/point_linestring_distance.cuh
}

template <typename T, typename LinestringRef>
inline __device__ T point_linestring_distance(vec_2d<T> const& point,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we can simplify point_to_segment_distance_squared in linestring.cuh with this API?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I think it can be simplified, or factored in a way to maximize reuse.

cpp/src/join/quadtree_point_to_nearest_linestring.cu Outdated Show resolved Hide resolved
@harrism
Copy link
Member Author

harrism commented Mar 30, 2023

/merge

@rapids-bot rapids-bot bot merged commit fee47ef into rapidsai:branch-23.04 Mar 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@isVoid isVoid isVoid approved these changes

@trxcllnt trxcllnt trxcllnt approved these changes

@thomcom thomcom Awaiting requested review from thomcom thomcom is a code owner automatically assigned from rapidsai/cuspatial-cmake-codeowners

Assignees

@harrism harrism

Labels
cmake Related to CMake code or build configuration improvement Improvement / enhancement to an existing function libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change Python Related to Python code
Projects
cuSpatial
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Header-only quadtree_point_to_nearest_linestring
3 participants
@harrism @trxcllnt @isVoid