-
Notifications
You must be signed in to change notification settings - Fork 304
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
Add missing Thrust includes #2310
Conversation
Codecov Report
@@ Coverage Diff @@
## branch-22.08 #2310 +/- ##
================================================
+ Coverage 60.08% 60.10% +0.01%
================================================
Files 102 102
Lines 5158 5158
================================================
+ Hits 3099 3100 +1
+ Misses 2059 2058 -1
Continue to review full report at Codecov.
|
From the CI output, it appears that Thrust 1.15.0 is being used. I also built this branch locally with rapids-compose's
It looks like this commit of cuco is using CPM to include an older Thrust 1.12.0 version, which happens before my manual I pushed a commit 0ba6551 to force using 1.17.0 by including it before all other packages that also depend on Thrust (cuco, for instance). We'll see if that gets used by the CI this time. I was unable to test locally due to an error caused by |
This is blocked until raft is upgraded: rapidsai/raft#678
|
rerun tests |
Maybe this needs to wait until a new nightly package of |
This is now blocked by rapidsai/cuhornet#57. |
Looks like the build completed for 3fd8e6a, but there's some issue related to finding a libcudf that has an older CUB. I'm not sure if we need to debug this and override things. I think we can probably move forward without debugging that issue, since the build didn't fail with Thrust inclusion problems and it's just an issue of my version override not matching the rest of RAPIDS. I reverted my CMake changes overriding the Thrust version in 9d33fce, and I think this should be ready to review/merge. Error from the previous build:
|
@gpucibot merge |
Description
This PR cleans up some
#include
s for Thrust. This is meant to help ease the transition to Thrust 1.17 when that is updated in rapids-cmake.Context
I opened a PR rapidsai/cudf#10489 that updates cuDF to Thrust 1.16. Notably, version 1.16 of Thrust reduced the number of internal header inclusions:
I spoke with @robertmaynard and he recommended making similar changes to clean up includes ("include what we use," in essence) to make sure we have compatibility with future versions of Thrust across all RAPIDS libraries.
This changeset also makes it more obvious where cugraph depends on
thrust/detail
headers.