Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Fix building cuspatial with CCCL main#1382

Merged
rapids-bot[bot] merged 16 commits intorapidsai:branch-24.06from
trxcllnt:fix/cccl-2.5
May 25, 2024
Merged

Fix building cuspatial with CCCL main#1382
rapids-bot[bot] merged 16 commits intorapidsai:branch-24.06from
trxcllnt:fix/cccl-2.5

Conversation

@trxcllnt
Copy link
Copy Markdown
Contributor

@trxcllnt trxcllnt commented May 9, 2024

Similar to rapidsai/cudf#15552, we are testing building RAPIDS with CCCL's main branch to get ahead of any breaking changes.

@trxcllnt trxcllnt added DO NOT MERGE Hold off on merging; see PR for details improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels May 9, 2024
@trxcllnt trxcllnt requested a review from a team as a code owner May 9, 2024 00:40
@trxcllnt trxcllnt requested review from harrism and isVoid May 9, 2024 00:40
@github-actions github-actions bot added the libcuspatial Relates to the cuSpatial C++ library label May 9, 2024
@harrism
Copy link
Copy Markdown
Member

harrism commented May 9, 2024

I think you mean cuspatial? :)

@trxcllnt trxcllnt changed the title Fix building cugraph with CCCL main Fix building cuspatial with CCCL main May 9, 2024
@trxcllnt trxcllnt requested a review from a team as a code owner May 9, 2024 20:31
@trxcllnt trxcllnt added 3 - Ready for Review Ready for review by team and removed DO NOT MERGE Hold off on merging; see PR for details labels May 13, 2024
@trxcllnt trxcllnt requested a review from a team as a code owner May 14, 2024 21:57
@github-actions github-actions bot added the cmake Related to CMake code or build configuration label May 14, 2024
@harrism
Copy link
Copy Markdown
Member

harrism commented May 22, 2024

Looks like we have conda-notebook-tests failures on both of your current cuSpatial PRs?

@trxcllnt trxcllnt added the DO NOT MERGE Hold off on merging; see PR for details label May 24, 2024
@trxcllnt trxcllnt added 5 - Ready to Merge Testing and reviews complete, ready to merge and removed DO NOT MERGE Hold off on merging; see PR for details 3 - Ready for Review Ready for review by team labels May 24, 2024
@trxcllnt trxcllnt removed request for a team May 24, 2024 16:52
@trxcllnt
Copy link
Copy Markdown
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 559bcc7 into rapidsai:branch-24.06 May 25, 2024
rapids-bot bot pushed a commit to rapidsai/rapids-cmake that referenced this pull request Jun 7, 2024
Updates CCCL to v2.5.0 and a more recent cuCollections commit.

Using cuco at [6923b3](NVIDIA/cuCollections@6923b3b) because it was before NVIDIA/cuCollections#479, which is a breaking change for libcudf.

CCCL PR:
* NVIDIA/cccl#1667

RAPIDS PRs:
* rapidsai/cudf#15552
* rapidsai/cuml#5886
* rapidsai/cugraph#4404
* rapidsai/cuspatial#1382

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

Approvers:
  - Robert Maynard (https://github.com/robertmaynard)
  - Bradley Dice (https://github.com/bdice)

URL: #607
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

5 - Ready to Merge Testing and reviews complete, ready to merge 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

Projects

Status: Review

Development

Successfully merging this pull request may close these issues.

2 participants