Making is_heap and is_heap_until conforming to C++20

STEllAR-GROUP · Sep 16, 2020 · 369dbdf · 369dbdf
1 parent 1c6a32c
commit 369dbdf
Show file tree

Hide file tree

Showing 11 changed files with 1,090 additions and 278 deletions.
diff --git a/docs/sphinx/api/public_api.rst b/docs/sphinx/api/public_api.rst
@@ -53,12 +53,13 @@ Functions
 - :cpp:func:`hpx::generate_n`
 - :cpp:func:`hpx::parallel::v1::includes`
 - :cpp:func:`hpx::parallel::v1::inplace_merge`
-- :cpp:func:`hpx::parallel::v1::is_heap`
-- :cpp:func:`hpx::parallel::v1::is_heap_until`
+- :cpp:func:`hpx::is_heap`
+- :cpp:func:`hpx::is_heap_until`
 - :cpp:func:`hpx::parallel::v1::is_partitioned`
 - :cpp:func:`hpx::parallel::v1::is_sorted`
 - :cpp:func:`hpx::parallel::v1::is_sorted_until`
 - :cpp:func:`hpx::parallel::v1::lexicographical_compare`
+- :cpp:func:`hpx::make_heap`
 - :cpp:func:`hpx::parallel::v1::max_element`
 - :cpp:func:`hpx::parallel::v1::merge`
 - :cpp:func:`hpx::parallel::v1::min_element`

diff --git a/docs/sphinx/manual/writing_single_node_hpx_applications.rst b/docs/sphinx/manual/writing_single_node_hpx_applications.rst
@@ -572,14 +572,18 @@ Parallel algorithms
      * Description
      * In header
      * Algorithm page at cppreference.com
-   * * :cpp:func:`hpx::parallel::v1::is_heap`
+   * * :cpp:func:`hpx::is_heap`
      * Returns ``true`` if the range is max heap.
      * ``<hpx/algorithm.hpp>``
      * :cppreference-algorithm:`is_heap`
-   * * :cpp:func:`hpx::parallel::v1::is_heap_until`
+   * * :cpp:func:`hpx::is_heap_until`
      * Returns the first element that breaks a max heap.
      * ``<hpx/algorithm.hpp>``
      * :cppreference-algorithm:`is_heap_until`
+   * * :cpp:func:`hpx::make_heap`
+     * Constructs a max heap in the range [first, last).
+     * ``<hpx/algorithm.hpp>``
+     * :cppreference-algorithm:`make_heap`
 
 .. list-table:: Minimum/maximum operations (In Header: <hpx/algorithm.hpp>)
 

diff --git a/libs/full/include/include/hpx/algorithm.hpp b/libs/full/include/include/hpx/algorithm.hpp
@@ -17,8 +17,6 @@ namespace hpx {
     using hpx::parallel::adjacent_find;
     using hpx::parallel::includes;
     using hpx::parallel::inplace_merge;
-    using hpx::parallel::is_heap;
-    using hpx::parallel::is_heap_until;
     using hpx::parallel::is_partitioned;
     using hpx::parallel::is_sorted;
     using hpx::parallel::is_sorted_until;

diff --git a/libs/parallelism/algorithms/include/hpx/parallel/algorithms/copy.hpp b/libs/parallelism/algorithms/include/hpx/parallel/algorithms/copy.hpp
@@ -357,8 +357,8 @@ namespace hpx { namespace parallel { inline namespace v1 {
     // clang-format off
     template <typename ExPolicy, typename FwdIter1, typename FwdIter2,
         HPX_CONCEPT_REQUIRES_(
-            execution::is_execution_policy<ExPolicy>::value&&
-            hpx::traits::is_iterator<FwdIter1>::value&&
+            execution::is_execution_policy<ExPolicy>::value &&
+            hpx::traits::is_iterator<FwdIter1>::value &&
             hpx::traits::is_iterator<FwdIter2>::value)>
     // clang-format on
     HPX_DEPRECATED_V(

diff --git a/libs/parallelism/algorithms/include/hpx/parallel/algorithms/is_heap.hpp b/libs/parallelism/algorithms/include/hpx/parallel/algorithms/is_heap.hpp
diff --git a/libs/parallelism/algorithms/include/hpx/parallel/container_algorithms/is_heap.hpp b/libs/parallelism/algorithms/include/hpx/parallel/container_algorithms/is_heap.hpp
diff --git a/libs/parallelism/algorithms/tests/performance/benchmark_is_heap.cpp b/libs/parallelism/algorithms/tests/performance/benchmark_is_heap.cpp
@@ -81,7 +81,7 @@ double run_is_heap_benchmark_seq(int test_count, std::vector<int> const& v)
     for (int i = 0; i < test_count; ++i)
     {
         using namespace hpx::execution;
-        result = hpx::parallel::is_heap(seq, std::begin(v), std::end(v));
+        result = hpx::is_heap(seq, std::begin(v), std::end(v));
     }
 
     time = hpx::util::high_resolution_clock::now() - time;
@@ -101,7 +101,7 @@ double run_is_heap_benchmark_par(int test_count, std::vector<int> const& v)
     for (int i = 0; i < test_count; ++i)
     {
         using namespace hpx::execution;
-        result = hpx::parallel::is_heap(par, std::begin(v), std::end(v));
+        result = hpx::is_heap(par, std::begin(v), std::end(v));
     }
 
     time = hpx::util::high_resolution_clock::now() - time;
@@ -122,7 +122,7 @@ double run_is_heap_benchmark_par_unseq(
     for (int i = 0; i < test_count; ++i)
     {
         using namespace hpx::execution;
-        result = hpx::parallel::is_heap(par_unseq, std::begin(v), std::end(v));
+        result = hpx::is_heap(par_unseq, std::begin(v), std::end(v));
     }
 
     time = hpx::util::high_resolution_clock::now() - time;

diff --git a/libs/parallelism/algorithms/tests/performance/benchmark_is_heap_until.cpp b/libs/parallelism/algorithms/tests/performance/benchmark_is_heap_until.cpp
@@ -84,7 +84,7 @@ double run_is_heap_until_benchmark_seq(
     for (int i = 0; i < test_count; ++i)
     {
         using namespace hpx::execution;
-        result = hpx::parallel::is_heap_until(seq, std::begin(v), std::end(v));
+        result = hpx::is_heap_until(seq, std::begin(v), std::end(v));
     }
 
     time = hpx::util::high_resolution_clock::now() - time;
@@ -106,7 +106,7 @@ double run_is_heap_until_benchmark_par(
     for (int i = 0; i < test_count; ++i)
     {
         using namespace hpx::execution;
-        result = hpx::parallel::is_heap_until(par, std::begin(v), std::end(v));
+        result = hpx::is_heap_until(par, std::begin(v), std::end(v));
     }
 
     time = hpx::util::high_resolution_clock::now() - time;
@@ -128,8 +128,7 @@ double run_is_heap_until_benchmark_par_unseq(
     for (int i = 0; i < test_count; ++i)
     {
         using namespace hpx::execution;
-        result =
-            hpx::parallel::is_heap_until(par_unseq, std::begin(v), std::end(v));
+        result = hpx::is_heap_until(par_unseq, std::begin(v), std::end(v));
     }
 
     time = hpx::util::high_resolution_clock::now() - time;