Repository navigation
Fix naming of our namespace macros and friends - #5538
Merged
Merged
Conversation
miscco
force-pushed
the
use_right_name
branch
2 times, most recently
from
August 14, 2025 07:59
d02de3d to
abc7d23
Compare
Contributor
🟨 CI finished in 58m 42s: Pass: 0%/210 | Total: 17h 16m | Avg: 4m 56s | Max: 57m 58s
|
| Project | |
|---|---|
| CCCL Infrastructure | |
| CCCL Packaging | |
| +/- | libcu++ |
| +/- | CUB |
| +/- | Thrust |
| +/- | CUDA Experimental |
| stdpar | |
| python | |
| +/- | CCCL C Parallel Library |
| +/- | Catch2Helper |
Modifications in project or dependencies?
| Project | |
|---|---|
| CCCL Infrastructure | |
| +/- | CCCL Packaging |
| +/- | libcu++ |
| +/- | CUB |
| +/- | Thrust |
| +/- | CUDA Experimental |
| +/- | stdpar |
| +/- | python |
| +/- | CCCL C Parallel Library |
| +/- | Catch2Helper |
🏃 Runner counts (total jobs: 210)
| # | Runner |
|---|---|
| 128 | linux-amd64-cpu16 |
| 23 | windows-amd64-cpu16 |
| 17 | linux-amd64-gpu-l4-latest-1 |
| 12 | linux-arm64-cpu16 |
| 11 | linux-amd64-gpu-rtx2080-latest-1 |
| 10 | linux-amd64-gpu-h100-latest-1 |
| 6 | linux-amd64-gpu-rtxa6000-latest-1 |
| 3 | linux-amd64-gpu-rtx4090-latest-1 |
bernhardmgruber
approved these changes
Aug 14, 2025
Contributor
🟨 CI finished in 1h 59m: Pass: 77%/210 | Total: 5d 05h | Avg: 35m 49s | Max: 1h 57m | Hits: 38%/153251
|
| Project | |
|---|---|
| CCCL Infrastructure | |
| CCCL Packaging | |
| +/- | libcu++ |
| +/- | CUB |
| +/- | Thrust |
| +/- | CUDA Experimental |
| stdpar | |
| python | |
| +/- | CCCL C Parallel Library |
| +/- | Catch2Helper |
Modifications in project or dependencies?
| Project | |
|---|---|
| CCCL Infrastructure | |
| +/- | CCCL Packaging |
| +/- | libcu++ |
| +/- | CUB |
| +/- | Thrust |
| +/- | CUDA Experimental |
| +/- | stdpar |
| +/- | python |
| +/- | CCCL C Parallel Library |
| +/- | Catch2Helper |
🏃 Runner counts (total jobs: 210)
| # | Runner |
|---|---|
| 128 | linux-amd64-cpu16 |
| 23 | windows-amd64-cpu16 |
| 17 | linux-amd64-gpu-l4-latest-1 |
| 12 | linux-arm64-cpu16 |
| 11 | linux-amd64-gpu-rtx2080-latest-1 |
| 10 | linux-amd64-gpu-h100-latest-1 |
| 6 | linux-amd64-gpu-rtxa6000-latest-1 |
| 3 | linux-amd64-gpu-rtx4090-latest-1 |
We want to move away from the subprojects so rename from `_LIBCUDACXX_[BEGIN, END]_NAMESPACE` to `_CCCL_[BEGIN, END]_NAMESPACE` While we are at it, change the name from `NAMESPACE_STD` to `NAMESPACE_CUDA_STD` because that is what it actually is
Contributor
🟩 CI finished in 1h 10m: Pass: 100%/210 | Total: 1d 16h | Avg: 11m 31s | Max: 46m 53s | Hits: 96%/322878
|
| Project | |
|---|---|
| CCCL Infrastructure | |
| CCCL Packaging | |
| +/- | libcu++ |
| +/- | CUB |
| +/- | Thrust |
| +/- | CUDA Experimental |
| stdpar | |
| python | |
| CCCL C Parallel Library | |
| +/- | Catch2Helper |
Modifications in project or dependencies?
| Project | |
|---|---|
| CCCL Infrastructure | |
| +/- | CCCL Packaging |
| +/- | libcu++ |
| +/- | CUB |
| +/- | Thrust |
| +/- | CUDA Experimental |
| +/- | stdpar |
| +/- | python |
| +/- | CCCL C Parallel Library |
| +/- | Catch2Helper |
🏃 Runner counts (total jobs: 210)
| # | Runner |
|---|---|
| 128 | linux-amd64-cpu16 |
| 23 | windows-amd64-cpu16 |
| 17 | linux-amd64-gpu-l4-latest-1 |
| 12 | linux-arm64-cpu16 |
| 11 | linux-amd64-gpu-rtx2080-latest-1 |
| 10 | linux-amd64-gpu-h100-latest-1 |
| 6 | linux-amd64-gpu-rtxa6000-latest-1 |
| 3 | linux-amd64-gpu-rtx4090-latest-1 |
bernhardmgruber
approved these changes
Aug 14, 2025
fbusato
approved these changes
Aug 14, 2025
shwina
pushed a commit
to shwina/cccl
that referenced
this pull request
Aug 19, 2025
We want to move away from the subprojects so rename from `_LIBCUDACXX_[BEGIN, END]_NAMESPACE` to `_CCCL_[BEGIN, END]_NAMESPACE` While we are at it, change the name from `NAMESPACE_STD` to `NAMESPACE_CUDA_STD` because that is what it actually is
davebayer
pushed a commit
to davebayer/cccl
that referenced
this pull request
Sep 23, 2025
We want to move away from the subprojects so rename from `_LIBCUDACXX_[BEGIN, END]_NAMESPACE` to `_CCCL_[BEGIN, END]_NAMESPACE` While we are at it, change the name from `NAMESPACE_STD` to `NAMESPACE_CUDA_STD` because that is what it actually is
amd-jmahovsky
added a commit
to ROCm/rocm-libraries
that referenced
this pull request
Oct 28, 2026
…with _THRUST_STD::apply Related upstream commit: 52eb28883c4 Simplify thrust::zip_function (NVIDIA/cccl#6321) Related local port commit: 0d3216d Also related: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538) (the namespace fallback removed below) The port kept the local zip_detail::apply helper and the non-libhipcxx `namespace internal` path for compatibility. libhipcxx is now mandatory, so zip_function.h now matches upstream: - zip_function::operator() returns _THRUST_STD::apply(func, _THRUST_STD::forward<Tuple>(args)); thrust::detail::zip_detail::{apply,apply_impl} are removed. - include _THRUST_LIBCXX_INCLUDE(functional) and _THRUST_STD_INCLUDE(tuple) instead of thrust/tuple.h, thrust/type_traits/integer_sequence.h and the libcxx_wrapper fallback. - the proclaims_copyable_arguments<zip_function<F>> specialization is only declared in the libcxx namespace (_THRUST_LIBCXX_NAMESPACE_BEGIN/END). The leftover "C++11 decltype(auto) workaround" comments are removed as upstream did. Not compiled, tests not run (per human) Co-Authored-By: Claude <noreply@anthropic.com>
amd-jmahovsky
added a commit
to ROCm/rocm-libraries
that referenced
this pull request
Oct 28, 2026
…llbacks in zip_iterator and iterator tests Related upstream commit: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538) Related upstream commit: 8b68d958473 Drop internal uses of `thrust::reverse_iterator` (NVIDIA/cccl#5616) Related local port commit: 148b6e8 libhipcxx is now mandatory, so every !_THRUST_HAS_DEVICE_SYSTEM_STD branch in the files these upstream commits touched is dead code. Upstream has no such fallbacks; remove them to match: - thrust/iterator/zip_iterator.h: remove the fallback zip_iterator machinery (advance_iterator, tuple_impl_specific, tuple_of_value_types, tuple_of_iterator_references helpers, ...) and the associated TODO; includes are now unconditional _THRUST_STD_INCLUDE(...). - thrust/iterator/detail/tuple_of_iterator_references.h: drop fallback branches. - thrust/detail/vector_base.h: drop fallback <type_traits> include. - testing/{copy,scan}.cu, testing/unittest/testframework.h: unconditionally specialize _THRUST_STD traits and drop fallback includes. - testing/{reverse,transform,transform_input_output,transform_output, tabulate_output,zip}_iterator.cu: iterator concept static_asserts are now unconditional, as upstream. The namespace macro rename from 7b52284299d needs no further change; the local _THRUST_STD_NAMESPACE_BEGIN/_THRUST_LIBCXX_NAMESPACE_BEGIN spellings are already the equivalents. Not compiled, tests not run (per human) Co-Authored-By: Claude <noreply@anthropic.com>
Naraenda
pushed a commit
to ROCm/rocm-libraries
that referenced
this pull request
Oct 29, 2026
…with _THRUST_STD::apply Related upstream commit: 52eb28883c4 Simplify thrust::zip_function (NVIDIA/cccl#6321) Related local port commit: 0d3216d Also related: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538) (the namespace fallback removed below) The port kept the local zip_detail::apply helper and the non-libhipcxx `namespace internal` path for compatibility. libhipcxx is now mandatory, so zip_function.h now matches upstream: - zip_function::operator() returns _THRUST_STD::apply(func, _THRUST_STD::forward<Tuple>(args)); thrust::detail::zip_detail::{apply,apply_impl} are removed. - include _THRUST_LIBCXX_INCLUDE(functional) and _THRUST_STD_INCLUDE(tuple) instead of thrust/tuple.h, thrust/type_traits/integer_sequence.h and the libcxx_wrapper fallback. - the proclaims_copyable_arguments<zip_function<F>> specialization is only declared in the libcxx namespace (_THRUST_LIBCXX_NAMESPACE_BEGIN/END). The leftover "C++11 decltype(auto) workaround" comments are removed as upstream did. Not compiled, tests not run (per human) Co-Authored-By: Claude <noreply@anthropic.com>
Naraenda
pushed a commit
to ROCm/rocm-libraries
that referenced
this pull request
Oct 29, 2026
…llbacks in zip_iterator and iterator tests Related upstream commit: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538) Related upstream commit: 8b68d958473 Drop internal uses of `thrust::reverse_iterator` (NVIDIA/cccl#5616) Related local port commit: 148b6e8 libhipcxx is now mandatory, so every !_THRUST_HAS_DEVICE_SYSTEM_STD branch in the files these upstream commits touched is dead code. Upstream has no such fallbacks; remove them to match: - thrust/iterator/zip_iterator.h: remove the fallback zip_iterator machinery (advance_iterator, tuple_impl_specific, tuple_of_value_types, tuple_of_iterator_references helpers, ...) and the associated TODO; includes are now unconditional _THRUST_STD_INCLUDE(...). - thrust/iterator/detail/tuple_of_iterator_references.h: drop fallback branches. - thrust/detail/vector_base.h: drop fallback <type_traits> include. - testing/{copy,scan}.cu, testing/unittest/testframework.h: unconditionally specialize _THRUST_STD traits and drop fallback includes. - testing/{reverse,transform,transform_input_output,transform_output, tabulate_output,zip}_iterator.cu: iterator concept static_asserts are now unconditional, as upstream. The namespace macro rename from 7b52284299d needs no further change; the local _THRUST_STD_NAMESPACE_BEGIN/_THRUST_LIBCXX_NAMESPACE_BEGIN spellings are already the equivalents. Not compiled, tests not run (per human) Co-Authored-By: Claude <noreply@anthropic.com>
amd-jmahovsky
added a commit
to ROCm/rocm-libraries
that referenced
this pull request
Oct 30, 2026
…with _THRUST_STD::apply Related upstream commit: 52eb28883c4 Simplify thrust::zip_function (NVIDIA/cccl#6321) Related local port commit: 0d3216d Also related: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538) (the namespace fallback removed below) The port kept the local zip_detail::apply helper and the non-libhipcxx `namespace internal` path for compatibility. libhipcxx is now mandatory, so zip_function.h now matches upstream: - zip_function::operator() returns _THRUST_STD::apply(func, _THRUST_STD::forward<Tuple>(args)); thrust::detail::zip_detail::{apply,apply_impl} are removed. - include _THRUST_LIBCXX_INCLUDE(functional) and _THRUST_STD_INCLUDE(tuple) instead of thrust/tuple.h, thrust/type_traits/integer_sequence.h and the libcxx_wrapper fallback. - the proclaims_copyable_arguments<zip_function<F>> specialization is only declared in the libcxx namespace (_THRUST_LIBCXX_NAMESPACE_BEGIN/END). The leftover "C++11 decltype(auto) workaround" comments are removed as upstream did. Not compiled, tests not run (per human) Co-Authored-By: Claude <noreply@anthropic.com>
amd-jmahovsky
added a commit
to ROCm/rocm-libraries
that referenced
this pull request
Oct 30, 2026
…llbacks in zip_iterator and iterator tests Related upstream commit: 7b52284299d Rename our namespace macros (NVIDIA/cccl#5538) Related upstream commit: 8b68d958473 Drop internal uses of `thrust::reverse_iterator` (NVIDIA/cccl#5616) Related local port commit: 148b6e8 libhipcxx is now mandatory, so every !_THRUST_HAS_DEVICE_SYSTEM_STD branch in the files these upstream commits touched is dead code. Upstream has no such fallbacks; remove them to match: - thrust/iterator/zip_iterator.h: remove the fallback zip_iterator machinery (advance_iterator, tuple_impl_specific, tuple_of_value_types, tuple_of_iterator_references helpers, ...) and the associated TODO; includes are now unconditional _THRUST_STD_INCLUDE(...). - thrust/iterator/detail/tuple_of_iterator_references.h: drop fallback branches. - thrust/detail/vector_base.h: drop fallback <type_traits> include. - testing/{copy,scan}.cu, testing/unittest/testframework.h: unconditionally specialize _THRUST_STD traits and drop fallback includes. - testing/{reverse,transform,transform_input_output,transform_output, tabulate_output,zip}_iterator.cu: iterator concept static_asserts are now unconditional, as upstream. The namespace macro rename from 7b52284299d needs no further change; the local _THRUST_STD_NAMESPACE_BEGIN/_THRUST_LIBCXX_NAMESPACE_BEGIN spellings are already the equivalents. Not compiled, tests not run (per human) Co-Authored-By: Claude <noreply@anthropic.com>
This file contains hidden or 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
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.
We currently use
_LIBCUDACXX_BEGIN_NAMESPACE_STDto actually meancuda::std::, which is ... wrong. Clean that up toNAMESPACE_CUDA_STDand also move those to_CCCL_BEGIN_NAMESPACE_MEOWAlso the namespace qualification macros currently have a spurios
Vinside that is just annoying and surprising.