Merge branch 'master' into add_checkpoint

STEllAR-GROUP · Oct 4, 2017 · a66e4d7 · a66e4d7
2 parents b24042b + 9f1c7d8
commit a66e4d7
Show file tree

Hide file tree

Showing 67 changed files with 1,033 additions and 416 deletions.
diff --git a/examples/resource_partitioner/oversubscribing_resource_partitioner.cpp b/examples/resource_partitioner/oversubscribing_resource_partitioner.cpp
@@ -11,7 +11,7 @@
 //
 #include <hpx/runtime/resource/partitioner.hpp>
 #include <hpx/runtime/threads/cpu_mask.hpp>
-#include <hpx/runtime/threads/executors/customized_pool_executors.hpp>
+#include <hpx/runtime/threads/executors/pool_executor.hpp>
 #include <hpx/runtime/threads/detail/scheduled_thread_pool_impl.hpp>
 //
 #include <hpx/include/iostreams.hpp>
@@ -95,7 +95,7 @@ int hpx_main(boost::program_options::variables_map& vm)
     if (use_pools)
     {
         // get executors
-        hpx::threads::executors::customized_pool_executor mpi_exec("mpi");
+        hpx::threads::executors::pool_executor mpi_exec("mpi");
         mpi_executor = mpi_exec;
         hpx::cout << "\n[hpx_main] got mpi executor " << std::endl;
     }

diff --git a/examples/resource_partitioner/simple_resource_partitioner.cpp b/examples/resource_partitioner/simple_resource_partitioner.cpp
@@ -12,7 +12,7 @@
 #include <hpx/runtime/resource/partitioner.hpp>
 #include <hpx/runtime/threads/cpu_mask.hpp>
 #include <hpx/runtime/threads/detail/scheduled_thread_pool_impl.hpp>
-#include <hpx/runtime/threads/executors/customized_pool_executors.hpp>
+#include <hpx/runtime/threads/executors/pool_executor.hpp>
 //
 #include <hpx/include/iostreams.hpp>
 #include <hpx/include/runtime.hpp>
@@ -95,7 +95,7 @@ int hpx_main(boost::program_options::variables_map& vm)
     if (use_pools)
     {
         // get executors
-        hpx::threads::executors::customized_pool_executor mpi_exec("mpi");
+        hpx::threads::executors::pool_executor mpi_exec("mpi");
         mpi_executor = mpi_exec;
         hpx::cout << "\n[hpx_main] got mpi executor " << std::endl;
     }

diff --git a/hpx/compute/cuda/concurrent_executor.hpp b/hpx/compute/cuda/concurrent_executor.hpp
@@ -199,7 +199,7 @@ namespace hpx { namespace compute { namespace cuda
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     template <typename Executor>
     struct executor_execution_category<
@@ -231,7 +231,7 @@ namespace hpx { namespace traits
         compute::cuda::concurrent_executor<Executor> >
       : std::true_type
     {};
-}}
+}}}
 
 #endif
 #endif
diff --git a/hpx/compute/cuda/concurrent_executor_parameters.hpp b/hpx/compute/cuda/concurrent_executor_parameters.hpp
@@ -27,13 +27,13 @@ namespace hpx { namespace compute { namespace cuda
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     template <>
     struct is_executor_parameters<compute::cuda::concurrent_executor_parameters>
       : std::true_type
     {};
-}}
+}}}
 
 #endif
 #endif
diff --git a/hpx/compute/cuda/default_executor.hpp b/hpx/compute/cuda/default_executor.hpp
@@ -230,7 +230,7 @@ namespace hpx { namespace compute { namespace cuda
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     template <>
     struct executor_execution_category<compute::cuda::default_executor>
@@ -257,7 +257,7 @@ namespace hpx { namespace traits
     struct is_bulk_two_way_executor<compute::cuda::default_executor>
       : std::true_type
     {};
-}}
+}}}
 
 #endif
 #endif
