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

Fix forward-merge branch-24.06 into branch-24.08 #1390

Merged
merged 5 commits into from
May 29, 2024

Conversation

trxcllnt
Copy link
Contributor

Fixes merge conflicts in #1388

msarahan and others added 4 commits May 24, 2024 00:53
…pidsai#1381)

Followup to rapidsai#1346.

* Fixes some typos/omissions in types and CMake.
* Adds a new test that OOMs when quadtree_point_in_polygon is passed too many input polygons.
* Fixes quadtree spatial join to handle overflow while counting and more conservatively allocate output buffers.

Fixes rapidsai#890.

* [Failing test run](https://github.com/rapidsai/cuspatial/actions/runs/8979838628/job/24662981350#step:7:840)
* [Passing test run](https://github.com/rapidsai/cuspatial/actions/runs/8981106226/job/24666403165#step:7:840)

Authors:
  - Paul Taylor (https://github.com/trxcllnt)

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

URL: rapidsai#1381
Similar to rapidsai/cudf#15552, we are testing [building RAPIDS with CCCL's main branch](NVIDIA/cccl#1667) to get ahead of any breaking changes.

Authors:
  - Paul Taylor (https://github.com/trxcllnt)

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

URL: rapidsai#1382
@trxcllnt trxcllnt requested review from a team as code owners May 28, 2024 23:00
@trxcllnt trxcllnt requested review from vyasr and harrism May 28, 2024 23:00
@github-actions github-actions bot added conda Related to conda and conda configuration cmake Related to CMake code or build configuration libcuspatial Relates to the cuSpatial C++ library ci labels May 28, 2024
@trxcllnt trxcllnt added 5 - Ready to Merge Testing and reviews complete, ready to merge improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels May 28, 2024
@raydouglass raydouglass merged commit 3414c78 into rapidsai:branch-24.08 May 29, 2024
69 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5 - Ready to Merge Testing and reviews complete, ready to merge ci cmake Related to CMake code or build configuration conda Related to conda and conda configuration improvement Improvement / enhancement to an existing function libcuspatial Relates to the cuSpatial C++ library non-breaking Non-breaking change
Projects
Status: Todo
Development

Successfully merging this pull request may close these issues.

4 participants