Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simd all any none #5638

Merged
merged 12 commits into from
Nov 12, 2021
Merged

Simd all any none #5638

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9fc6a6b
Convert loop_idx_n to CPO
Nov 10, 2021
c15e852
Adapt new vector_pack traits
Nov 10, 2021
84babab
Adapt tokenized loops and loop_idx_n for datapar
Nov 10, 2021
8901eb9
Convert existing find helper functions to CPOs
Nov 10, 2021
fa192b5
Simplify datapar iterator helpers and added new facilites
Nov 10, 2021
7e6a56d
Adapt datapar all any non
Nov 10, 2021
a28599f
Split all any none tests into header and source.
Nov 10, 2021
8cf9c6a
Adapt datapar all any none unit tests
Nov 10, 2021
4c7b98b
Replace std::size_t with int for Vc datapar tests
Nov 10, 2021
4c49fff
Fixes from CIRCLE CI Inspect
Nov 10, 2021
0a33a9f
Remove constexpr for datapar CPOs
Nov 11, 2021
90195f6
Adapt new vector_pack traits for datapar Vc
Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libs/core/algorithms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ set(algorithms_headers
hpx/parallel/container_numeric.hpp
hpx/parallel/datapar.hpp
hpx/parallel/datapar/fill.hpp
hpx/parallel/datapar/find.hpp
hpx/parallel/datapar/generate.hpp
hpx/parallel/datapar/adjacent_difference.hpp
hpx/parallel/datapar/iterator_helpers.hpp
Expand Down
3 changes: 2 additions & 1 deletion libs/core/algorithms/include/hpx/parallel/algorithms/adjacent_find.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ namespace hpx { namespace parallel { inline namespace v1 {
auto f1 = [pred_projected = std::move(pred_projected), tok](
zip_iterator it, std::size_t part_size,
std::size_t base_idx) mutable {
util::loop_idx_n(base_idx, it, part_size, tok,
util::loop_idx_n<std::decay_t<ExPolicy>>(base_idx, it,
part_size, tok,
[&pred_projected, &tok](reference t, std::size_t i) {
using hpx::get;
if (pred_projected(get<0>(t), get<1>(t)))
Expand Down
48 changes: 18 additions & 30 deletions libs/core/algorithms/include/hpx/parallel/algorithms/all_any_none.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ namespace hpx { namespace parallel { inline namespace v1 {
static bool sequential(
ExPolicy, Iter first, Sent last, F&& f, Proj&& proj)
{
return detail::sequential_find_if(first, last,
return detail::sequential_find_if<ExPolicy>(first, last,
util::invoke_projected<F, Proj>(std::forward<F>(f),
std::forward<Proj>(proj))) == last;
}
Expand All @@ -292,14 +292,9 @@ namespace hpx { namespace parallel { inline namespace v1 {
proj = std::forward<Proj>(proj)](
FwdIter part_begin,
std::size_t part_count) mutable -> bool {
util::loop_n<std::decay_t<ExPolicy>>(part_begin, part_count,
tok, [&op, &tok, &proj](FwdIter const& curr) {
if (hpx::util::invoke(
op, hpx::util::invoke(proj, *curr)))
{
tok.cancel();
}
});
detail::sequential_find_if<std::decay_t<ExPolicy>>(
part_begin, part_count, tok, std::forward<F>(op),
std::forward<Proj>(proj));

return !tok.was_cancelled();
};
Expand All @@ -308,7 +303,8 @@ namespace hpx { namespace parallel { inline namespace v1 {
std::forward<ExPolicy>(policy), first,
detail::distance(first, last), std::move(f1),
[](std::vector<hpx::future<bool>>&& results) {
return detail::sequential_find_if_not(
return detail::sequential_find_if_not<
hpx::execution::sequenced_policy>(
hpx::util::begin(results),
hpx::util::end(results),
[](hpx::future<bool>& val) {
Expand Down Expand Up @@ -369,7 +365,7 @@ namespace hpx { namespace parallel { inline namespace v1 {
static bool sequential(
ExPolicy, Iter first, Sent last, F&& f, Proj&& proj)
{
return detail::sequential_find_if(first, last,
return detail::sequential_find_if<ExPolicy>(first, last,
util::invoke_projected<F, Proj>(std::forward<F>(f),
std::forward<Proj>(proj))) != last;
}
Expand All @@ -391,14 +387,9 @@ namespace hpx { namespace parallel { inline namespace v1 {
proj = std::forward<Proj>(proj)](
FwdIter part_begin,
std::size_t part_count) mutable -> bool {
util::loop_n<std::decay_t<ExPolicy>>(part_begin, part_count,
tok, [&op, &tok, &proj](FwdIter const& curr) {
if (hpx::util::invoke(
op, hpx::util::invoke(proj, *curr)))
{
tok.cancel();
}
});
detail::sequential_find_if<std::decay_t<ExPolicy>>(
part_begin, part_count, tok, std::forward<F>(op),
std::forward<Proj>(proj));

return tok.was_cancelled();
};
Expand All @@ -407,7 +398,8 @@ namespace hpx { namespace parallel { inline namespace v1 {
std::forward<ExPolicy>(policy), first,
detail::distance(first, last), std::move(f1),
[](std::vector<hpx::future<bool>>&& results) {
return detail::sequential_find_if(
return detail::sequential_find_if<
hpx::execution::sequenced_policy>(
hpx::util::begin(results),
hpx::util::end(results),
[](hpx::future<bool>& val) {
Expand Down Expand Up @@ -468,7 +460,7 @@ namespace hpx { namespace parallel { inline namespace v1 {
static bool sequential(
ExPolicy, Iter first, Sent last, F&& f, Proj&& proj)
{
return detail::sequential_find_if_not(first, last,
return detail::sequential_find_if_not<ExPolicy>(first, last,
std::forward<F>(f),
std::forward<Proj>(proj)) == last;
}
Expand All @@ -490,14 +482,9 @@ namespace hpx { namespace parallel { inline namespace v1 {
proj = std::forward<Proj>(proj)](
FwdIter part_begin,
std::size_t part_count) mutable -> bool {
util::loop_n<std::decay_t<ExPolicy>>(part_begin, part_count,
tok, [&op, &tok, &proj](FwdIter const& curr) {
if (!hpx::util::invoke(
op, hpx::util::invoke(proj, *curr)))
{
tok.cancel();
}
});
detail::sequential_find_if_not<std::decay_t<ExPolicy>>(
part_begin, part_count, tok, std::forward<F>(op),
std::forward<Proj>(proj));

return !tok.was_cancelled();
};
Expand All @@ -506,7 +493,8 @@ namespace hpx { namespace parallel { inline namespace v1 {
std::forward<ExPolicy>(policy), first,
detail::distance(first, last), std::move(f1),
[](std::vector<hpx::future<bool>>&& results) {
return detail::sequential_find_if_not(
return detail::sequential_find_if_not<
hpx::execution::sequenced_policy>(
hpx::util::begin(results),
hpx::util::end(results),
[](hpx::future<bool>& val) {
Expand Down
Loading