Skip to content

Update raft for compatibility with the latest cuco#2118

Merged
rapids-bot[bot] merged 9 commits intorapidsai:branch-24.04from
PointKernel:fix-cuco-conflicts
Feb 16, 2024
Merged

Update raft for compatibility with the latest cuco#2118
rapids-bot[bot] merged 9 commits intorapidsai:branch-24.04from
PointKernel:fix-cuco-conflicts

Conversation

@PointKernel
Copy link
Member

@PointKernel PointKernel commented Jan 23, 2024

This PR updates raft to make it compatible with the latest cuco.

Depends on rapidsai/rapids-cmake#526

CMake changes will be reverted once rapidsai/rapids-cmake#526 is merged.

@github-actions github-actions bot added the cpp label Jan 24, 2024
@PointKernel PointKernel changed the title Fix cuco merge conflicts Update raft for compatibility with the latest cuco Jan 30, 2024
@PointKernel PointKernel marked this pull request as ready for review February 6, 2024 17:52
@PointKernel PointKernel requested a review from a team as a code owner February 6, 2024 17:52
@vyasr vyasr added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Feb 8, 2024
using smem_type = typename insert_type::slot_type*;
using find_type =
typename cuco::static_map<value_idx, value_t, cuda::thread_scope_block>::device_view;
typename cuco::legacy::static_map<value_idx, value_t, cuda::thread_scope_block>::device_view;
Copy link
Member

Choose a reason for hiding this comment

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

Legacy- should we be concerned that this feature is no longer supported? Or is there another similar API we can migrate this to.

Copy link
Member Author

Choose a reason for hiding this comment

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

is there another similar API we can migrate this to

Yes, we added a more performant new map and it's ready to use. I can put up a PR afterward for the map migration.

@PointKernel PointKernel changed the title Update raft for compatibility with the latest cuco [DO NOT MERGE] Update raft for compatibility with the latest cuco Feb 13, 2024
@PointKernel PointKernel requested a review from cjnolet February 15, 2024 16:14
rapids-bot bot pushed a commit to rapidsai/rapids-cmake that referenced this pull request Feb 15, 2024
This PR bumps to the latest cuco version which removes experimental namespace and includes multiple bug fixes.

CI must pass on these PRs before we can merge this change:
- [ ] rapidsai/cudf#14849
- [ ] rapidsai/cugraph#4111
- [ ] rapidsai/raft#2118

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

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

URL: #526
@PointKernel PointKernel changed the title [DO NOT MERGE] Update raft for compatibility with the latest cuco Update raft for compatibility with the latest cuco Feb 15, 2024
@PointKernel
Copy link
Member Author

This is ready to go once CI passes. Note the CI will be blocked until this PR gets merged.

Thanks!

@PointKernel
Copy link
Member Author

PointKernel commented Feb 15, 2024

Can someone please rerun the failed CI task? I didn't see a similar issue in previous CI checks thus maybe it's a random CI error?

@GregoryKimball
Copy link

@cjnolet If this is ready, would you please merge this? This PR is the next step for rapidsai/rapids-cmake#526

@cjnolet
Copy link
Member

cjnolet commented Feb 16, 2024

/merge

@rapids-bot rapids-bot bot merged commit 21291c8 into rapidsai:branch-24.04 Feb 16, 2024
@PointKernel PointKernel deleted the fix-cuco-conflicts branch February 16, 2024 18:28
loulankxh pushed a commit to loulankxh/raft that referenced this pull request Oct 14, 2025
This PR updates raft to make it compatible with the latest cuco.

Depends on rapidsai/rapids-cmake#526

CMake changes will be reverted once rapidsai/rapids-cmake#526 is merged.

Authors:
  - Yunsong Wang (https://github.com/PointKernel)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Corey J. Nolet (https://github.com/cjnolet)

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

Labels

cpp improvement Improvement / enhancement to an existing function non-breaking Non-breaking change

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

5 participants