Skip to content

Move CPP, OMP and TBB exec policies to detail - #6361

Merged
bernhardmgruber merged 4 commits into
NVIDIA:mainfrom
bernhardmgruber:fix_exec
Oct 29, 2025
Merged

bernhardmgruber merged 4 commits into
NVIDIA:mainfrom
bernhardmgruber:fix_exec

Conversation

@bernhardmgruber

@bernhardmgruber bernhardmgruber commented Oct 28, 2025 •

Copy link
Copy Markdown
Contributor

Fixes: #6359
Fixes: #6317

@copy-pr-bot

copy-pr-bot Bot commented Oct 28, 2025

Copy link
Copy Markdown
Contributor

Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually.

Contributors can view more details about this message here.

@cccl-authenticator-app cccl-authenticator-app Bot moved this from Todo to In Progress in CCCL Oct 28, 2025
@bernhardmgruber

Copy link
Copy Markdown
Contributor Author

/ok to test 03381f3

@github-project-automation github-project-automation Bot moved this from In Progress to In Review in CCCL Oct 28, 2025
@bernhardmgruber
bernhardmgruber marked this pull request as ready for review October 28, 2025 13:05
@bernhardmgruber
bernhardmgruber requested a review from a team as a code owner October 28, 2025 13:05
@github-actions

Copy link
Copy Markdown
Contributor

🥳 CI Workflow Results

🟩 Finished in 2h 57m: Pass: 100%/69 | Total: 3d 01h | Max: 2h 56m | Hits: 57%/115211

See results here.

