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

Force Thrust to use 32-bit offset type. #17523

Merged

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Dec 5, 2024

Description

This fixes the patch we use for Thrust to always get a 32-bit offset type. The net effect of this patch is that we are behaving as if THRUST_FORCE_32_BIT_OFFSET_TYPE is set. This replaces a previous patch which I mistakenly did not update between CCCL 2.6.x testing and 2.7.0-rc2 testing.

In the future we hope to configure this with CMake and drop the patches, but that will require us to use features from NVIDIA/cccl#2844 (which is not available in 2.7.0-rc2).

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 5, 2024 04:30
@github-actions github-actions bot added the libcudf Affects libcudf (C++/CUDA) code. label Dec 5, 2024
@github-actions github-actions bot added the CMake CMake build issue label Dec 5, 2024
@bdice bdice added bug Something isn't working non-breaking Non-breaking change improvement Improvement / enhancement to an existing function and removed bug Something isn't working labels Dec 5, 2024
@bdice
Copy link
Contributor Author

bdice commented Dec 5, 2024

We can ignore the telemetry-summarize failure, it is not required for merge.

@vyasr
Copy link
Contributor

vyasr commented Dec 5, 2024

Patching is a bit messy here but I'd be fine merging if necessary. The cleaner option would be target_compile_definitions(cudf PRIVATE THRUST_FORCE_64_BIT_OFFSET_TYPE=0 THRUST_FORCE_32_BIT_OFFSET_TYPE=1). Is there any reason that doesn't work?

@bdice
Copy link
Contributor Author

bdice commented Dec 5, 2024

@vyasr Thanks -- I was wondering if that would be your preference. I would like to merge this to unblock CI and will follow up with another PR to do what you're proposing. Can you approve?

Copy link
Contributor

@vyasr vyasr left a comment

Choose a reason for hiding this comment

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

Approved assuming we make a follow-up.

@bdice
Copy link
Contributor Author

bdice commented Dec 5, 2024

/merge

@rapids-bot rapids-bot bot merged commit fbc3256 into rapidsai:branch-25.02 Dec 5, 2024
108 of 109 checks passed
rapids-bot bot pushed a commit that referenced this pull request Dec 10, 2024
…fset types. (#17527)

Follow-up for #17523 to use `target_compile_definitions` and drop the Thrust patch.

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

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

URL: #17527
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake CMake build issue improvement Improvement / enhancement to an existing function libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants