Stop-gap measure to make execution parameters compile for thread-exec…

…utors - adding missing #includes
STEllAR-GROUP · Oct 2, 2017 · fed3fea · fed3fea
1 parent b037eab
commit fed3fea
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git a/hpx/parallel/execution.hpp b/hpx/parallel/execution.hpp
@@ -8,12 +8,13 @@
 
 #include <hpx/parallel/executors.hpp>
 #include <hpx/parallel/executors/execution.hpp>
-#include <hpx/parallel/executors/thread_execution.hpp>
-#include <hpx/parallel/executors/timed_execution.hpp>
-#include <hpx/parallel/executors/thread_timed_execution.hpp>
 #include <hpx/parallel/executors/execution_information.hpp>
-#include <hpx/parallel/executors/thread_execution_information.hpp>
 #include <hpx/parallel/executors/execution_parameters.hpp>
+#include <hpx/parallel/executors/thread_execution.hpp>
+#include <hpx/parallel/executors/thread_execution_information.hpp>
+#include <hpx/parallel/executors/thread_execution_parameters.hpp>
+#include <hpx/parallel/executors/thread_timed_execution.hpp>
+#include <hpx/parallel/executors/timed_execution.hpp>
 
 #endif
 
diff --git a/hpx/parallel/executors/default_executor.hpp b/hpx/parallel/executors/default_executor.hpp
@@ -11,6 +11,7 @@
 #include <hpx/config.hpp>
 #include <hpx/parallel/executors/thread_execution.hpp>
 #include <hpx/parallel/executors/thread_execution_information.hpp>
+#include <hpx/parallel/executors/thread_execution_parameters.hpp>
 #include <hpx/parallel/executors/thread_timed_execution.hpp>
 #include <hpx/runtime/threads/executors/default_executor.hpp>
 

diff --git a/hpx/parallel/executors/execution_parameters.hpp b/hpx/parallel/executors/execution_parameters.hpp
@@ -14,6 +14,7 @@
 #include <hpx/runtime/serialization/base_object.hpp>
 #include <hpx/traits/detail/wrap_int.hpp>
 #include <hpx/traits/has_member_xxx.hpp>
+#include <hpx/traits/is_executor.hpp>
 #include <hpx/traits/is_executor_parameters.hpp>
 #include <hpx/util/decay.hpp>
 #include <hpx/util/detail/pack.hpp>