diff --git a/hpx/compute/cuda/default_executor_parameters.hpp b/hpx/compute/cuda/default_executor_parameters.hpp
@@ -28,13 +28,13 @@ namespace hpx { namespace compute { namespace cuda
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     template <>
     struct is_executor_parameters<compute::cuda::default_executor_parameters>
       : std::true_type
     {};
-}}
+}}}
 
 #endif
 #endif
diff --git a/hpx/compute/cuda/target.hpp b/hpx/compute/cuda/target.hpp
@@ -188,13 +188,12 @@ namespace hpx { namespace compute { namespace cuda
         }
 
     private:
+#if !defined(HPX_COMPUTE_DEVICE_CODE)
         friend class hpx::serialization::access;
 
-        template <typename Archive>
-        void serialize(Archive& ar, const unsigned int version)
-        {
-            ar & handle_.device_ & locality_;
-        }
+        void serialize(serialization::input_archive& ar, const unsigned int);
+        void serialize(serialization::output_archive& ar, const unsigned int);
+#endif
 
         native_handle_type handle_;
         hpx::id_type locality_;

diff --git a/hpx/compute/host/block_executor.hpp b/hpx/compute/host/block_executor.hpp
@@ -244,7 +244,7 @@ namespace hpx { namespace compute { namespace host
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     template <typename Executor>
     struct executor_execution_category<
@@ -276,6 +276,6 @@ namespace hpx { namespace traits
             compute::host::block_executor<Executor> >
       : std::true_type
     {};
-}}
+}}}
 
 #endif
diff --git a/hpx/compute/host/default_executor.hpp b/hpx/compute/host/default_executor.hpp
@@ -74,7 +74,7 @@ namespace hpx { namespace compute { namespace host
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     template <>
     struct executor_execution_category<compute::host::default_executor>
@@ -101,6 +101,6 @@ namespace hpx { namespace traits
     struct is_bulk_two_way_executor<compute::host::default_executor>
       : std::true_type
     {};
-}}
+}}}
 
 #endif
diff --git a/hpx/compute/host/target.hpp b/hpx/compute/host/target.hpp
@@ -120,11 +120,8 @@ namespace hpx { namespace compute { namespace host
     private:
         friend class hpx::serialization::access;
 
-        template <typename Archive>
-        void serialize(Archive& ar, const unsigned int version)
-        {
-            ar & handle_.mask_ & locality_;
-        }
+        void serialize(serialization::input_archive& ar, const unsigned int);
+        void serialize(serialization::output_archive& ar, const unsigned int);
 
         native_handle_type handle_;
         hpx::id_type locality_;

diff --git a/hpx/parallel/algorithms/detail/dispatch.hpp b/hpx/parallel/algorithms/detail/dispatch.hpp
@@ -106,10 +106,13 @@ namespace hpx { namespace parallel { inline namespace v1 { namespace detail
                 typedef typename
                     hpx::util::decay<ExPolicy>::type::executor_parameters_type
                     parameters_type;
+                typedef typename
+                    hpx::util::decay<ExPolicy>::type::executor_type
+                    executor_type;
 
-                parallel::util::detail::scoped_executor_parameters<
-                        parameters_type
-                    > scoped_param(policy.parameters());
+                parallel::util::detail::scoped_executor_parameters_ref<
+                        parameters_type, executor_type
+                    > scoped_param(policy.parameters(), policy.executor());
 
                 return parallel::util::detail::algorithm_result<
                         ExPolicy, local_result_type

diff --git a/hpx/parallel/execution.hpp b/hpx/parallel/execution.hpp
@@ -8,12 +8,12 @@
 
 #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_timed_execution.hpp>
+#include <hpx/parallel/executors/timed_execution.hpp>
 
 #endif
 
diff --git a/hpx/parallel/executors/auto_chunk_size.hpp b/hpx/parallel/executors/auto_chunk_size.hpp
@@ -100,15 +100,15 @@ namespace hpx { namespace parallel { namespace execution
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     /// \cond NOINTERNAL
     template <>
     struct is_executor_parameters<parallel::execution::auto_chunk_size>
         : std::true_type
     {};
     /// \endcond
-}}
+}}}
 
 #if defined(HPX_HAVE_EXECUTOR_COMPATIBILITY)
 

diff --git a/hpx/parallel/executors/default_executor.hpp b/hpx/parallel/executors/default_executor.hpp
@@ -9,6 +9,7 @@
 #define HPX_PARALLEL_EXECUTORS_DEFAULT_EXECUTOR_AUG_24_2015_0624PM
 
 #include <hpx/config.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_timed_execution.hpp>

diff --git a/hpx/parallel/executors/distribution_policy_executor.hpp b/hpx/parallel/executors/distribution_policy_executor.hpp
@@ -193,18 +193,15 @@ namespace hpx { namespace parallel { namespace execution
         return distribution_policy_executor<dist_policy_type>(
             std::forward<DistPolicy>(policy));
     }
-}}}
 
