Fixing namespace for static_chunk_executor

STEllAR-GROUP · Sep 25, 2017 · 39fc05d · 39fc05d
1 parent 7c283f8
commit 39fc05d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/hpx/compute/host/block_allocator.hpp b/hpx/compute/host/block_allocator.hpp
@@ -166,7 +166,7 @@ namespace hpx { namespace compute { namespace host
             auto policy =
                 hpx::parallel::execution::parallel_policy()
                     .on(executor_)
-                    .with(hpx::parallel::static_chunk_size());
+                    .with(hpx::parallel::execution::static_chunk_size());
 
             typedef boost::range_detail::integer_iterator<std::size_t>
                 iterator_type;
@@ -241,7 +241,7 @@ namespace hpx { namespace compute { namespace host
             hpx::parallel::for_each(
                 hpx::parallel::execution::par
                     .on(executor_)
-                    .with(hpx::parallel::static_chunk_size()),
+                    .with(hpx::parallel::execution::static_chunk_size()),
                 util::begin(irange), util::end(irange),
                 [p](std::size_t i)
                 {

diff --git a/hpx/compute/host/block_executor.hpp b/hpx/compute/host/block_executor.hpp
@@ -32,15 +32,16 @@
 namespace hpx { namespace compute { namespace host
 {
     /// The block executor can be used to build NUMA aware programs.
-    /// It will distribute work evenly accross the passed targets
+    /// It will distribute work evenly across the passed targets
     ///
     /// \tparam Executor The underlying executor to use
     template <typename Executor =
         hpx::threads::executors::local_priority_queue_attached_executor>
     struct block_executor
     {
     public:
-        typedef hpx::parallel::static_chunk_size executor_parameters_type;
+        typedef hpx::parallel::execution::static_chunk_size
+            executor_parameters_type;
 
         block_executor(std::vector<host::target> const& targets)
           : targets_(targets)

diff --git a/hpx/parallel/util/numa_allocator.hpp b/hpx/parallel/util/numa_allocator.hpp
@@ -91,7 +91,7 @@ namespace hpx { namespace parallel { namespace util
                     hpx::parallel::for_each(
                         hpx::parallel::execution::par(hpx::parallel::execution::task)
                             .on(executors_[i])
-                            .with(hpx::parallel::static_chunk_size()),
+                            .with(hpx::parallel::execution::static_chunk_size()),
                         begin, end,
 #if defined(HPX_DEBUG)
                         [this, i]

diff --git a/hpx/traits/executor_traits.hpp b/hpx/traits/executor_traits.hpp
@@ -167,7 +167,7 @@ namespace hpx { namespace parallel { namespace execution
 
     public:
         using type = hpx::util::detected_or_t<
-            parallel::static_chunk_size, parameters_type, Executor>;
+            parallel::execution::static_chunk_size, parameters_type, Executor>;
     };
 }}}
 

diff --git a/tests/performance/local/foreach_scaling.cpp b/tests/performance/local/foreach_scaling.cpp
@@ -51,7 +51,7 @@ void measure_parallel_foreach(std::size_t size)
         std::rand());
 
     // create executor parameters object
-    hpx::parallel::static_chunk_size cs(chunk_size);
+    hpx::parallel::execution::static_chunk_size cs(chunk_size);
 
     // invoke parallel for_each
     hpx::parallel::for_each(hpx::parallel::execution::par.with(cs),
@@ -71,7 +71,7 @@ hpx::future<void> measure_task_foreach(std::size_t size)
         std::rand());
 
     // create executor parameters object
-    hpx::parallel::static_chunk_size cs(chunk_size);
+    hpx::parallel::execution::static_chunk_size cs(chunk_size);
 
     // invoke parallel for_each
     return

diff --git a/tests/performance/local/partitioned_vector_foreach.cpp b/tests/performance/local/partitioned_vector_foreach.cpp
@@ -80,7 +80,7 @@ int hpx_main(boost::program_options::variables_map& vm)
     }
     else {
         // create executor parameters object
-        hpx::parallel::static_chunk_size cs(chunk_size);
+        hpx::parallel::execution::static_chunk_size cs(chunk_size);
 
         // retrieve reference time
         std::vector<int> ref(vector_size);

diff --git a/tests/regressions/parallel/scan_non_commutative.cpp b/tests/regressions/parallel/scan_non_commutative.cpp
@@ -26,7 +26,7 @@ void test_scan_non_commutative() {
         std::vector<std::string> rs(vs.size());
         hpx::parallel::inclusive_scan(
             hpx::parallel::execution::par.with(
-                hpx::parallel::static_chunk_size(i)),
+                hpx::parallel::execution::static_chunk_size(i)),
             vs.cbegin(), vs.cend(),
             rs.begin()
         );
@@ -39,7 +39,7 @@ void test_scan_non_commutative() {
         std::vector<std::string> rs(vs.size());
         hpx::parallel::exclusive_scan(
             hpx::parallel::execution::par.with(
-                hpx::parallel::static_chunk_size(i)),
+                hpx::parallel::execution::static_chunk_size(i)),
             vs.cbegin(), vs.cend(),
             rs.begin(), std::string("0")
         );

diff --git a/tests/unit/parallel/task_block_executor.cpp b/tests/unit/parallel/task_block_executor.cpp
@@ -21,7 +21,7 @@ using hpx::parallel::execution::parallel_policy;
 using hpx::parallel::execution::parallel_task_policy;
 using hpx::parallel::execution::parallel_policy_shim;
 using hpx::parallel::execution::parallel_task_policy_shim;
-using hpx::parallel::static_chunk_size;
+using hpx::parallel::execution::static_chunk_size;
 
 ///////////////////////////////////////////////////////////////////////////////
 template <typename Executor>