@@ -132,8 +133,11 @@ namespace hpx { namespace parallel { namespace execution
 
         ///////////////////////////////////////////////////////////////////////
         // customization point for interface reset_thread_distribution()
-        template <typename Parameters, typename Enable>
-        struct reset_thread_distribution_fn_helper
+        template <typename Parameters, typename Executor_>
+        struct reset_thread_distribution_fn_helper<Parameters, Executor_,
+            typename std::enable_if<
+                hpx::traits::is_executor_any<Executor_>::value
+            >::type>
         {
             template <typename AnyParameters, typename Executor>
             HPX_FORCEINLINE static void call(

diff --git a/hpx/parallel/executors/execution_parameters_fwd.hpp b/hpx/parallel/executors/execution_parameters_fwd.hpp
@@ -93,7 +93,7 @@ namespace hpx { namespace parallel { namespace execution
         template <typename Parameters, typename Enable = void>
         struct maximal_number_of_chunks_fn_helper;
 
-        template <typename Parameters, typename Enable = void>
+        template <typename Parameters, typename Executor, typename Enable = void>
         struct reset_thread_distribution_fn_helper;
 
         template <typename Parameters, typename Enable = void>
@@ -210,12 +210,14 @@ namespace hpx { namespace parallel { namespace execution
         HPX_FORCEINLINE auto
         reset_thread_distribution(Parameters&& params, Executor&& exec)
         -> decltype(reset_thread_distribution_fn_helper<
-                    typename hpx::util::decay_unwrap<Parameters>::type
+                    typename hpx::util::decay_unwrap<Parameters>::type,
+                    typename hpx::util::decay_unwrap<Executor>::type
                 >::call(std::forward<Parameters>(params),
                         std::forward<Executor>(exec)))
         {
             return reset_thread_distribution_fn_helper<
-                    typename hpx::util::decay_unwrap<Parameters>::type
+                    typename hpx::util::decay_unwrap<Parameters>::type,
+                    typename hpx::util::decay_unwrap<Executor>::type
                 >::call(std::forward<Parameters>(params),
                         std::forward<Executor>(exec));
         }

diff --git a/hpx/parallel/executors/this_thread_executors.hpp b/hpx/parallel/executors/this_thread_executors.hpp
@@ -9,6 +9,7 @@
 #include <hpx/config.hpp>
 #include <hpx/parallel/executors/thread_execution.hpp>
 #include <hpx/parallel/executors/thread_execution_information.hpp>
+#include <hpx/parallel/executors/thread_execution_parameters.hpp>
 #include <hpx/parallel/executors/thread_timed_execution.hpp>
 #include <hpx/runtime/threads/executors/this_thread_executors.hpp>
 

diff --git a/hpx/parallel/executors/thread_execution_parameters.hpp b/hpx/parallel/executors/thread_execution_parameters.hpp
@@ -5,12 +5,13 @@
 
 /// \file parallel/executors/thread_execution_parameters.hpp
 
-#if !defined(HPX_PARALLEL_THREAD_EXECUTOR_PARAMETER_TRAITS_AUG_26_2015_1204PM)
-#define HPX_PARALLEL_THREAD_EXECUTOR_PARAMETER_TRAITS_AUG_26_2015_1204PM
+#if !defined(HPX_PARALLEL_THREAD_EXECUTION_PARAMETER_TRAITS_AUG_26_2015_1204PM)
+#define HPX_PARALLEL_THREAD_EXECUTION_PARAMETER_TRAITS_AUG_26_2015_1204PM
 
 #include <hpx/config.hpp>
 #include <hpx/runtime/threads/thread_executor.hpp>
 #include <hpx/traits/is_executor_parameters.hpp>
+#include <hpx/traits/is_launch_policy.hpp>
 
 #include <hpx/parallel/executors/execution_parameters.hpp>
 

diff --git a/hpx/parallel/executors/thread_pool_attached_executors.hpp b/hpx/parallel/executors/thread_pool_attached_executors.hpp
@@ -11,6 +11,7 @@
 #include <hpx/config.hpp>
 #include <hpx/parallel/executors/thread_execution.hpp>
 #include <hpx/parallel/executors/thread_execution_information.hpp>
+#include <hpx/parallel/executors/thread_execution_parameters.hpp>
 #include <hpx/parallel/executors/thread_timed_execution.hpp>
 #include <hpx/runtime/threads/executors/thread_pool_attached_executors.hpp>
 

diff --git a/hpx/parallel/executors/thread_pool_executors.hpp b/hpx/parallel/executors/thread_pool_executors.hpp
@@ -11,6 +11,7 @@
 #include <hpx/config.hpp>
 #include <hpx/parallel/executors/thread_execution.hpp>
 #include <hpx/parallel/executors/thread_execution_information.hpp>
+#include <hpx/parallel/executors/thread_execution_parameters.hpp>
 #include <hpx/parallel/executors/thread_timed_execution.hpp>
 #include <hpx/runtime/threads/executors/thread_pool_executors.hpp>
 

diff --git a/hpx/parallel/executors/thread_pool_os_executors.hpp b/hpx/parallel/executors/thread_pool_os_executors.hpp
@@ -11,6 +11,7 @@
 #include <hpx/config.hpp>
 #include <hpx/parallel/executors/thread_execution.hpp>
 #include <hpx/parallel/executors/thread_execution_information.hpp>
+#include <hpx/parallel/executors/thread_execution_parameters.hpp>
 #include <hpx/parallel/executors/thread_timed_execution.hpp>
 #include <hpx/runtime/threads/executors/thread_pool_os_executors.hpp>