Skip to content

Drop Thrust mpl math - #5897

Merged
bernhardmgruber merged 8 commits into
NVIDIA:mainfrom
bernhardmgruber:drop_mpl_math
Sep 18, 2025
Merged

bernhardmgruber merged 8 commits into
NVIDIA:mainfrom
bernhardmgruber:drop_mpl_math

Conversation

@bernhardmgruber

Copy link
Copy Markdown
Contributor

No description provided.

@bernhardmgruber
bernhardmgruber requested a review from a team as a code owner September 16, 2025 16:04
@github-project-automation github-project-automation Bot moved this to Todo in CCCL Sep 16, 2025
@cccl-authenticator-app cccl-authenticator-app Bot moved this from Todo to In Review in CCCL Sep 16, 2025
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@bernhardmgruber
bernhardmgruber enabled auto-merge (squash) September 18, 2025 21:03
@github-actions

Copy link
Copy Markdown
Contributor

🥳 CI Workflow Results

🟩 Finished in 3h 36m: Pass: 100%/159 | Total: 6d 04h | Max: 3h 34m | Hits: 70%/186335

See results here.

@bernhardmgruber
bernhardmgruber merged commit bb71851 into NVIDIA:main Sep 18, 2025
@github-project-automation github-project-automation Bot moved this from In Review to Done in CCCL Sep 18, 2025
@bernhardmgruber
bernhardmgruber deleted the drop_mpl_math branch September 19, 2025 08:02
pciolkosz pushed a commit to pciolkosz/cccl that referenced this pull request Sep 24, 2025
Naraenda pushed a commit to ROCm/rocm-libraries that referenced this pull request Oct 26, 2026
…/cccl#5897)

Upstream: NVIDIA/cccl@bb71851

- `git rm thrust/detail/mpl/math.h`.
- xor_combine_engine_max.h was rewritten to constexpr functions, using `_THRUST_STD` spelling. Its conflict came from the local include block; I used a single `_THRUST_STD_INCLUDE(algorithm)` in place of the `__algorithm/max.h`/`min.h` detail headers, which the `::std` fallback does not have.
- system/cuda reduce_by_key/set_operations: mpl::min/max replaced by `::cuda::std::min/max` (conflict 1, took upstream). Dropped the unused mpl/math.h includes from scan_by_key/unique_by_key.
- HIP counterpart: removed the unused `#include <thrust/detail/mpl/math.h>` from system/hip/detail/{scan_by_key,set_operations,unique_by_key}.h. No mpl::math uses remained.
- test/ counterpart: git mv `test/test_metaprogramming.cpp` -> `test/test_xor_combine_engine_max.cpp`. It now has `TEST(XorCombineEngineMaxTests, TestLog2)` as static_asserts on `thrust::random::detail::log2`. The CMake registration "metaprogramming" was replaced by "xor_combine_engine_max".
- testing/ counterpart: `git rm testing/metaprogramming.cu` and added upstream `testing/xor_combine_engine_max.cu`. Updated testing/CMakeLists.txt to match.
- 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
…des in xor_combine_engine_max

