Skip to content

Update CCCL to v2.5.0#607

Merged
rapids-bot[bot] merged 17 commits intorapidsai:branch-24.08from
trxcllnt:fea/cccl-2.5
Jun 7, 2024
Merged

Update CCCL to v2.5.0#607
rapids-bot[bot] merged 17 commits intorapidsai:branch-24.08from
trxcllnt:fea/cccl-2.5

Conversation

@trxcllnt
Copy link
Copy Markdown
Contributor

@trxcllnt trxcllnt commented May 14, 2024

Description

Updates CCCL to v2.5.0 and a more recent cuCollections commit.

Using cuco at 6923b3 because it was before NVIDIA/cuCollections#479, which is a breaking change for libcudf.

CCCL PR:

RAPIDS PRs:

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.
  • The cmake-format.json is up to date with these changes.
  • I have added new files under rapids-cmake/
    • I have added include guards (include_guard(GLOBAL))
    • I have added the associated docs/ rst file and update the api.rst

@trxcllnt trxcllnt added the DO NOT MERGE Hold off on merging; see PR for details label May 14, 2024
@vyasr vyasr changed the base branch from branch-24.06 to branch-24.08 June 3, 2024 22:03
@vyasr vyasr added breaking Introduces a breaking change feature request New feature or request and removed DO NOT MERGE Hold off on merging; see PR for details labels Jun 3, 2024
@trxcllnt
Copy link
Copy Markdown
Contributor Author

trxcllnt commented Jun 6, 2024

I think the tests for GENERATE_PINNED_VERSIONS is not expecting the git_tag to be a commit hash.

@trxcllnt trxcllnt requested a review from a team as a code owner June 6, 2024 22:48
Copy link
Copy Markdown
Contributor

@bdice bdice left a comment

Choose a reason for hiding this comment

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

The latest changes look fine to me. I'd like to hear from @robertmaynard in case the testing changes with generating pinned versions are indicative of a problem.

@trxcllnt
Copy link
Copy Markdown
Contributor Author

trxcllnt commented Jun 7, 2024

/merge

@rapids-bot rapids-bot bot merged commit e42a5c9 into rapidsai:branch-24.08 Jun 7, 2024
rapids-bot bot pushed a commit to rapidsai/cudf that referenced this pull request Jun 14, 2024
Now that rapidsai/rapids-cmake#607 has been merged we can drop support for patching CCCL 2.2

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Paul Taylor (https://github.com/trxcllnt)

URL: #15969
rapids-bot bot pushed a commit that referenced this pull request Jun 24, 2024
This PR updates the CCCL version to include a fix for `cuda::std::span` which is required for cuCollections to work properly with CCCL 2.5.0. 

Most of the changes between the last CCCL version bump (#607) and this one were related to doc updates and unit test fixes, so I don't expect much functional impact for RAPIDS.

After this PR we likely have to bump the cuco version again to include the new changes.

### CCCL PR:

- NVIDIA/cccl#1836

### CUCO PR:

- NVIDIA/cuCollections#502

### RAPIDS PRs:

- [x] rapidsai/cudf#15986
  - [error during docs-build](https://github.com/rapidsai/cudf/actions/runs/9406273871/job/25911619452?pr=15946#step:9:2243) but seems unrelated
- [x] rapidsai/cugraph#4483
  - some CI jobs ran into a network timeout -> rerunning
- [x] rapidsai/cuml#5924
  - successful apart from some optional conda python tests
- [x] rapidsai/raft#2358
  - This one is weird as it [shows an error](https://github.com/rapidsai/raft/actions/runs/9475150045/job/26109283214?pr=2358#step:7:824) that is similar to the one we found in cuco when bumping the CCCL version to 2.5.0. However, we thought the problem was on cuco's end and pushed a fix that resolved the issue (see [Slack thread](https://nvidia.slack.com/archives/CCP05T27R/p1718060955876199))
- [x] rapidsai/rmm#1584

Authors:
  - Daniel Jünger (https://github.com/sleeepyjack)

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

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

Labels

breaking Introduces a breaking change feature request New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants