Pairwise Multipoint Equals Count function #1022

thomcom · 2023-03-30T20:27:03Z

Description

This contribution adds pairwise_multipoint_equals_count to the column and header-only APIs. pairwise_multipoint_equals_count counts the number of times that each point in the lhs occurs in the rhs.

auto result = pairwise_multipoint_equals_count(
    {{{0, 0}},{{1, 1, 2, 2}},{{0, 0}, {1, 1}, {2, 2}}},
    {
        {{0, 0}, {1, 1}, {2, 2}}
        {{0, 0}, {1, 1}, {2, 2}}
        {{0, 0}, {1, 1}, {2, 2}}
    }
)
result = {1, 2, 3}

Written while pairing with @isVoid.

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 · 2023-03-31T00:04:45Z

Note skip-ci does nothing in PR titles.

cpp/tests/spatial/allpairs_multipoint_equals_count_test.cu

…com/cuspatial into feature/allpairs_point_equals_count

Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

…com/cuspatial into feature/allpairs_point_equals_count

Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

…count.cuh Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

…com/cuspatial into feature/allpairs_point_equals_count

harrism · 2023-04-26T00:17:25Z

cpp/include/cuspatial/experimental/pairwise_multipoint_equals_count.cuh

+namespace cuspatial {
+
+/**
+ * @brief Compute the number of multipoint pairs that are equal.


This is not addressed yet. The original @brief is not accurate.

harrism · 2023-04-26T00:17:40Z

cpp/include/cuspatial/experimental/pairwise_multipoint_equals_count.cuh

+ * @tparam MultiPointRangeA Iterator over multipoints. Must meet the requirements of
+ * [LegacyRandomAccessIterator][LinkLRAI] and be device-accessible.
+ * @tparam MultiPointRangeB Iterator over multipoints. Must meet the requirements of
+ * [LegacyRandomAccessIterator][LinkLRAI] and be device-accessible.


This needs to be addressed.

harrism · 2023-04-26T23:50:22Z

cpp/tests/spatial/distance/pairwise_multipoint_equals_count_test.cu

@@ -0,0 +1,157 @@
+/*


This file seems to be a duplicate of the one in the equality directory. Perhaps copied here accidentally?

harrism · 2023-04-26T23:52:40Z

cpp/src/spatial/pairwise_multipoint_equals_count.cu

+#include <cuspatial/experimental/pairwise_multipoint_equals_count.cuh>
+#include <cuspatial/experimental/ranges/multipoint_range.cuh>


This seems to be the culprit.

thomcom · 2023-04-27T15:07:14Z

/merge

thomcom added 2 commits March 30, 2023 12:55

Work on the most obvious parts of allpairs_points_equals_count

96b28a3

Build system.

b8785f7

github-actions bot added cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library labels Mar 30, 2023

thomcom and others added 2 commits March 30, 2023 16:26

Try a hand at copying point_polygon_distance_test.cu

c6e3910

recording progress with Thomson

45c128c

isVoid and others added 10 commits March 31, 2023 08:05

fix 0 sized input error

0f0a0d4

Pass all tests.

d1fb60c

Switch to atomicAdd

da247f8

Write one more test.

2b7d7fa

using sort-then-search algorithm

dd01d6c

Resolve merge

b4ac329

passes compilation!

3dc6195

Merge

9931ed1

Cleaning up for PR.

dbd1bbf

Update docs, fix a typo.

bd03668

thomcom marked this pull request as ready for review March 31, 2023 18:37

thomcom requested review from a team as code owners March 31, 2023 18:37

thomcom requested review from harrism and trxcllnt March 31, 2023 18:37

thomcom changed the title ~~[skip-ci] Allpairs Multipoint Equals Count function~~ Allpairs Multipoint Equals Count function Mar 31, 2023

thomcom requested review from isVoid and removed request for trxcllnt March 31, 2023 18:37

thomcom self-assigned this Mar 31, 2023

thomcom added 3 - Ready for Review Ready for review by team improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Mar 31, 2023

isVoid reviewed Mar 31, 2023

View reviewed changes

cpp/tests/spatial/allpairs_multipoint_equals_count_test.cu Outdated Show resolved Hide resolved

thomcom and others added 15 commits April 19, 2023 14:33

Doc tweak

32050f9

Merge branch 'feature/allpairs_point_equals_count' of github.com:thom…

2420dfe

…com/cuspatial into feature/allpairs_point_equals_count

Update cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp

ac9b755

Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

Update cpp/include/cuspatial/pairwise_multipoint_equals_count.hpp

d904762

Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

Update python/cuspatial/cuspatial/core/binops/equals_count.py

102915b

Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

Merge branch 'feature/allpairs_point_equals_count' of github.com:thom…

72d6e97

…com/cuspatial into feature/allpairs_point_equals_count

Merge branch 'branch-23.06' into feature/allpairs_point_equals_count

a806371

Update python/cuspatial/cuspatial/core/binops/equals_count.py

fbcd2bd

Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

Update cpp/include/cuspatial/experimental/pairwise_multipoint_equals_…

f7c2c98

…count.cuh Co-authored-by: Mark Harris <783069+harrism@users.noreply.github.com>

Address comment about multipoint_range docs.

89a54c5

Merge branch 'feature/allpairs_point_equals_count' of github.com:thom…

37cba19

…com/cuspatial into feature/allpairs_point_equals_count

Tweaking because of format issue.

e63c594

Tweaking problem with docs.

66498cf

Repair docs?

ce1df18

CR at beginning of file typo

07401fe

thomcom mentioned this pull request Apr 19, 2023

Add containspredicate. #1086

Merged

3 tasks

harrism requested changes Apr 26, 2023

View reviewed changes

thomcom added 2 commits April 26, 2023 18:25

Handle Mark's last review comments.

03bfc44

Resolve merge conflict

da0baa5

harrism approved these changes Apr 26, 2023

View reviewed changes

thomcom added 2 commits April 26, 2023 16:52

Merge branch 'branch-23.06' into feature/allpairs_point_equals_count

3684b26

Accidentally didn't migrate one of the test files during merge.

2b0c489

harrism reviewed Apr 26, 2023

View reviewed changes

thomcom added 4 commits April 27, 2023 07:27

Reflect new header paths in pairwise_multipoint_equals_count.

cff14bd

Get pairwise_multipoint building.

f66e2c4

Get rid of test file in wrong place, fix vec_2d lookup.

19d5fce

Merge branch 'branch-23.06' into feature/allpairs_point_equals_count

90fccc2

rapids-bot bot merged commit e992329 into rapidsai:branch-23.06 Apr 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pairwise Multipoint Equals Count function #1022

Pairwise Multipoint Equals Count function #1022

thomcom commented Mar 30, 2023 •

edited

Loading

harrism commented Mar 31, 2023

harrism Apr 26, 2023

harrism Apr 26, 2023

harrism Apr 26, 2023

harrism Apr 26, 2023

thomcom commented Apr 27, 2023

		#include <cuspatial/experimental/pairwise_multipoint_equals_count.cuh>
		#include <cuspatial/experimental/ranges/multipoint_range.cuh>

Pairwise Multipoint Equals Count function #1022

Pairwise Multipoint Equals Count function #1022

Conversation

thomcom commented Mar 30, 2023 • edited Loading

Description

Checklist

harrism commented Mar 31, 2023

harrism Apr 26, 2023

Choose a reason for hiding this comment

harrism Apr 26, 2023

Choose a reason for hiding this comment

harrism Apr 26, 2023

Choose a reason for hiding this comment

harrism Apr 26, 2023

Choose a reason for hiding this comment

thomcom commented Apr 27, 2023

thomcom commented Mar 30, 2023 •

edited

Loading