@bernhardmgruber
bernhardmgruber merged commit e73cc82 into NVIDIA:main Oct 29, 2025
81 checks passed
@github-project-automation github-project-automation Bot moved this from In Review to Done in CCCL Oct 29, 2025
@bernhardmgruber
bernhardmgruber deleted the fix_exec branch October 29, 2025 08:09
Naraenda pushed a commit to ROCm/rocm-libraries that referenced this pull request Oct 26, 2026
…olicies to detail (NVIDIA/cccl#6361)

Upstream: NVIDIA/cccl@e73cc82

HIP counterpart (system/hip): no change; hip tag/execution_policy already live in thrust::hip_rocprim alongside the HIP algorithms, so ADL already finds them (the cuda change is only a comment). cpp/omp/tbb tag + execution_policy moved into system::<sys>::detail with using-declarations in system::<sys>, as upstream. omp/detail/scan.inl: P0571 accumulator (no-init tag, wrapped_function, init applied in block-sum scan), keeping the libhipcxx-free includes (_THRUST_STD_INCLUDE(type_traits) added, libcxx_wrapper invoke.h include dropped as accumulator_t is no longer used). test/: test_scan.cpp only_set_when_expected_it gains postfix operator++(int). testing/: scan.cu same (THRUST_HOST_DEVICE spelling). 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
…ceil_div in omp/tbb scan

Related upstream commit: 1238f287f4f add parallel scan support for TBB and OMP (NVIDIA/cccl#6178)
Related upstream commit: e73cc82956a Move CPP, OMP and TBB exec policies to detail (NVIDIA/cccl#6361)
Related upstream commit: c22298179e0 Refactor Thrust OMP system headers (NVIDIA/cccl#6372)
Related local port commits: 6cb9dc4, 43961ea, e6c2a3e

libhipcxx is now mandatory, so:
- system/omp/detail/scan.h: replace the <algorithm>/<iterator>/<numeric>/<type_traits> umbrella
  includes and thrust/{advance,distance}.h with the upstream granular headers
  (__cmath/ceil_div.h, __functional/invoke.h, __iterator/{advance,distance}.h,
  __numeric/{exclusive_scan,inclusive_scan,reduce}.h, __type_traits/{conditional,is_same}.h; plus
  __algorithm/{max,min}.h for the max/min calls), and compute block_size with
  _THRUST_LIBCXX::ceil_div(n, num_threads) as upstream.
- system/tbb/detail/scan.h: thrust/{advance,distance}.h -> _THRUST_STD __iterator/{advance,distance}.h.

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
…olicies to detail (NVIDIA/cccl#6361)

Upstream: NVIDIA/cccl@e73cc82

HIP counterpart (system/hip): no change; hip tag/execution_policy already live in thrust::hip_rocprim alongside the HIP algorithms, so ADL already finds them (the cuda change is only a comment). cpp/omp/tbb tag + execution_policy moved into system::<sys>::detail with using-declarations in system::<sys>, as upstream. omp/detail/scan.inl: P0571 accumulator (no-init tag, wrapped_function, init applied in block-sum scan), keeping the libhipcxx-free includes (_THRUST_STD_INCLUDE(type_traits) added, libcxx_wrapper invoke.h include dropped as accumulator_t is no longer used). test/: test_scan.cpp only_set_when_expected_it gains postfix operator++(int). testing/: scan.cu same (THRUST_HOST_DEVICE spelling). 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
…olicies to detail (NVIDIA/cccl#6361)

Upstream: NVIDIA/cccl@e73cc82

HIP counterpart (system/hip): no change; hip tag/execution_policy already live in thrust::hip_rocprim alongside the HIP algorithms, so ADL already finds them (the cuda change is only a comment). cpp/omp/tbb tag + execution_policy moved into system::<sys>::detail with using-declarations in system::<sys>, as upstream. omp/detail/scan.inl: P0571 accumulator (no-init tag, wrapped_function, init applied in block-sum scan), keeping the libhipcxx-free includes (_THRUST_STD_INCLUDE(type_traits) added, libcxx_wrapper invoke.h include dropped as accumulator_t is no longer used). test/: test_scan.cpp only_set_when_expected_it gains postfix operator++(int). testing/: scan.cu same (THRUST_HOST_DEVICE spelling). 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
…ceil_div in omp/tbb scan

Related upstream commit: 1238f287f4f add parallel scan support for TBB and OMP (NVIDIA/cccl#6178)
Related upstream commit: e73cc82956a Move CPP, OMP and TBB exec policies to detail (NVIDIA/cccl#6361)
Related upstream commit: c22298179e0 Refactor Thrust OMP system headers (NVIDIA/cccl#6372)
Related local port commits: 6cb9dc4, 43961ea, e6c2a3e

libhipcxx is now mandatory, so:
- system/omp/detail/scan.h: replace the <algorithm>/<iterator>/<numeric>/<type_traits> umbrella
  includes and thrust/{advance,distance}.h with the upstream granular headers
  (__cmath/ceil_div.h, __functional/invoke.h, __iterator/{advance,distance}.h,
  __numeric/{exclusive_scan,inclusive_scan,reduce}.h, __type_traits/{conditional,is_same}.h; plus
  __algorithm/{max,min}.h for the max/min calls), and compute block_size with
  _THRUST_LIBCXX::ceil_div(n, num_threads) as upstream.
- system/tbb/detail/scan.h: thrust/{advance,distance}.h -> _THRUST_STD __iterator/{advance,distance}.h.

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 30, 2026
…olicies to detail (NVIDIA/cccl#6361)

Upstream: NVIDIA/cccl@e73cc82

HIP counterpart (system/hip): no change; hip tag/execution_policy already live in thrust::hip_rocprim alongside the HIP algorithms, so ADL already finds them (the cuda change is only a comment). cpp/omp/tbb tag + execution_policy moved into system::<sys>::detail with using-declarations in system::<sys>, as upstream. omp/detail/scan.inl: P0571 accumulator (no-init tag, wrapped_function, init applied in block-sum scan), keeping the libhipcxx-free includes (_THRUST_STD_INCLUDE(type_traits) added, libcxx_wrapper invoke.h include dropped as accumulator_t is no longer used). test/: test_scan.cpp only_set_when_expected_it gains postfix operator++(int). testing/: scan.cu same (THRUST_HOST_DEVICE spelling). Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
Beanavil pushed a commit to ROCm/rocm-libraries that referenced this pull request Oct 30, 2026
…olicies to detail (NVIDIA/cccl#6361)

Upstream: NVIDIA/cccl@e73cc82

HIP counterpart (system/hip): no change; hip tag/execution_policy already live in thrust::hip_rocprim alongside the HIP algorithms, so ADL already finds them (the cuda change is only a comment). cpp/omp/tbb tag + execution_policy moved into system::<sys>::detail with using-declarations in system::<sys>, as upstream. omp/detail/scan.inl: P0571 accumulator (no-init tag, wrapped_function, init applied in block-sum scan), keeping the libhipcxx-free includes (_THRUST_STD_INCLUDE(type_traits) added, libcxx_wrapper invoke.h include dropped as accumulator_t is no longer used). test/: test_scan.cpp only_set_when_expected_it gains postfix operator++(int). testing/: scan.cu same (THRUST_HOST_DEVICE spelling). 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
…ceil_div in omp/tbb scan

Related upstream commit: 1238f287f4f add parallel scan support for TBB and OMP (NVIDIA/cccl#6178)
Related upstream commit: e73cc82956a Move CPP, OMP and TBB exec policies to detail (NVIDIA/cccl#6361)
Related upstream commit: c22298179e0 Refactor Thrust OMP system headers (NVIDIA/cccl#6372)
Related local port commits: 6cb9dc4, 43961ea, e6c2a3e

libhipcxx is now mandatory, so:
- system/omp/detail/scan.h: replace the <algorithm>/<iterator>/<numeric>/<type_traits> umbrella
  includes and thrust/{advance,distance}.h with the upstream granular headers
  (__cmath/ceil_div.h, __functional/invoke.h, __iterator/{advance,distance}.h,
  __numeric/{exclusive_scan,inclusive_scan,reduce}.h, __type_traits/{conditional,is_same}.h; plus
  __algorithm/{max,min}.h for the max/min calls), and compute block_size with
  _THRUST_LIBCXX::ceil_div(n, num_threads) as upstream.
- system/tbb/detail/scan.h: thrust/{advance,distance}.h -> _THRUST_STD __iterator/{advance,distance}.h.

Not compiled, tests not run (per human)

Co-Authored-By: Claude <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

2 participants