Related upstream commit: bb718514624 Drop Thrust mpl math (NVIDIA/cccl#5897)
Related local port commit: 1a7094e

Include _THRUST_STD_INCLUDE(__algorithm/max.h) and __algorithm/min.h instead of the
<algorithm> and <type_traits> umbrella headers, as upstream (both granular headers exist in
libhipcxx, which is now mandatory). The host <cstddef> include is kept for the unqualified size_t.

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
…/cccl#5897)

Upstream: NVIDIA/cccl@bb71851

- `git rm thrust/detail/mpl/math.h`.
- xor_combine_engine_max.h was rewritten to constexpr functions, using `_THRUST_STD` spelling. Its conflict came from the local include block; I used a single `_THRUST_STD_INCLUDE(algorithm)` in place of the `__algorithm/max.h`/`min.h` detail headers, which the `::std` fallback does not have.
- system/cuda reduce_by_key/set_operations: mpl::min/max replaced by `::cuda::std::min/max` (conflict 1, took upstream). Dropped the unused mpl/math.h includes from scan_by_key/unique_by_key.
- HIP counterpart: removed the unused `#include <thrust/detail/mpl/math.h>` from system/hip/detail/{scan_by_key,set_operations,unique_by_key}.h. No mpl::math uses remained.
- test/ counterpart: git mv `test/test_metaprogramming.cpp` -> `test/test_xor_combine_engine_max.cpp`. It now has `TEST(XorCombineEngineMaxTests, TestLog2)` as static_asserts on `thrust::random::detail::log2`. The CMake registration "metaprogramming" was replaced by "xor_combine_engine_max".
- testing/ counterpart: `git rm testing/metaprogramming.cu` and added upstream `testing/xor_combine_engine_max.cu`. Updated testing/CMakeLists.txt to match.
- 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
…/cccl#5897)

Upstream: NVIDIA/cccl@bb71851

- `git rm thrust/detail/mpl/math.h`.
- xor_combine_engine_max.h was rewritten to constexpr functions, using `_THRUST_STD` spelling. Its conflict came from the local include block; I used a single `_THRUST_STD_INCLUDE(algorithm)` in place of the `__algorithm/max.h`/`min.h` detail headers, which the `::std` fallback does not have.
- system/cuda reduce_by_key/set_operations: mpl::min/max replaced by `::cuda::std::min/max` (conflict 1, took upstream). Dropped the unused mpl/math.h includes from scan_by_key/unique_by_key.
- HIP counterpart: removed the unused `#include <thrust/detail/mpl/math.h>` from system/hip/detail/{scan_by_key,set_operations,unique_by_key}.h. No mpl::math uses remained.
- test/ counterpart: git mv `test/test_metaprogramming.cpp` -> `test/test_xor_combine_engine_max.cpp`. It now has `TEST(XorCombineEngineMaxTests, TestLog2)` as static_asserts on `thrust::random::detail::log2`. The CMake registration "metaprogramming" was replaced by "xor_combine_engine_max".
- testing/ counterpart: `git rm testing/metaprogramming.cu` and added upstream `testing/xor_combine_engine_max.cu`. Updated testing/CMakeLists.txt to match.
- 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
…des in xor_combine_engine_max

Related upstream commit: bb718514624 Drop Thrust mpl math (NVIDIA/cccl#5897)
Related local port commit: 1a7094e

Include _THRUST_STD_INCLUDE(__algorithm/max.h) and __algorithm/min.h instead of the
<algorithm> and <type_traits> umbrella headers, as upstream (both granular headers exist in
libhipcxx, which is now mandatory). The host <cstddef> include is kept for the unqualified size_t.

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
…/cccl#5897)

Upstream: NVIDIA/cccl@bb71851

- `git rm thrust/detail/mpl/math.h`.
- xor_combine_engine_max.h was rewritten to constexpr functions, using `_THRUST_STD` spelling. Its conflict came from the local include block; I used a single `_THRUST_STD_INCLUDE(algorithm)` in place of the `__algorithm/max.h`/`min.h` detail headers, which the `::std` fallback does not have.
- system/cuda reduce_by_key/set_operations: mpl::min/max replaced by `::cuda::std::min/max` (conflict 1, took upstream). Dropped the unused mpl/math.h includes from scan_by_key/unique_by_key.
- HIP counterpart: removed the unused `#include <thrust/detail/mpl/math.h>` from system/hip/detail/{scan_by_key,set_operations,unique_by_key}.h. No mpl::math uses remained.
- test/ counterpart: git mv `test/test_metaprogramming.cpp` -> `test/test_xor_combine_engine_max.cpp`. It now has `TEST(XorCombineEngineMaxTests, TestLog2)` as static_asserts on `thrust::random::detail::log2`. The CMake registration "metaprogramming" was replaced by "xor_combine_engine_max".
- testing/ counterpart: `git rm testing/metaprogramming.cu` and added upstream `testing/xor_combine_engine_max.cu`. Updated testing/CMakeLists.txt to match.
- 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
…/cccl#5897)

Upstream: NVIDIA/cccl@bb71851

- `git rm thrust/detail/mpl/math.h`.
- xor_combine_engine_max.h was rewritten to constexpr functions, using `_THRUST_STD` spelling. Its conflict came from the local include block; I used a single `_THRUST_STD_INCLUDE(algorithm)` in place of the `__algorithm/max.h`/`min.h` detail headers, which the `::std` fallback does not have.
- system/cuda reduce_by_key/set_operations: mpl::min/max replaced by `::cuda::std::min/max` (conflict 1, took upstream). Dropped the unused mpl/math.h includes from scan_by_key/unique_by_key.
- HIP counterpart: removed the unused `#include <thrust/detail/mpl/math.h>` from system/hip/detail/{scan_by_key,set_operations,unique_by_key}.h. No mpl::math uses remained.
- test/ counterpart: git mv `test/test_metaprogramming.cpp` -> `test/test_xor_combine_engine_max.cpp`. It now has `TEST(XorCombineEngineMaxTests, TestLog2)` as static_asserts on `thrust::random::detail::log2`. The CMake registration "metaprogramming" was replaced by "xor_combine_engine_max".
- testing/ counterpart: `git rm testing/metaprogramming.cu` and added upstream `testing/xor_combine_engine_max.cu`. Updated testing/CMakeLists.txt to match.
- 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
…des in xor_combine_engine_max

Related upstream commit: bb718514624 Drop Thrust mpl math (NVIDIA/cccl#5897)
Related local port commit: 1a7094e

Include _THRUST_STD_INCLUDE(__algorithm/max.h) and __algorithm/min.h instead of the
<algorithm> and <type_traits> umbrella headers, as upstream (both granular headers exist in
libhipcxx, which is now mandatory). The host <cstddef> include is kept for the unqualified size_t.

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

Development

Successfully merging this pull request may close these issues.

2 participants