-
Notifications
You must be signed in to change notification settings - Fork 188
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
Include use of NVHPC in CUB/Thrust magic namespace #2771
Merged
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
miscco
reviewed
Nov 12, 2024
🟩 CI finished in 2h 07m: Pass: 100%/222 | Total: 7d 02h | Avg: 46m 05s | Max: 1h 35m | Hits: 17%/16128
|
Project | |
---|---|
CCCL Infrastructure | |
libcu++ | |
+/- | CUB |
+/- | Thrust |
CUDA Experimental | |
python | |
CCCL C Parallel Library | |
Catch2Helper |
Modifications in project or dependencies?
Project | |
---|---|
CCCL Infrastructure | |
libcu++ | |
+/- | CUB |
+/- | Thrust |
CUDA Experimental | |
+/- | python |
+/- | CCCL C Parallel Library |
+/- | Catch2Helper |
🏃 Runner counts (total jobs: 222)
# | Runner |
---|---|
184 | linux-amd64-cpu16 |
16 | linux-arm64-cpu16 |
13 | linux-amd64-gpu-v100-latest-1 |
9 | windows-amd64-cpu16 |
bernhardmgruber
commented
Nov 12, 2024
cub/cub/util_namespace.cuh
Outdated
Comment on lines
131
to
138
# if defined(_NVHPC_CUDA) | ||
# define CUB_DETAIL_MAGIC_NS_BEGIN inline namespace CUB_DETAIL_MAGIC_NS_NAME(CUB_VERSION, NV_TARGET_SM_INTEGER_LIST) { | ||
# define CUB_DETAIL_MAGIC_NS_BEGIN \ | ||
inline namespace THRUST_DETAIL_SPLICE_WITH_UNDERSCORE(CUB, CUB_VERSION, SM, NV_TARGET_SM_INTEGER_LIST, NVHPC) \ | ||
{ | ||
# define CUB_DETAIL_MAGIC_NS_END } | ||
# else // not defined(_NVHPC_CUDA) | ||
# define CUB_DETAIL_MAGIC_NS_BEGIN inline namespace CUB_DETAIL_MAGIC_NS_NAME(CUB_VERSION, __CUDA_ARCH_LIST__) { | ||
# define CUB_DETAIL_MAGIC_NS_BEGIN \ | ||
inline namespace THRUST_DETAIL_SPLICE_WITH_UNDERSCORE(CUB, CUB_VERSION, SM, __CUDA_ARCH_LIST__) \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I considered adding a different tag if the compiler is not NVHPC, but then I would need to distinguish clang in CUDA mode and nvcc, which we don't do and need today. But I am open to add it.
gevtushenko
reviewed
Nov 13, 2024
The new Thrust namespace is `thrust::THRUST_200800_SM_860_NVHPC_NS` if NVHPC is used, otherwise `thrust::THRUST_200800_SM_860_NS`. CUB works analogous. Fixes: NVIDIA#2770
e742487
to
8fc7981
Compare
bernhardmgruber
commented
Nov 13, 2024
🟨 CI finished in 6h 05m: Pass: 99%/394 | Total: 8d 16h | Avg: 31m 44s | Max: 6h 00m | Hits: 11%/25890
|
Project | |
---|---|
CCCL Infrastructure | |
+/- | libcu++ |
+/- | CUB |
+/- | Thrust |
CUDA Experimental | |
python | |
CCCL C Parallel Library | |
Catch2Helper |
Modifications in project or dependencies?
Project | |
---|---|
CCCL Infrastructure | |
+/- | libcu++ |
+/- | CUB |
+/- | Thrust |
+/- | CUDA Experimental |
+/- | python |
+/- | CCCL C Parallel Library |
+/- | Catch2Helper |
🏃 Runner counts (total jobs: 394)
# | Runner |
---|---|
326 | linux-amd64-cpu16 |
28 | linux-arm64-cpu16 |
25 | linux-amd64-gpu-v100-latest-1 |
15 | windows-amd64-cpu16 |
🟩 CI finished in 7h 20m: Pass: 100%/394 | Total: 8d 10h | Avg: 30m 53s | Max: 1h 35m | Hits: 11%/25890
|
Project | |
---|---|
CCCL Infrastructure | |
+/- | libcu++ |
+/- | CUB |
+/- | Thrust |
CUDA Experimental | |
python | |
CCCL C Parallel Library | |
Catch2Helper |
Modifications in project or dependencies?
Project | |
---|---|
CCCL Infrastructure | |
+/- | libcu++ |
+/- | CUB |
+/- | Thrust |
+/- | CUDA Experimental |
+/- | python |
+/- | CCCL C Parallel Library |
+/- | Catch2Helper |
🏃 Runner counts (total jobs: 394)
# | Runner |
---|---|
326 | linux-amd64-cpu16 |
28 | linux-arm64-cpu16 |
25 | linux-amd64-gpu-v100-latest-1 |
15 | windows-amd64-cpu16 |
miscco
approved these changes
Nov 19, 2024
trxcllnt
pushed a commit
to trxcllnt/cccl
that referenced
this pull request
Nov 23, 2024
The new Thrust namespace is `thrust::THRUST_200800_SM_860_NVHPC_NS` if NVHPC is used, otherwise `thrust::THRUST_200800_SM_860_NS`. CUB works analogous. Fixes: NVIDIA#2770
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.
The new Thrust namespace is
thrust::THRUST_200800_SM_860_NVHPC_NS
if NVHPC is used, otherwisethrust::THRUST_200800_SM_860_NS
. CUB works analogous.I added a
SM
before the list of CUDA architectures for better readability.Fixes: #2770