Implement remove and remove_if algorithms for datapar execution #6970
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
|
|
||
| *.pyc | ||
| /build | ||
| /build-pr6877 | ||
| .DS_Store | ||
| .gitignore | ||
| .ptp-sync-folder | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| // Copyright (c) 2026 Bhoomish Gupta | ||
| // | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <hpx/config.hpp> | ||
| #include <hpx/modules/execution.hpp> | ||
| #include <hpx/modules/functional.hpp> | ||
| #include <hpx/modules/tag_invoke.hpp> | ||
| #include <hpx/modules/type_support.hpp> | ||
| #include <hpx/parallel/algorithms/detail/find.hpp> | ||
| #include <hpx/parallel/util/loop.hpp> | ||
|
|
||
| #include <iterator> | ||
| #include <type_traits> | ||
| #include <utility> | ||
|
|
||
| namespace hpx::parallel::detail { | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////// | ||
| HPX_CXX_CORE_EXPORT template <typename ExPolicy> | ||
| struct sequential_remove_if_t final | ||
| : hpx::functional::detail::tag_fallback<sequential_remove_if_t<ExPolicy>> | ||
| { | ||
| private: | ||
| template <typename Iter, typename Sent, typename Pred, typename Proj> | ||
| friend constexpr Iter tag_fallback_invoke(sequential_remove_if_t, | ||
| ExPolicy&&, Iter first, Sent last, Pred pred, Proj proj) | ||
| { | ||
| first = hpx::parallel::detail::sequential_find_if<ExPolicy>( | ||
| first, last, pred, proj); | ||
|
|
||
| if (first != last) | ||
| { | ||
| for (Iter i = first; ++i != last;) | ||
| if (!HPX_INVOKE(pred, HPX_INVOKE(proj, *i))) | ||
| { | ||
| *first++ = std::ranges::iter_move(i); | ||
| } | ||
| } | ||
| return first; | ||
| } | ||
| }; | ||
|
|
||
| #if !defined(HPX_COMPUTE_DEVICE_CODE) | ||
| HPX_CXX_CORE_EXPORT template <typename ExPolicy> | ||
| inline constexpr sequential_remove_if_t<ExPolicy> sequential_remove_if = | ||
| sequential_remove_if_t<ExPolicy>{}; | ||
| #else | ||
| HPX_CXX_CORE_EXPORT template <typename ExPolicy, typename... Args> | ||
| HPX_HOST_DEVICE HPX_FORCEINLINE auto sequential_remove_if(Args&&... args) | ||
| { | ||
| return sequential_remove_if_t<ExPolicy>{}(std::forward<Args>(args)...); | ||
| } | ||
| #endif | ||
|
|
||
| /////////////////////////////////////////////////////////////////////////// | ||
| HPX_CXX_CORE_EXPORT template <typename ExPolicy> | ||
| struct sequential_remove_t final | ||
| : hpx::functional::detail::tag_fallback<sequential_remove_t<ExPolicy>> | ||
| { | ||
| private: | ||
| template <typename Iter, typename Sent, typename T, typename Proj> | ||
| friend constexpr Iter tag_fallback_invoke(sequential_remove_t, | ||
| ExPolicy&& policy, Iter first, Sent last, T const& value, Proj proj) | ||
| { | ||
| return sequential_remove_if<ExPolicy>( | ||
| HPX_FORWARD(ExPolicy, policy), first, last, | ||
| [&value](auto const& a) { return value == a; }, proj); | ||
| } | ||
| }; | ||
|
|
||
| #if !defined(HPX_COMPUTE_DEVICE_CODE) | ||
| HPX_CXX_CORE_EXPORT template <typename ExPolicy> | ||
| inline constexpr sequential_remove_t<ExPolicy> sequential_remove = | ||
| sequential_remove_t<ExPolicy>{}; | ||
| #else | ||
| HPX_CXX_CORE_EXPORT template <typename ExPolicy, typename... Args> | ||
| HPX_HOST_DEVICE HPX_FORCEINLINE auto sequential_remove(Args&&... args) | ||
| { | ||
| return sequential_remove_t<ExPolicy>{}(std::forward<Args>(args)...); | ||
| } | ||
| #endif | ||
|
|
||
| } // namespace hpx::parallel::detail | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -555,9 +555,14 @@ namespace hpx::ranges { | |
| hpx::traits::is_iterator_v<FwdIter> && | ||
| std::sentinel_for<Sent, FwdIter> && | ||
| hpx::parallel::traits::is_projected_v<Proj, FwdIter> && | ||
| ( | ||
| hpx::parallel::traits::is_indirect_callable_v<ExPolicy, | ||
| Pred, hpx::parallel::traits::projected<Proj, FwdIter> | ||
| > || | ||
| hpx::is_invocable_v<Pred, | ||
| typename std::iterator_traits<FwdIter>::value_type | ||
| > | ||
| ) | ||
|
Contributor
There was a problem hiding this comment. Can you please explain the rationale of this change?
Contributor
Author
There was a problem hiding this comment. The rationale is to keep the range execution-policy overload aligned with current dispatch behavior in If you prefer stricter behavior for par_simd and related policies, I can tighten this to require only the policy-aware projected callable check and fail early otherwise.
Comment on lines
+558
to
+565
There was a problem hiding this comment. The added |
||
| ) | ||
| // clang-format on | ||
| friend typename parallel::util::detail::algorithm_result<ExPolicy, | ||
|
|
@@ -582,9 +587,16 @@ namespace hpx::ranges { | |
| hpx::is_execution_policy_v<ExPolicy> && | ||
| std::ranges::range<Rng> && | ||
| hpx::parallel::traits::is_projected_range_v<Proj, Rng> && | ||
| ( | ||
| hpx::parallel::traits::is_indirect_callable_v<ExPolicy, | ||
| Pred, hpx::parallel::traits::projected_range<Proj, Rng> | ||
| > || | ||
| hpx::is_invocable_v<Pred, | ||
| typename std::iterator_traits< | ||
| std::ranges::iterator_t<Rng> | ||
| >::value_type | ||
| > | ||
| ) | ||
| ) | ||
| // clang-format on | ||
| friend parallel::util::detail::algorithm_result_t<ExPolicy, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |
| #include <hpx/parallel/datapar/loop.hpp> | ||
| #include <hpx/parallel/datapar/mismatch.hpp> | ||
| #include <hpx/parallel/datapar/reduce.hpp> | ||
| #include <hpx/parallel/datapar/remove.hpp> | ||
| #include <hpx/parallel/datapar/replace.hpp> | ||
| #include <hpx/parallel/datapar/search.hpp> | ||
| #include <hpx/parallel/datapar/transfer.hpp> | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
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.
sequential_remove_if_tmoves elements with*first++ = HPX_MOVE(*i), which bypassesstd::ranges::iter_moveand can break for proxy/reference-like iterators (e.g.vector<bool>::iterator) and generally diverges from the previous implementation inremove.hppthat usedstd::ranges::iter_move(i). Usestd::ranges::iter_move(i)(and/orstd::ranges::iter_move/iter_swap-style primitives) for the move source to preserve iterator semantics.