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

Use cuda::proclaim_return_type on device lambdas. #1314

Merged
merged 2 commits into from
Dec 15, 2023

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Dec 12, 2023

Description

This PR makes cuspatial compatible with Thrust 2 by adding cuda::proclaim_return_type, but does not upgrade the version of Thrust/CCCL just yet. Currently we use libcudacxx 2.1.0, which makes cuda::proclaim_return_type available, but we still use Thrust 1.17.2 which doesn't require device lambdas to have proclaimed return types. This diff is separated out from #1096. I will create a separate PR which contains only packaging changes / version updates for the CCCL 2 migration. This PR is nonbreaking, while the second PR will be breaking.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

@bdice bdice requested a review from a team as a code owner December 12, 2023 21:11
@bdice bdice requested review from trxcllnt and isVoid December 12, 2023 21:11
@github-actions github-actions bot added the libcuspatial Relates to the cuSpatial C++ library label Dec 12, 2023
@bdice bdice self-assigned this Dec 12, 2023
@bdice bdice added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Dec 12, 2023
@bdice bdice force-pushed the cccl-2.2.0-support branch from c704e99 to ebddd5f Compare December 12, 2023 23:09
Copy link
Member

@harrism harrism left a comment

Choose a reason for hiding this comment

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

Thanks @bdice !

Copy link
Contributor

@isVoid isVoid left a comment

Choose a reason for hiding this comment

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

Thank you!

@harrism
Copy link
Member

harrism commented Dec 13, 2023

Looks like some device_vector ctor problems.

@bdice bdice force-pushed the cccl-2.2.0-support branch from f39e05c to 7226804 Compare December 15, 2023 18:31
@bdice
Copy link
Contributor Author

bdice commented Dec 15, 2023

Looks like some device_vector ctor problems.

The changes I pulled in were originally targeting CCCL 2 -- this branch can only use the cuda::proclaim_return_type pieces because we're still building with Thrust 1.17.2 until I can move all of RAPIDS over. I'll make sure the PR that actually does the upgrade will incorporate those changes to use initializer_list constructors.

@bdice
Copy link
Contributor Author

bdice commented Dec 15, 2023

/merge

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

Follow-up to #1314.

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

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)
  - Ray Douglass (https://github.com/raydouglass)
  - Robert Maynard (https://github.com/robertmaynard)
  - Mark Harris (https://github.com/harrism)

URL: #1315
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

3 participants