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

Add geometry_generator factory for programmatic generation of geometry arrays #998

Merged
merged 49 commits into from
Mar 22, 2023
Merged

Add geometry_generator factory for programmatic generation of geometry arrays #998

merged 49 commits into from
Mar 22, 2023

Conversation

isVoid
Copy link
Contributor

@isVoid isVoid commented Mar 17, 2023 •
edited
Loading

Description

To allow easy benchmarking for future APIs, I created geometry_generator that programmatically generate a geoarrow compliant geometry arrays. The first feature landing is generate_multipolygon_array.

This PR also adds BaseFixtureWithParam, which allows user to parameterize the tests with value and ranges.

Contributes to #259

Checklist

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

@isVoid
initial
965b80a
@isVoid
Merge branch 'branch-23.04' of https://github.com/rapidsai/cuspatial …
38af8e6 
…into feature/polygon_distances
@isVoid
add pragma once for floating_point.cuh
02f61fe
@isVoid
add polygon_ref structure
7bd797f
@isVoid
add multipolygon_ref class
0968c15
@isVoid
update multipolygon_range class
a659eab
@isVoid
update multipoint_range class
c274070
@isVoid
update is_point_in_polygon usage with polygon_ref
12ffa53
@isVoid
update multilinestring_range
7490333
@isVoid
add point to polygon kernel
f665287
@isVoid
add segment deduction guide
291f6e6
@isVoid
add owning object type to vector factories
efa6883
@isVoid
add tests
23146ef
@isVoid
add helper files
ead160a
@isVoid
add more tests
09bd35f
@isVoid
bug fixes
92760d1
@isVoid
cleanups
8acb5dc
@isVoid
fix tests
a2b94fe
@isVoid
optimize single point range input
46a67fe
@isVoid
docs, type checks in range ctor
b725b52
@isVoid
Merge branch 'branch-23.04' into feature/polygon_distances
cb5706a
@isVoid
use range based for loop in is_point_in_polygon
ab59e7d
@isVoid
Apply suggestions from code review
b136c0b
@isVoid
add docs
744f32f
@isVoid
style
bb6c637
@isVoid
Merge branch 'branch-23.04' of https://github.com/rapidsai/cuspatial …
756650b 
…into feature/polygon_distances
@isVoid
fix bug in PiP tests
8319e7c
@isVoid
updates with test docs and API docs, address review
86d36d9
@isVoid
update offsets_to_keys
7bf8cbf
@isVoid
update floating_point docs
ff48dc7
@github-actions github-actions bot added cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library labels Mar 17, 2023
@isVoid isVoid self-assigned this Mar 17, 2023
@isVoid isVoid marked this pull request as ready for review March 20, 2023 05:28
@isVoid isVoid requested review from a team as code owners March 20, 2023 05:28
@isVoid isVoid requested review from harrism and trxcllnt March 20, 2023 05:28
@isVoid isVoid changed the title [skip-ci] Add geometry_generator factory for programmatic generation of geometry arrays Add geometry_generator factory for programmatic generation of geometry arrays Mar 20, 2023
@isVoid isVoid requested a review from thomcom March 20, 2023 05:28
@isVoid isVoid added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change feature request New feature or request and removed improvement Improvement / enhancement to an existing function labels Mar 20, 2023
@isVoid isVoid mentioned this pull request Mar 20, 2023
Draft
3 tasks
harrism
harrism approved these changes Mar 20, 2023
View reviewed changes
Copy link
Member

@harrism harrism left a comment

Choose a reason for hiding this comment

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

Minor comments. Thanks for this utility!

cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial_test/base_fixture.hpp Outdated Show resolved Hide resolved
cpp/include/cuspatial_test/geometry_generator.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial_test/geometry_generator.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial_test/geometry_generator.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial_test/geometry_generator.cuh Outdated Show resolved Hide resolved
cpp/include/cuspatial_test/geometry_generator.cuh Outdated Show resolved Hide resolved
cpp/tests/utility_test/test_float_equivalent.cu Outdated Show resolved Hide resolved
@isVoid
Copy link
Contributor Author

isVoid commented Mar 22, 2023

/merge

@rapids-bot rapids-bot bot merged commit 515e0c4 into rapidsai:branch-23.04 Mar 22, 2023
@isVoid isVoid mentioned this pull request May 9, 2023
Merged
3 tasks
rapids-bot bot pushed a commit that referenced this pull request May 23, 2023
@isVoid
Adds pairwise_point_polygon_distance benchmark (#1131)
7f42eeb 
This PR separates the `pairwise_point_polygon_distance` benchmark portion of PR #1002. While that PR is only left for nvtx3 experiments.

# Original PR description:

This PR adds pairwise point polygon distance benchmark. Depends on #998

Point-polygon distance performance can be affected by many factors, because the geometry is complex in nature. I benchmarked these questions:
1. How does the algorithm scales with simple multipolygons?
2. How does it scales with complex multipolygons?

## How does the algorithm scales with simple multipolygons?
The benchmark uses the most simple multipolygon, 3 sides per polygon, 0 hole and 1 polygon per multipolygon.

Float32
| Num   multipolygon | Throughput   (#multipolygons / s) |
| --- | --- |
| 1 | 28060.32971 |
| 100 | 2552687.469 |
| 10000 | 186044781 |
| 1000000 | 1047783101 |
| 100000000 | 929537385.2 | 

Float64
| Num   multipolygon | Throughput   (#multipolygons / s) |
| --- | --- |
| 1 | 28296.94817 |
| 100 | 2491541.218 |
| 10000 | 179379919.5 |
| 1000000 | 854678939.9 |
| 100000000 | 783364410.7 |

![image](https://user-images.githubusercontent.com/13521008/226502300-c3273d80-5f9f-4d53-b961-a24e64216e9b.png)

The chart shows that with simple polygons and simple multipoint (1 point per multipoint), the algorithm scales pretty nicely. Throughput is maxed out at near 1M pairs.

## How does the algorithm scales with complex multipolygons?

The benchmark uses a complex multipolygon, 100 edges per ring, 10 holes per polygon and 3 polygons per multipolygon.

float32
Num   multipolygon | Throughput   (#multipolygons / s)
-- | --
1000 | 158713.2377
10000 | 345694.2642
100000 | 382849.058

float64
Num   multipolygon | Throughput   (#multipolygons / s)
-- | --
1000 | 148727.1246
10000 | 353141.9758
100000 | 386007.3016

![image](https://user-images.githubusercontent.com/13521008/226502732-0d116db7-6257-4dec-b170-c42b30df9cea.png)

The algorithm reaches max throughput at near 10K pairs. About 100X lower than the simple multipolygon example.

Authors:
  - Michael Wang (https://github.com/isVoid)
  - Mark Harris (https://github.com/harrism)

Approvers:
  - Mark Harris (https://github.com/harrism)

URL: #1131
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harrism harrism harrism approved these changes

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

@thomcom thomcom Awaiting requested review from thomcom

Assignees

@isVoid isVoid

Labels
cmake Related to CMake code or build configuration feature request New feature or request libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change
Projects
cuSpatial
Status: Todo
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@isVoid @harrism