-
-
Notifications
You must be signed in to change notification settings - Fork 427
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5416 from Jedi18/adapt_uninit_value_construct
Adapt uninitialized_value_construct and uninitialized_value_construct_n to C++ 20
- Loading branch information
Showing
11 changed files
with
1,161 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
443 changes: 328 additions & 115 deletions
443
.../parallelism/algorithms/include/hpx/parallel/algorithms/uninitialized_value_construct.hpp
Large diffs are not rendered by default.
Oops, something went wrong.
412 changes: 412 additions & 0 deletions
412
...sm/algorithms/include/hpx/parallel/container_algorithms/uninitialized_value_construct.hpp
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
221 changes: 221 additions & 0 deletions
221
...lelism/algorithms/tests/unit/container_algorithms/uninitialized_value_construct_range.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| // Copyright (c) 2018 Christopher Ogle | ||
| // Copyright (c) 2020 Hartmut Kaiser | ||
| // | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| #include <hpx/iterator_support/tests/iter_sent.hpp> | ||
| #include <hpx/local/init.hpp> | ||
| #include <hpx/modules/testing.hpp> | ||
| #include <hpx/parallel/container_algorithms/uninitialized_value_construct.hpp> | ||
|
|
||
| #include <cstddef> | ||
| #include <cstdint> | ||
| #include <iostream> | ||
| #include <iterator> | ||
| #include <numeric> | ||
| #include <string> | ||
| #include <utility> | ||
| #include <vector> | ||
|
|
||
| #include "test_utils.hpp" | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////// | ||
| struct value_constructable | ||
| { | ||
| bool operator!=(std::int32_t lhs) const | ||
| { | ||
| return lhs != value_; | ||
| } | ||
|
|
||
| std::int32_t value_; | ||
| }; | ||
|
|
||
| std::size_t const data_size = 10007; | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////// | ||
| template <typename IteratorTag> | ||
| void test_uninitialized_value_construct_range_sent(IteratorTag) | ||
| { | ||
| typedef std::vector<value_constructable> base_iterator; | ||
|
|
||
| base_iterator c(data_size, {10}); | ||
| auto end_size = rand() % data_size; | ||
| c[end_size] = {20}; | ||
|
|
||
| hpx::ranges::uninitialized_value_construct( | ||
| std::begin(c), sentinel<std::int32_t>{20}); | ||
|
|
||
| std::size_t count42 = 0; | ||
| std::size_t count10 = 0; | ||
| std::for_each(std::begin(c), std::begin(c) + data_size, | ||
| [&count42, &count10](value_constructable v1) { | ||
| if (v1.value_ == 0) | ||
| { | ||
| count42++; | ||
| } | ||
| else if (v1.value_ == 10) | ||
| { | ||
| count10++; | ||
| } | ||
| }); | ||
|
|
||
| HPX_TEST_EQ(count42, end_size); | ||
| HPX_TEST_EQ(count10, data_size - end_size - 1); | ||
| } | ||
|
|
||
| template <typename ExPolicy, typename IteratorTag> | ||
| void test_uninitialized_value_construct_range_sent( | ||
| ExPolicy&& policy, IteratorTag) | ||
| { | ||
| typedef std::vector<value_constructable> base_iterator; | ||
|
|
||
| base_iterator c(data_size, {10}); | ||
| auto end_size = rand() % data_size; | ||
| c[end_size] = {20}; | ||
|
|
||
| hpx::ranges::uninitialized_value_construct( | ||
| policy, std::begin(c), sentinel<std::int32_t>{20}); | ||
|
|
||
| std::size_t count42 = 0; | ||
| std::size_t count10 = 0; | ||
| std::for_each(std::begin(c), std::begin(c) + data_size, | ||
| [&count42, &count10](value_constructable v1) { | ||
| if (v1.value_ == 0) | ||
| { | ||
| count42++; | ||
| } | ||
| else if (v1.value_ == 10) | ||
| { | ||
| count10++; | ||
| } | ||
| }); | ||
|
|
||
| HPX_TEST_EQ(count42, end_size); | ||
| HPX_TEST_EQ(count10, data_size - end_size - 1); | ||
| } | ||
|
|
||
| template <typename IteratorTag> | ||
| void test_uninitialized_value_construct_range(IteratorTag) | ||
| { | ||
| typedef std::vector<value_constructable> base_iterator; | ||
|
|
||
| base_iterator c(data_size, {10}); | ||
| hpx::ranges::uninitialized_value_construct(c); | ||
|
|
||
| std::size_t count = 0; | ||
| std::for_each(std::begin(c), std::begin(c) + data_size, | ||
| [&count](value_constructable v1) { | ||
| HPX_TEST_EQ(v1.value_, 0); | ||
| ++count; | ||
| }); | ||
| HPX_TEST_EQ(count, data_size); | ||
| } | ||
|
|
||
| template <typename ExPolicy, typename IteratorTag> | ||
| void test_uninitialized_value_construct_range(ExPolicy&& policy, IteratorTag) | ||
| { | ||
| static_assert(hpx::is_execution_policy<ExPolicy>::value, | ||
| "hpx::is_execution_policy<ExPolicy>::value"); | ||
|
|
||
| typedef std::vector<value_constructable> base_iterator; | ||
|
|
||
| base_iterator c(data_size, {10}); | ||
| hpx::ranges::uninitialized_value_construct( | ||
| std::forward<ExPolicy>(policy), c); | ||
|
|
||
| std::size_t count = 0; | ||
| std::for_each(std::begin(c), std::begin(c) + data_size, | ||
| [&count](value_constructable v1) { | ||
| HPX_TEST_EQ(v1.value_, 0); | ||
| ++count; | ||
| }); | ||
| HPX_TEST_EQ(count, data_size); | ||
| } | ||
|
|
||
| template <typename ExPolicy, typename IteratorTag> | ||
| void test_uninitialized_value_construct_range_async( | ||
| ExPolicy&& policy, IteratorTag) | ||
| { | ||
| static_assert(hpx::is_execution_policy<ExPolicy>::value, | ||
| "hpx::is_execution_policy<ExPolicy>::value"); | ||
|
|
||
| typedef std::vector<value_constructable> base_iterator; | ||
|
|
||
| base_iterator c(data_size, {10}); | ||
| auto f = hpx::ranges::uninitialized_value_construct( | ||
| std::forward<ExPolicy>(policy), c); | ||
| f.wait(); | ||
|
|
||
| std::size_t count = 0; | ||
| std::for_each(std::begin(c), std::begin(c) + data_size, | ||
| [&count](value_constructable v1) { | ||
| HPX_TEST_EQ(v1.value_, 0); | ||
| ++count; | ||
| }); | ||
| HPX_TEST_EQ(count, data_size); | ||
| } | ||
|
|
||
| template <typename IteratorTag> | ||
| void test_uninitialized_value_construct_range() | ||
| { | ||
| using namespace hpx::execution; | ||
|
|
||
| test_uninitialized_value_construct_range(IteratorTag()); | ||
| test_uninitialized_value_construct_range(seq, IteratorTag()); | ||
| test_uninitialized_value_construct_range(par, IteratorTag()); | ||
| test_uninitialized_value_construct_range(par_unseq, IteratorTag()); | ||
|
|
||
| test_uninitialized_value_construct_range_async(seq(task), IteratorTag()); | ||
| test_uninitialized_value_construct_range_async(par(task), IteratorTag()); | ||
|
|
||
| test_uninitialized_value_construct_range_sent(IteratorTag()); | ||
| test_uninitialized_value_construct_range_sent(seq, IteratorTag()); | ||
| test_uninitialized_value_construct_range_sent(par, IteratorTag()); | ||
| test_uninitialized_value_construct_range_sent(par_unseq, IteratorTag()); | ||
| } | ||
|
|
||
| void uninitialized_value_construct_range_test() | ||
| { | ||
| test_uninitialized_value_construct_range<std::random_access_iterator_tag>(); | ||
| test_uninitialized_value_construct_range<std::forward_iterator_tag>(); | ||
| } | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////// | ||
| int hpx_main(hpx::program_options::variables_map& vm) | ||
| { | ||
| unsigned int seed = (unsigned int) std::time(nullptr); | ||
| if (vm.count("seed")) | ||
| seed = vm["seed"].as<unsigned int>(); | ||
|
|
||
| std::cout << "using seed: " << seed << std::endl; | ||
| std::srand(seed); | ||
|
|
||
| uninitialized_value_construct_range_test(); | ||
| return hpx::local::finalize(); | ||
| } | ||
|
|
||
| int main(int argc, char* argv[]) | ||
| { | ||
| // add command line option which controls the random number generator seed | ||
| using namespace hpx::program_options; | ||
| options_description desc_commandline( | ||
| "Usage: " HPX_APPLICATION_STRING " [options]"); | ||
|
|
||
| desc_commandline.add_options()("seed,s", value<unsigned int>(), | ||
| "the random number generator seed to use for this run"); | ||
|
|
||
| // By value this test should run on all available cores | ||
| std::vector<std::string> const cfg = {"hpx.os_threads=all"}; | ||
|
|
||
| // Initialize and run HPX | ||
| hpx::local::init_params init_args; | ||
| init_args.desc_cmdline = desc_commandline; | ||
| init_args.cfg = cfg; | ||
|
|
||
| HPX_TEST_EQ_MSG(hpx::local::init(hpx_main, argc, argv, init_args), 0, | ||
| "HPX main exited with non-zero status"); | ||
|
|
||
| return hpx::util::report_errors(); | ||
| } |
Oops, something went wrong.