Merge pull request #809 from kordejong/gh806

computationalgeography · Feb 6, 2025 · f53b42b · f53b42b
2 parents 31e0342 + 57b2b83
commit f53b42b
Show file tree

Hide file tree

Showing 27 changed files with 116 additions and 598 deletions.
diff --git a/source/framework/algorithm/benchmark/iterate_per_element_benchmark.cpp b/source/framework/algorithm/benchmark/iterate_per_element_benchmark.cpp
@@ -43,9 +43,9 @@ namespace lue {
                 //     hpx::make_ready_future<Element>(20);
                 Element const max_nr_iterations{25};
 
-                // uniform(min_nr_iterations, max_nr_iterations, state).wait();
+                // uniform(min_nr_iterations, max_nr_iterations, state).get();
 
-                fill(state, max_nr_iterations).wait();
+                fill(state, max_nr_iterations).get();
 
                 hpx::sliding_semaphore semaphore{static_cast<std::int64_t>(max_tree_depth)};
 
@@ -94,7 +94,7 @@ namespace lue {
                     // hpx::async(
                     //     high_priority_executor,
                     //     &detail::iterate_per_element<Element, 2>,
-                    //     task, max_tree_depth).wait();
+                    //     task, max_tree_depth).get();
                     result = detail::iterate_per_element<Element, 2>(task, max_tree_depth);
                     break;
                 }

diff --git a/source/framework/algorithm/include/lue/framework/algorithm/create_partitioned_array.hpp b/source/framework/algorithm/include/lue/framework/algorithm/create_partitioned_array.hpp
@@ -569,7 +569,7 @@ namespace lue {
 
                 lue_hpx_assert(input_partitions[p].valid());
 
-                input_partitions[p].wait();
+                input_partitions[p].get();
 
                 output_partitions[p] = hpx::dataflow(
                     hpx::launch::async,

diff --git a/source/framework/algorithm/include/lue/framework/algorithm/definition/first_n.hpp b/source/framework/algorithm/include/lue/framework/algorithm/definition/first_n.hpp
@@ -69,7 +69,7 @@ namespace lue {
 
                         ondp.mark_no_data(no_data_value);
 
-                        _route_partition.wait();
+                        _route_partition.get();
                         auto route_partition_ptr{ready_component_ptr(_route_partition)};
 
                         _output_partition = OutputPartition{hpx::new_<OutputPartitionServer>(

diff --git a/source/framework/algorithm/include/lue/framework/algorithm/detail/accumulate.hpp b/source/framework/algorithm/include/lue/framework/algorithm/detail/accumulate.hpp
@@ -326,15 +326,12 @@ namespace lue::detail {
         hpx::future<Array<PartitionOffsets, rank>> upstream_partition_offsets_f{
             upstream_partition_offsets(partition_io_partitions, ready_partitions)};
 
-
         hpx::wait_all(solved_partitions_f.begin(), solved_partitions_f.end());
         std::transform(
             solved_partitions_f.begin(),
             solved_partitions_f.end(),
             solved_partitions_.begin(),
             [](auto& f) { return f.get(); });
-        upstream_partition_offsets_f.wait();
-
 
         return std::make_tuple(std::move(solved_partitions_), upstream_partition_offsets_f.get());
     }
@@ -371,7 +368,6 @@ namespace lue::detail {
             solved_partitions_f.end(),
             solved_partitions_.begin(),
             [](auto& f) { return f.get(); });
-        upstream_partition_offset_counts_f.wait();
 
         return std::make_tuple(std::move(solved_partitions_), upstream_partition_offset_counts_f.get());
     }