Various and sundry fixes for Thrust's CPP backends. #1722
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Having the deprecation markup on the declaration instead of the definition cause the deprecation diagnostics to be emitted when defining the deprecate type on gcc. Moving the markup fixes this.
error: use of built-in trait '__is_same(..., ...)' in function signature; use library traits instead.
This type was already forward-declared in `is_reference_wrapper.h`. Redeclaring it with the vis attribute broke gcc.
Fallback to our FindTBB.cmake as a last resort.
alliepiper
force-pushed
the
thrust-cpp-fixes
branch
from
cb755cf to
c2a7a15
Compare
miscco
reviewed
May 8, 2024
|
|
||
| #if THRUST_DEVICE_COMPILER != THRUST_DEVICE_COMPILER_NVCC | ||
|
|
||
| # ifndef __host__ |
There was a problem hiding this comment.
We should not do that, but rather use _CCCL_HOST or _CCCL_DEVICE or _CCCL_HOST_DEVICE or at least define a proper macro TEST_HOST_DEVICE that evaluates to the internal one
There was a problem hiding this comment.
I've updated tests and sources to use our internal macros, but this header is only included from example sources where using __host__ __device__ instead of an internal macro is preferable, and these also need to build for Thrust's non-CUDA backends.
🟩 CI Results [ Failed: 0 | Passed: 306 | Total: 306 ]
|
| # | Runner |
|---|---|
| 232 | linux-amd64-cpu16 |
| 32 | linux-amd64-gpu-v100-latest-1 |
| 24 | linux-arm64-cpu16 |
| 18 | windows-amd64-cpu16 |
👃 Inspect Changes
Modifications in project?
| Project | |
|---|---|
| +/- | CCCL Infrastructure |
| +/- | libcu++ |
| CUB | |
| +/- | Thrust |
Modifications in project or dependencies?
| Project | |
|---|---|
| +/- | CCCL Infrastructure |
| +/- | libcu++ |
| +/- | CUB |
| +/- | Thrust |
miscco
approved these changes
May 13, 2024
miscco
reviewed
May 13, 2024
Yes, that's happening in #1696. |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1696 re-enables CI testing of Thrust's OMP and TBB backends, and this PR addresses the issues that popped up along the way. I've moved the bug fixes here so #1696 can focus on the infra changes.
Checklist