Skip to content

Commit be760b0

Browse files
author
Hackathon User
committed
executors: Add is_never_blocking_one_way_executor trait for fork_join_executor
1 parent 5ca80b7 commit be760b0

5 files changed

Lines changed: 11 additions & 8 deletions

File tree

libs/core/executors/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ set(executors_headers
2727
hpx/executors/execution_policy_scheduling_property.hpp
2828
hpx/executors/execution_policy.hpp
2929
hpx/executors/executor_scheduler.hpp
30+
hpx/executors/executor_scheduler_fwd.hpp
3031
hpx/executors/explicit_scheduler_executor.hpp
3132
hpx/executors/fork_join_executor.hpp
32-
hpx/executors/fwd/executor_scheduler_fwd.hpp
3333
hpx/executors/limiting_executor.hpp
3434
hpx/executors/macros.hpp
3535
hpx/executors/parallel_executor_aggregated.hpp

libs/core/executors/include/hpx/executors/executor_scheduler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#pragma once
1010

1111
#include <hpx/config.hpp>
12-
#include <hpx/executors/fwd/executor_scheduler_fwd.hpp>
12+
#include <hpx/executors/executor_scheduler_fwd.hpp>
1313
#include <hpx/modules/errors.hpp>
1414
#include <hpx/modules/execution.hpp>
1515
#include <hpx/modules/execution_base.hpp>

libs/core/executors/include/hpx/executors/fwd/executor_scheduler_fwd.hpp renamed to libs/core/executors/include/hpx/executors/executor_scheduler_fwd.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Distributed under the Boost Software License, Version 1.0. (See accompanying
55
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
66

7-
/// \file parallel/executors/fwd/executor_scheduler_fwd.hpp
7+
/// \file parallel/executors/executor_scheduler_fwd.hpp
88

99
#pragma once
1010

libs/core/executors/include/hpx/executors/fork_join_executor.hpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,8 +1372,6 @@ namespace hpx::execution::experimental {
13721372
return exec.shared_data_->num_threads_;
13731373
}
13741374

1375-
1376-
13771375
/// \cond NOINTERNAL
13781376
enum class init_mode : std::uint8_t
13791377
{
@@ -1388,8 +1386,7 @@ namespace hpx::execution::experimental {
13881386
// executor_scheduler<fork_join_executor> is fully defined at point of use.
13891387
// This allows fork_join_executor to participate in P2300 sender/receiver
13901388
// pipelines via schedule(get_scheduler(exec)).
1391-
inline auto tag_invoke(
1392-
hpx::execution::experimental::get_scheduler_t,
1389+
inline auto tag_invoke(hpx::execution::experimental::get_scheduler_t,
13931390
fork_join_executor const& exec) noexcept
13941391
-> hpx::execution::experimental::executor_scheduler<fork_join_executor>
13951392
{
@@ -1402,6 +1399,12 @@ namespace hpx::execution::experimental {
14021399

14031400
/// \cond NOINTERNAL
14041401

1402+
template <>
1403+
struct is_never_blocking_one_way_executor<fork_join_executor>
1404+
: std::true_type
1405+
{
1406+
};
1407+
14051408
template <>
14061409
struct is_bulk_one_way_executor<fork_join_executor> : std::true_type
14071410
{

libs/core/executors/tests/unit/fork_join_executor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include <hpx/algorithm.hpp>
99
#include <hpx/chrono.hpp>
1010
#include <hpx/execution.hpp>
11-
#include <hpx/executors/executor_scheduler.hpp>
1211
#include <hpx/future.hpp>
1312
#include <hpx/init.hpp>
13+
#include <hpx/modules/executors.hpp>
1414
#include <hpx/modules/testing.hpp>
1515
#include <hpx/thread.hpp>
1616

0 commit comments

Comments
 (0)