-namespace hpx { namespace traits
-{
     /// \cond NOINTERNAL
     template <typename DistPolicy>
     struct is_two_way_executor<
             parallel::execution::distribution_policy_executor<DistPolicy> >
       : std::true_type
     {};
     /// \endcond
-}}
+}}}
 
 #if defined(HPX_HAVE_EXECUTOR_COMPATIBILITY)
 #include <hpx/traits/v1/is_executor.hpp>

diff --git a/hpx/parallel/executors/dynamic_chunk_size.hpp b/hpx/parallel/executors/dynamic_chunk_size.hpp
@@ -65,15 +65,15 @@ namespace hpx { namespace parallel { namespace execution
     };
 }}}
 
-namespace hpx { namespace traits
+namespace hpx { namespace parallel { namespace execution
 {
     /// \cond NOINTERNAL
     template <>
     struct is_executor_parameters<parallel::execution::dynamic_chunk_size>
         : std::true_type
     {};
     /// \endcond
-}}
+}}}
 
 #if defined(HPX_HAVE_EXECUTOR_COMPATIBILITY)
 

diff --git a/hpx/parallel/executors/execution_information.hpp b/hpx/parallel/executors/execution_information.hpp
@@ -31,8 +31,9 @@ namespace hpx { namespace threads
 namespace hpx { namespace parallel { inline namespace v3 { namespace detail
 {
     /// \cond NOINTERNAL
-    template <typename Parameters>
-    std::size_t call_processing_units_parameter_count(Parameters && params);
+    template <typename Parameters, typename Executor>
+    std::size_t call_processing_units_parameter_count(Parameters && params,
+        Executor && exec);
     /// \endcond
 }}}}
 
@@ -56,18 +57,20 @@ namespace hpx { namespace parallel { namespace execution
             template <typename AnyExecutor, typename Parameters>
             HPX_FORCEINLINE static auto
             call(hpx::traits::detail::wrap_int, AnyExecutor && exec,
-                Parameters& params)
+                    Parameters& params)
             -> decltype(parallel::v3::detail::
-                    call_processing_units_parameter_count(params))
+                    call_processing_units_parameter_count(params,
+                        std::forward<AnyExecutor>(exec)))
             {
                 return parallel::v3::detail::
-                    call_processing_units_parameter_count(params);
+                    call_processing_units_parameter_count(params,
+                        std::forward<AnyExecutor>(exec));
             }
 
             template <typename AnyExecutor, typename Parameters>
             HPX_FORCEINLINE static auto
             call(int, AnyExecutor && exec, Parameters&)
-            -> decltype(exec.processing_units_count())
+            ->  decltype(exec.processing_units_count())
             {
                 return exec.processing_units_count();
             }

diff --git a/hpx/parallel/executors/execution_information_fwd.hpp b/hpx/parallel/executors/execution_information_fwd.hpp
@@ -120,8 +120,8 @@ namespace hpx { namespace parallel { namespace execution
             template <typename Executor, typename Parameters>
             HPX_FORCEINLINE auto operator()(
                 Executor&& exec, Parameters& params) const
-                -> decltype(processing_units_count(std::forward<Executor>(exec),
-                    params))
+                -> decltype(processing_units_count(
+                        std::forward<Executor>(exec), params))
             {
                 return processing_units_count(
                     std::forward<Executor>(exec), params);