Skip to content

Commit 95a4471

Browse files
author
Thomas Heller
committed
Removing async splits.
1 parent 2c7c233 commit 95a4471

1 file changed

Lines changed: 6 additions & 31 deletions

File tree

‎allscale/detail/work_item_impl.hpp‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -462,20 +462,8 @@ namespace allscale { namespace detail {
462462
hpx::future<std::size_t>
463463
>::type split(bool sync, hpx::util::tuple<> && reqs, std::size_t this_id)
464464
{
465-
if (sync && id().last() % 2 == 1)
466-
{
467-
do_split(std::move(reqs));
468-
return hpx::make_ready_future(std::size_t(-2));
469-
}
470-
else
471-
{
472-
auto this_ = shared_this();
473-
return hpx::async([this_ = std::move(this_)]()
474-
{
475-
this_->do_split(hpx::util::tuple<>());
476-
return std::size_t(-2);
477-
});
478-
}
465+
do_split(std::move(reqs));
466+
return hpx::make_ready_future(std::size_t(-2));
479467
}
480468

481469
template <typename WorkItemDescription_, typename Reqs>
@@ -527,26 +515,13 @@ namespace allscale { namespace detail {
527515
, data_item_manager::acquire(reqs, infos));
528516
}, "allscale::work_item::spli::locate_cont");
529517

530-
if (sync && id().last() % 2 == 1)
531-
{
532-
return hpx::dataflow(hpx::launch::sync, std::move(continuation),
518+
return hpx::dataflow(hpx::launch::sync, std::move(continuation),
533519
#if defined(ALLSCALE_DEBUG_DIM)
534-
data_item_manager::locate(std::move(s), std::forward<Reqs>(reqs))
520+
data_item_manager::locate(std::move(s), std::forward<Reqs>(reqs))
535521
#else
536-
data_item_manager::locate(std::forward<Reqs>(reqs))
522+
data_item_manager::locate(std::forward<Reqs>(reqs))
537523
#endif
538-
);
539-
}
540-
else
541-
{
542-
return hpx::dataflow(std::move(continuation),
543-
#if defined(ALLSCALE_DEBUG_DIM)
544-
data_item_manager::locate(std::move(s), std::forward<Reqs>(reqs))
545-
#else
546-
data_item_manager::locate(std::forward<Reqs>(reqs))
547-
#endif
548-
);
549-
}
524+
);
550525
}
551526

552527
template <typename WorkItemDescription_>

0 commit comments

Comments
 (0)