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

Update for CCCL 2.x #3862

Merged
merged 10 commits into from
Dec 8, 2023
Merged

Update for CCCL 2.x #3862

merged 10 commits into from
Dec 8, 2023

Conversation

seunghwak
Copy link
Contributor

@seunghwak seunghwak commented Sep 19, 2023

This PR adds cuda::proclaim_return_type to device lambdas used in thrust::transform and thrust::make_transform_iterator.

This PR requires libcudacxx 2.1.0, which was provided by rapidsai/rapids-cmake#464.

Closes #3863.

@seunghwak seunghwak added the DO NOT MERGE Hold off on merging; see PR for details label Sep 19, 2023
@seunghwak seunghwak added this to the 23.12 milestone Sep 19, 2023
@seunghwak seunghwak self-assigned this Sep 19, 2023
@seunghwak seunghwak requested a review from a team as a code owner September 19, 2023 02:35
@seunghwak seunghwak added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Sep 19, 2023
@ChuckHastings ChuckHastings modified the milestones: 23.12, 24.02 Nov 7, 2023
@seunghwak seunghwak requested review from a team as code owners December 7, 2023 02:35
Copy link

copy-pr-bot bot commented Dec 7, 2023

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@bdice bdice changed the base branch from branch-23.10 to branch-24.02 December 7, 2023 02:36
@bdice bdice removed the DO NOT MERGE Hold off on merging; see PR for details label Dec 7, 2023
@bdice bdice changed the title Update for CCCL 2.x (milestone: 23.12) Update for CCCL 2.x Dec 7, 2023
@bdice
Copy link
Contributor

bdice commented Dec 7, 2023

@seunghwak I just merged in branch-24.02 to this PR. Now that we migrated to libcudacxx 2.1.0, we have cuda::proclaim_return_type available. We can go ahead and review/merge this PR, which will make cugraph ready to migrate to CCCL 2.2.0 (including Thrust 2.2.0 which requires the use of cuda::proclaim_return_type).

(Huge thanks for your help with this!)

Copy link
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.

These changes look good to me. We'll need to merge this in order to make cuGraph compatible with CCCL 2.2.0, which we will migrate to in 24.02 as soon as all of RAPIDS is ready.

@bdice bdice removed request for a team December 7, 2023 03:40
@bdice bdice removed the request for review from a team December 7, 2023 03:40
@bdice
Copy link
Contributor

bdice commented Dec 7, 2023

/ok to test

@bdice bdice mentioned this pull request Dec 7, 2023
@bdice
Copy link
Contributor

bdice commented Dec 7, 2023

Thanks for the review @ChuckHastings, and thanks for your original efforts here @seunghwak. I may need to push one or two more changes before merging. I am building this locally with CCCL 2.2.0 and I will update this PR with any final (minor) changes, then merge. 👍

@bdice
Copy link
Contributor

bdice commented Dec 8, 2023

I got the build to succeed with a couple more minor changes in d0507a7. I'm going to merge this once CI passes.

@bdice
Copy link
Contributor

bdice commented Dec 8, 2023

/ok to test

@bdice
Copy link
Contributor

bdice commented Dec 8, 2023

/ok to test

@bdice
Copy link
Contributor

bdice commented Dec 8, 2023

/merge

@rapids-bot rapids-bot bot merged commit 18ab76b into rapidsai:branch-24.02 Dec 8, 2023
74 checks passed
@bdice bdice mentioned this pull request Dec 8, 2023
26 tasks
rapids-bot bot pushed a commit that referenced this pull request Dec 20, 2023
This PR updates cuGraph to CCCL 2.2.0. Do not merge until all of RAPIDS is ready to update.

Depends on #3862.

Replaces #3516.

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

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Ray Douglass (https://github.com/raydouglass)

URL: #4052
@seunghwak seunghwak deleted the enh_cccl2x branch May 22, 2024 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cuGraph improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update for CCCL 2.x
3 participants