Repository navigation
[Backport branch/3.2.x] fix omp scan bug - #6704
Merged
Merged
Conversation
Co-authored-by: Bernhard Manfred Gruber <bernhardmgruber@gmail.com> (cherry picked from commit bb8a5b9)
Merged
Contributor
Contributor
|
/ok to test 86c41db |
elstehle
approved these changes
Nov 20, 2025
This comment has been minimized.
This comment has been minimized.
Contributor
|
/ok to test 664098b |
elstehle
enabled auto-merge (squash)
November 20, 2025 08:36
Contributor
Author
🥳 CI Workflow Results🟩 Finished in 2h 18m: Pass: 100%/70 | Total: 2d 09h | Max: 2h 17m | Hits: 80%/115446See results here. |
Naraenda
pushed a commit
to ROCm/rocm-libraries
that referenced
this pull request
Oct 26, 2026
…l#6560) (NVIDIA/cccl#6704) Upstream: NVIDIA/cccl@26c79ca HIP counterpart (system/hip): none (rocPRIM scan unaffected). Ported OMP scan fix in system/omp/detail/scan.h: blocks reduce with their first element as init (no accum_t{} identity assumption), no-init inclusive path seeds from block_sums[0] and thread 0 scans without prefix, serial fallback when n < max(threshold, num_threads); _CCCL_ASSERT dropped (not available locally; replaced by a comment). testing/scan.cu and testing/transform_scan.cu gain the new tests (THRUST_HOST_DEVICE spelling; kept local include guards, added <numeric>). test/ counterpart: mirrored in test/test_scan.cpp (Int with friend ops, TestScanWithUserDefinedTypeAndInit replacing TestInclusiveScanWithUserDefinedType, TestScanBug6317 using get_random_data, TestScanEdgeCases) and test/test_transform_scan.cpp (TransformInt, TestTransformScanEdgeCases). 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
… scan Related upstream commit: 26c79caf60e fix omp scan bug (#6560) (NVIDIA/cccl#6704) Related local port commit: ffd4daf The port replaced `_CCCL_ASSERT(num_threads > 1, ...)` with a comment because the macro was assumed unavailable. libhipcxx (now mandatory) provides _CCCL_ASSERT (cuda/std/__cccl/assert.h, reached via thrust/detail/config.h), so restore the upstream assertion. 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
…l#6560) (NVIDIA/cccl#6704) Upstream: NVIDIA/cccl@26c79ca HIP counterpart (system/hip): none (rocPRIM scan unaffected). Ported OMP scan fix in system/omp/detail/scan.h: blocks reduce with their first element as init (no accum_t{} identity assumption), no-init inclusive path seeds from block_sums[0] and thread 0 scans without prefix, serial fallback when n < max(threshold, num_threads); _CCCL_ASSERT dropped (not available locally; replaced by a comment). testing/scan.cu and testing/transform_scan.cu gain the new tests (THRUST_HOST_DEVICE spelling; kept local include guards, added <numeric>). test/ counterpart: mirrored in test/test_scan.cpp (Int with friend ops, TestScanWithUserDefinedTypeAndInit replacing TestInclusiveScanWithUserDefinedType, TestScanBug6317 using get_random_data, TestScanEdgeCases) and test/test_transform_scan.cpp (TransformInt, TestTransformScanEdgeCases). 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
…l#6560) (NVIDIA/cccl#6704) Upstream: NVIDIA/cccl@26c79ca HIP counterpart (system/hip): none (rocPRIM scan unaffected). Ported OMP scan fix in system/omp/detail/scan.h: blocks reduce with their first element as init (no accum_t{} identity assumption), no-init inclusive path seeds from block_sums[0] and thread 0 scans without prefix, serial fallback when n < max(threshold, num_threads); _CCCL_ASSERT dropped (not available locally; replaced by a comment). testing/scan.cu and testing/transform_scan.cu gain the new tests (THRUST_HOST_DEVICE spelling; kept local include guards, added <numeric>). test/ counterpart: mirrored in test/test_scan.cpp (Int with friend ops, TestScanWithUserDefinedTypeAndInit replacing TestInclusiveScanWithUserDefinedType, TestScanBug6317 using get_random_data, TestScanEdgeCases) and test/test_transform_scan.cpp (TransformInt, TestTransformScanEdgeCases). 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
… scan Related upstream commit: 26c79caf60e fix omp scan bug (#6560) (NVIDIA/cccl#6704) Related local port commit: ffd4daf The port replaced `_CCCL_ASSERT(num_threads > 1, ...)` with a comment because the macro was assumed unavailable. libhipcxx (now mandatory) provides _CCCL_ASSERT (cuda/std/__cccl/assert.h, reached via thrust/detail/config.h), so restore the upstream assertion. 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
…l#6560) (NVIDIA/cccl#6704) Upstream: NVIDIA/cccl@26c79ca HIP counterpart (system/hip): none (rocPRIM scan unaffected). Ported OMP scan fix in system/omp/detail/scan.h: blocks reduce with their first element as init (no accum_t{} identity assumption), no-init inclusive path seeds from block_sums[0] and thread 0 scans without prefix, serial fallback when n < max(threshold, num_threads); _CCCL_ASSERT dropped (not available locally; replaced by a comment). testing/scan.cu and testing/transform_scan.cu gain the new tests (THRUST_HOST_DEVICE spelling; kept local include guards, added <numeric>). test/ counterpart: mirrored in test/test_scan.cpp (Int with friend ops, TestScanWithUserDefinedTypeAndInit replacing TestInclusiveScanWithUserDefinedType, TestScanBug6317 using get_random_data, TestScanEdgeCases) and test/test_transform_scan.cpp (TransformInt, TestTransformScanEdgeCases). 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
…l#6560) (NVIDIA/cccl#6704) Upstream: NVIDIA/cccl@26c79ca HIP counterpart (system/hip): none (rocPRIM scan unaffected). Ported OMP scan fix in system/omp/detail/scan.h: blocks reduce with their first element as init (no accum_t{} identity assumption), no-init inclusive path seeds from block_sums[0] and thread 0 scans without prefix, serial fallback when n < max(threshold, num_threads); _CCCL_ASSERT dropped (not available locally; replaced by a comment). testing/scan.cu and testing/transform_scan.cu gain the new tests (THRUST_HOST_DEVICE spelling; kept local include guards, added <numeric>). test/ counterpart: mirrored in test/test_scan.cpp (Int with friend ops, TestScanWithUserDefinedTypeAndInit replacing TestInclusiveScanWithUserDefinedType, TestScanBug6317 using get_random_data, TestScanEdgeCases) and test/test_transform_scan.cpp (TransformInt, TestTransformScanEdgeCases). 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
… scan Related upstream commit: 26c79caf60e fix omp scan bug (#6560) (NVIDIA/cccl#6704) Related local port commit: ffd4daf The port replaced `_CCCL_ASSERT(num_threads > 1, ...)` with a comment because the macro was assumed unavailable. libhipcxx (now mandatory) provides _CCCL_ASSERT (cuda/std/__cccl/assert.h, reached via thrust/detail/config.h), so restore the upstream assertion. 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
Nov 4, 2026
…l#6560) Upstream: NVIDIA/cccl@bb8a5b9 - already ported — identical to its `branch/3.2.x` backport 26c79caf60e (NVIDIA/cccl#6704; `+`/`-` lines compared, no difference), ported in ad694ae plus parity fix 5bdd5a9; `thrust/system/omp/detail/scan.h`, `testing/scan.cu` and `testing/transform_scan.cu` already match - HIP counterpart: none (no `thrust/system/cuda/` change) - test/ counterpart: `test/test_scan.cpp` / `test/test_transform_scan.cpp` handled when the backport was ported (ad694ae); no further change - Not compiled, tests not run (autonomous no-build mode) Co-Authored-By: Claude <noreply@anthropic.com>
amd-jmahovsky
added a commit
to ROCm/rocm-libraries
that referenced
this pull request
Nov 4, 2026
…l#6560) Upstream: NVIDIA/cccl@bb8a5b9 - already ported — identical to its `branch/3.2.x` backport 26c79caf60e (NVIDIA/cccl#6704; `+`/`-` lines compared, no difference), ported in ad694ae plus parity fix 5bdd5a9; `thrust/system/omp/detail/scan.h`, `testing/scan.cu` and `testing/transform_scan.cu` already match - HIP counterpart: none (no `thrust/system/cuda/` change) - test/ counterpart: `test/test_scan.cpp` / `test/test_transform_scan.cpp` handled when the backport was ported (ad694ae); no further change - Not compiled, tests not run (autonomous no-build mode) 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.
Description
Backport of #6560 to
branch/3.2.x.