diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /sys-cluster/hpx | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'sys-cluster/hpx')
-rw-r--r-- | sys-cluster/hpx/Manifest | 14 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.4.1-boost.patch | 30 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch | 157 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch | 79 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.5.1-cmake.patch | 32 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.5.1-docs.patch | 91 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.5.1-python.patch (renamed from sys-cluster/hpx/files/hpx-1.4.1-python.patch) | 6 | ||||
-rw-r--r-- | sys-cluster/hpx/files/hpx-1.5.1-tests.patch | 111 | ||||
-rw-r--r-- | sys-cluster/hpx/hpx-1.5.1.ebuild (renamed from sys-cluster/hpx/hpx-1.4.1.ebuild) | 14 | ||||
-rw-r--r-- | sys-cluster/hpx/hpx-9999.ebuild | 8 |
10 files changed, 255 insertions, 287 deletions
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index dc892f0c221a..f301bdd21109 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,8 +1,8 @@ -AUX hpx-1.4.1-boost.patch 1067 BLAKE2B 25002fc609e2d4eef3f8645ecd4aa68ebb7db667fe66e3b33674e175857cbc8b71d8a0c1c86304ceb02df1e7ae7eb06c7a7e21c47d2b7b377fde974dce638416 SHA512 345fa5745f5be2286214d957d6b7d9497d429d8d9628db1d3f0420fdb7df5cefd9e4e06381706b55612b033f29effd085bd68e36122824ef633f23c475a3009d -AUX hpx-1.4.1-disable-failing-tests.patch 5828 BLAKE2B 2f550b50c8090b5ae88f665c0f862adb20046c7762045917892d435f497691063e9ce56f54aa1ab5b0451dbe9a9a8666c78d7ff6d5593ae7add9d688a87617b0 SHA512 b3b2882bcc3ea7a15ebe04f0f7596608664c21c4383f7e2619b9adf484fc976c6ab5cd820dd0c941af1e2f6000edf2e894ff7aa5f7fd6e0e2e6ec835b58dcbe8 -AUX hpx-1.4.1-placeholder.patch 3760 BLAKE2B da3f34201c7be713f559d1573037fad9b979fea74791dfc3ee14a41245420962bed2dc4dc1a1ee98e5c6e87a66ea89de6c3dac590d83d1cfab102ea0de3707e8 SHA512 7af105e8855cd6ff1160f2fb0400095a1674470b2cf5447cdf3391fcd478bd1c80f35451b30eedd97d46016db74a5dc789cae83b58244163ff2fe5951b693f15 -AUX hpx-1.4.1-python.patch 1095 BLAKE2B e0bf47364e01f96b065af8d3a1e0a23c536f66a56baa71903778528c801dd6ea6d7acf9a3f2acbb580f75d1493752b1c0c30c8ed3c9ee7f71da8c007c93739e3 SHA512 4eee43504e1e60b0ee61fc9d2ea2c61c3b1c7ef00dea38d3b913e7cd8ebbeb9561394ad4680a9b6e9e995a2d3b8478abea9d8221de055f3d810f24db39bf7760 -DIST hpx_1.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582 -EBUILD hpx-1.4.1.ebuild 2631 BLAKE2B 997699c6aa2fed7931c8d02017e30451b55e9e9bb111c60f254f6a7cb1964531b64f8281e955e93250b5451f905319b30fa510619cf42e9817f8f004f0b2e057 SHA512 7ef33709056d72e2cf2ae1cee64e85dba1726512eb10518c811a661a97ff76e5d321882f003b0cfa94f4260c3bafada799a7ff6ab53921e1c6b6f47187ece34a -EBUILD hpx-9999.ebuild 2467 BLAKE2B f2a23526f597068da79cb5772cab64be8789b3c082357d911ec2961be41648a16cf7dc67b1e32f15c8dc5291734e0baa0b38959a0b739c2d250a8430f0ed0e17 SHA512 00d128ba1f4d1aef610c13fc4b69408db557092d467e4a31286a26f4c0970c29b1422491ed0a87f17f0446782e3adc43ddfeb7ffc15fbaecc0846e8908a48c70 +AUX hpx-1.5.1-cmake.patch 1131 BLAKE2B 44bd25d11aee1cb1a14856a91ceb8afd3444fa7499c0304fddb9d36eca869cc089c59e9d727f70b1a67b3815731854b3e17f8722f53bb2eafdf23fdab2f5ccc8 SHA512 0451ee280a19701b76bcaf41783b932658bd9c954936dace35f0d833b51ec3e4cf4fca7981091c72486b3470aa03a24630f4a01f243041b6c002c03c5a8fcbd7 +AUX hpx-1.5.1-docs.patch 4416 BLAKE2B 0cfa735ffcf683c21c1739fc3eb435d77e640a4f3b24764a08739b424ee444adda36c4650f65bd7064b7bfafcdf67239fb5573acd6c0a16b205ab3d508171a1c SHA512 df0fe0c9e2d4b934140fc4b277d212d5dd0fb269e0a06a315a6c1c5b90d8aaed7ea6f2ce92b491150ea61ff16f2299537fa55cdca94841c3da1797a4a83ad732 +AUX hpx-1.5.1-python.patch 1095 BLAKE2B 0996bcee3f6c2e28a9cfe2bb3165f241322a77cf8ab21e16fb6048a0d08903dfdce6f0d4109437d6bfa1e0ac13c05b5e4f278f83abb22a909351031f0a46b1b8 SHA512 8c17dbf221e63826ef7a3e95e3cf821f72a781fbd68756e8f7cfcd50c24b790062dd69a8d90ba9654c962a37aa06267e5b2c04f5f7f07a107166e4b16ec04122 +AUX hpx-1.5.1-tests.patch 4719 BLAKE2B ddf491d738137f57e3fed5b6833647984ae3ef432ab6eb214a36523f8887c8966711ac281dbda84bd19eef7dc75f8b9122843e7273e15b9db2b201dd35242303 SHA512 7d23d3cbc572dda2eb00a50a59633f41b622f531c51a734d64f8d00f2168724d36ff07425a3262793e77e5b4dfd38295a33717d56b916f0abd9b003ac1d829c4 +DIST hpx-1.5.1.tar.gz 4576475 BLAKE2B 8702638461f92d9d94d0e2ac4ec32527d995a45f54babcbf08d644d1cac8fa37692fb66f59e221930f7738861b41a93fd0ab64d11c4e46d4e039ff3b0e4fec72 SHA512 ab2603adca8780808b62b55f57a03bf8491b805665831c1c484eeba8e7b306bb3269884c8940ad2fc4c5b0d679c54b1e33bc077cdb7ea6d1cb9a715ff70b9842 +EBUILD hpx-1.5.1.ebuild 2620 BLAKE2B 5435dc1c9c00163687eb4f6ae01ca386586c5ac0b67c8476e68ed344511384f157069967207f8dec025c8ea6d6d98fc2ac0f73be138990c51aea637cc62c1c37 SHA512 f6663e6fb8685e73c4444013d68c9a1655be24b3b154524dedeab95b5e872f125270ab6270201bad258766f8b4b51c5d251f86dc6cc3e03bd6defe545842fc95 +EBUILD hpx-9999.ebuild 2479 BLAKE2B 8226c08e8260585d606f97a727eedd13d534f53e1a5922cc4cf6828b28d244ee9ca073f240697c2664a3deac22494171fcd5ac9f39ca269eddd00512528ffc61 SHA512 5629da1dc54abbd17c48913304f3f50a17220f45d3ab6926f495a6326268b5eabf4b8ffb2eb57c42846436ee85b02c3c868bb8457eb1bbc22d64118d22a6cd16 MISC metadata.xml 1189 BLAKE2B a6fedaeaa9c32038109691eb64fd62dd0cf0bc2104710fa49d57a95b09674a23d4e38d03fa2e306734b587a8682c1a7007ed078988226c39f17ccacece740a52 SHA512 eddd398a02bfa3716a373a6cb909a881efd72c11d7e4ce05a722da1fb5d5e464b59999d5bf0de2e608f768d6ceb50ccd64d43e77088c19fa1b28a19b404469da diff --git a/sys-cluster/hpx/files/hpx-1.4.1-boost.patch b/sys-cluster/hpx/files/hpx-1.4.1-boost.patch deleted file mode 100644 index 939f4f77813c..000000000000 --- a/sys-cluster/hpx/files/hpx-1.4.1-boost.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1a3615f30491320d48e45005ad7b032fb3c1821d Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach <kurt@kmk-computers.de> -Date: Sun, 22 Mar 2020 12:49:59 +0100 -Subject: [PATCH] cmake: Remove passing of BOOST_ROOT - -That variable is not used and generates QA issues: - - * One or more CMake variables were not used by the project: - * BOOST_ROOT - -Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> ---- - tests/unit/build/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt -index 757f4887fba2..2163b853fbad 100644 ---- a/tests/unit/build/CMakeLists.txt -+++ b/tests/unit/build/CMakeLists.txt -@@ -38,7 +38,6 @@ function(create_cmake_test name hpx_dir) - "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}" - "${PROJECT_SOURCE_DIR}/examples/hello_world_component" - -DHPX_DIR=${hpx_dir} -- -DBOOST_ROOT=${BOOST_ROOT} - ${ADDITIONAL_CMAKE_OPTIONS} - -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE} - -DCMAKE_BUILD_TYPE=$<CONFIGURATION> VERBATIM) --- -2.24.1 - diff --git a/sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch b/sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch deleted file mode 100644 index 492cbaf23781..000000000000 --- a/sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 10577db8e8ca556dc98b1c0010b7e53416e22b22 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach <kurt@kmk-computers.de> -Date: Tue, 17 Mar 2020 11:21:53 +0100 -Subject: [PATCH] tests: Disable failing tests - -Currently six tests are failing: - -|99% tests passed, 6 tests failed out of 712 -| -|Total Test time (real) = 2268.99 sec -| -|The following tests FAILED: -| 339 - tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector_adjacent_find1 (Failed) -| 454 - tests.regressions.dynamic_counters_loaded_1508 (Failed) -| 601 - tests.unit.component.launch_process (Timeout) -| 678 - tests.unit.threads.distributed.tcp.thread_stacksize (Failed) -| 681 - tests.unit.topology.numa_allocator (Failed) -| 712 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed) - -Needs to be further investigated. Disable them for now. - -Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> ---- - .../tests/unit/CMakeLists.txt | 2 +- - tests/regressions/CMakeLists.txt | 2 +- - tests/unit/component/CMakeLists.txt | 36 +++++++++---------- - tests/unit/parcelset/CMakeLists.txt | 2 +- - tests/unit/threads/CMakeLists.txt | 2 +- - tests/unit/topology/CMakeLists.txt | 6 ++-- - 6 files changed, 25 insertions(+), 25 deletions(-) - -diff --git a/libs/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/segmented_algorithms/tests/unit/CMakeLists.txt -index 1ed7dbd7798a..17d5e4cca3b4 100644 ---- a/libs/segmented_algorithms/tests/unit/CMakeLists.txt -+++ b/libs/segmented_algorithms/tests/unit/CMakeLists.txt -@@ -7,7 +7,7 @@ - set(tests - partitioned_vector_adjacent_difference1 - partitioned_vector_adjacent_difference2 -- partitioned_vector_adjacent_find1 -+ # partitioned_vector_adjacent_find1 - partitioned_vector_adjacent_find2 - partitioned_vector_all_of1 - partitioned_vector_all_of2 -diff --git a/tests/regressions/CMakeLists.txt b/tests/regressions/CMakeLists.txt -index 5a70ab8bfc99..fa4574ee0bf3 100644 ---- a/tests/regressions/CMakeLists.txt -+++ b/tests/regressions/CMakeLists.txt -@@ -25,7 +25,7 @@ foreach(subdir ${subdirs}) - endforeach() - - set(tests -- dynamic_counters_loaded_1508 -+ # dynamic_counters_loaded_1508 - id_type_ref_counting_1032 - multiple_init - multiple_init_2918 -diff --git a/tests/unit/component/CMakeLists.txt b/tests/unit/component/CMakeLists.txt -index 8deacffedb7b..49511e82e478 100644 ---- a/tests/unit/component/CMakeLists.txt -+++ b/tests/unit/component/CMakeLists.txt -@@ -29,25 +29,25 @@ set(tests - ) - - if(HPX_WITH_NETWORKING) -- set(tests ${tests} -- launch_process -- ) -+ # set(tests ${tests} -+ # launch_process -+ # ) - - # add executable needed for launch_process_test -- add_hpx_executable(launched_process_test -- INTERNAL_FLAGS -- SOURCES launched_process.cpp -- EXCLUDE_FROM_ALL -- HPX_PREFIX ${HPX_BUILD_PREFIX} -- FOLDER "Tests/Unit/Components" -- COMPONENT_DEPENDENCIES launch_process_test_server) -- -- set(launch_process_FLAGS -- DEPENDENCIES iostreams_component process_component -- launch_process_test_server_component) -- set(launch_process_PARAMETERS -- --launch=$<TARGET_FILE:launched_process_test> -- --hpx:expect-connecting-localities) -+ # add_hpx_executable(launched_process_test -+ # INTERNAL_FLAGS -+ # SOURCES launched_process.cpp -+ # EXCLUDE_FROM_ALL -+ # HPX_PREFIX ${HPX_BUILD_PREFIX} -+ # FOLDER "Tests/Unit/Components" -+ # COMPONENT_DEPENDENCIES launch_process_test_server) -+ -+ # set(launch_process_FLAGS -+ # DEPENDENCIES iostreams_component process_component -+ # launch_process_test_server_component) -+ # set(launch_process_PARAMETERS -+ # --launch=$<TARGET_FILE:launched_process_test> -+ # --hpx:expect-connecting-localities) - endif() - - set(action_invoke_no_more_than_PARAMETERS -@@ -123,5 +123,5 @@ foreach(test ${tests}) - endforeach() - - if(HPX_WITH_NETWORKING) -- add_hpx_pseudo_dependencies(tests.unit.component.launch_process launched_process_test) -+ # add_hpx_pseudo_dependencies(tests.unit.component.launch_process launched_process_test) - endif() -diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt -index 93c5844b9210..ec2ffacd0f99 100644 ---- a/tests/unit/parcelset/CMakeLists.txt -+++ b/tests/unit/parcelset/CMakeLists.txt -@@ -16,7 +16,7 @@ set(put_parcels_FLAGS DEPENDENCIES iostreams_component) - set(set_parcel_write_handler_PARAMETERS LOCALITIES 2) - - if(HPX_WITH_PARCEL_COALESCING) -- set(tests ${tests} put_parcels_with_coalescing) -+ # set(tests ${tests} put_parcels_with_coalescing) - set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2) - set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component parcel_coalescing) - endif() -diff --git a/tests/unit/threads/CMakeLists.txt b/tests/unit/threads/CMakeLists.txt -index df0a1eff4dbb..d542d24136b7 100644 ---- a/tests/unit/threads/CMakeLists.txt -+++ b/tests/unit/threads/CMakeLists.txt -@@ -17,7 +17,7 @@ set(tests - thread_id - thread_launching - thread_mf -- thread_stacksize -+ # thread_stacksize - thread_suspension_executor - thread_yield - ) -diff --git a/tests/unit/topology/CMakeLists.txt b/tests/unit/topology/CMakeLists.txt -index 8a8a26b294fb..9f6311395c61 100644 ---- a/tests/unit/topology/CMakeLists.txt -+++ b/tests/unit/topology/CMakeLists.txt -@@ -5,9 +5,9 @@ - # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - - if (HPX_WITH_SHARED_PRIORITY_SCHEDULER AND HPX_WITH_CXX14_RETURN_TYPE_DEDUCTION) -- set(tests ${tests} -- numa_allocator -- ) -+ # set(tests ${tests} -+ # numa_allocator -+ # ) - - # NB. threads = -2 = threads = 'cores' - # NB. threads = -1 = threads = 'all' --- -2.24.1 - diff --git a/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch deleted file mode 100644 index 94271e6c0eca..000000000000 --- a/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 6bdbb6a3ad6ea57c46e9998e9efd46f86f5d5729 Mon Sep 17 00:00:00 2001 -From: Hartmut Kaiser <hartmut.kaiser@gmail.com> -Date: Tue, 28 Apr 2020 09:52:08 -0500 -Subject: [PATCH] Adding missing using placeholder::_X - -- flyby remove unneeded using statements - -(cherry picked from commit 1a6882195f9dc8d333ad12898fb88e3ca2931022) -Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> ---- - src/performance_counters/registry.cpp | 3 --- - src/runtime/agas/addressing_service.cpp | 3 ++- - tests/performance/network/network_storage/network_storage.cpp | 1 - - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/performance_counters/registry.cpp b/src/performance_counters/registry.cpp -index 34c8d0e71d55..8da91f379a72 100644 ---- a/src/performance_counters/registry.cpp -+++ b/src/performance_counters/registry.cpp -@@ -378,7 +378,6 @@ namespace hpx { namespace performance_counters - counter_status registry::create_raw_counter_value(counter_info const& info, - std::int64_t* countervalue, naming::gid_type& id, error_code& ec) - { -- using util::placeholders::_1; - hpx::util::function_nonser<std::int64_t(bool)> func( - util::bind_front(wrap_counter, countervalue)); - return create_raw_counter(info, func, id, ec); -@@ -401,7 +400,6 @@ namespace hpx { namespace performance_counters - hpx::util::function_nonser<std::int64_t()> const& f, naming::gid_type& id, - error_code& ec) - { -- using util::placeholders::_1; - hpx::util::function_nonser<std::int64_t(bool)> func( - util::bind_front(&wrap_raw_counter, f)); - return create_raw_counter(info, func, id, ec); -@@ -465,7 +463,6 @@ namespace hpx { namespace performance_counters - hpx::util::function_nonser<std::vector<std::int64_t>()> const& f, - naming::gid_type& id, error_code& ec) - { -- using util::placeholders::_1; - hpx::util::function_nonser<std::vector<std::int64_t>(bool)> func( - util::bind_front(&wrap_raw_values_counter, f)); - return create_raw_counter(info, func, id, ec); -diff --git a/src/runtime/agas/addressing_service.cpp b/src/runtime/agas/addressing_service.cpp -index f30760c0e05e..b416a28d12d8 100644 ---- a/src/runtime/agas/addressing_service.cpp -+++ b/src/runtime/agas/addressing_service.cpp -@@ -1864,7 +1864,6 @@ future<hpx::id_type> addressing_service::on_symbol_namespace_event( - hpx::future<bool> f = - symbol_ns_.on_event(name, call_for_past_events, p.get_id()); - -- using util::placeholders::_1; - return f.then( - hpx::launch::sync, - util::one_shot(util::bind_back( -@@ -2356,6 +2355,8 @@ void addressing_service::register_counter_types() - util::bind_front( - &addressing_service::get_cache_erase_entry_time, this)); - -+ using util::placeholders::_1; -+ using util::placeholders::_2; - performance_counters::generic_counter_type_data const counter_types[] = - { - { "/agas/count/cache/entries", performance_counters::counter_raw, -diff --git a/tests/performance/network/network_storage/network_storage.cpp b/tests/performance/network/network_storage/network_storage.cpp -index 33fc1a66afa4..dfcffbafb180 100644 ---- a/tests/performance/network/network_storage/network_storage.cpp -+++ b/tests/performance/network/network_storage/network_storage.cpp -@@ -802,7 +802,6 @@ void test_read( - ++FuturesWaiting[send_rank]; - std::lock_guard<hpx::lcos::local::spinlock> lk(FuturesMutex); - #endif -- using hpx::util::placeholders::_1; - std::size_t buffer_address = - reinterpret_cast<std::size_t>(general_buffer.data()); - // --- -2.26.2 - diff --git a/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch b/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch new file mode 100644 index 000000000000..ab31178bbe6d --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch @@ -0,0 +1,32 @@ +From 8bee06baabf24c4b8f48766dba5c76d1979c8ea6 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach <kurt@kmk-computers.de> +Date: Sat, 19 Sep 2020 13:19:42 +0200 +Subject: [PATCH] tests: Remove unused cmake options + +This fixes the following warnings: + +| * One or more CMake variables were not used by the project: +| * BOOST_ROOT +| * SETUP_TYPE + +Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> +--- + tests/unit/build/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt +index a4db8d4c927f..43bb766aced5 100644 +--- a/tests/unit/build/CMakeLists.txt ++++ b/tests/unit/build/CMakeLists.txt +@@ -57,7 +57,7 @@ function(create_cmake_test name using_install_dir hpx_dir setup_type test_dir) + ${name}.make_configure + COMMAND + "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}" ${test_dir} +- -DHPX_DIR=${hpx_dir} -DBOOST_ROOT=${BOOST_ROOT} ++ -DHPX_DIR=${hpx_dir} + ${ADDITIONAL_CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE} + -DCMAKE_BUILD_TYPE=$<CONFIGURATION> + VERBATIM +-- +2.26.2 + diff --git a/sys-cluster/hpx/files/hpx-1.5.1-docs.patch b/sys-cluster/hpx/files/hpx-1.5.1-docs.patch new file mode 100644 index 000000000000..a9978ea29550 --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.5.1-docs.patch @@ -0,0 +1,91 @@ +From 785ade96043ab6fff85646a841996ccf6dfd0b62 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach <kurt@kmk-computers.de> +Date: Wed, 28 Oct 2020 18:37:31 +0100 +Subject: [PATCH] static_reinit: Remove export macro + +This macro leads to doc generation fail: + +|/home/kurt/git/hpx/build/docs/sphinx/libs/static_reinit/api.rst:29: WARNING:cpp:identifier reference target not found: HPX_EXPORT_REINITIALIZABLE_STATIC + +... and it results in an exception in sphinx: + +|Traceback (most recent call last): +| File "/usr/lib/python3.7/site-packages/sphinx/cmd/build.py", line 280, in build_main +| app.build(args.force_all, filenames) +| File "/usr/lib/python3.7/site-packages/sphinx/application.py", line 348, in build +| self.builder.build_update() +| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 299, in build_update +| len(to_build)) +| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 361, in build +| self.write(docnames, list(updated_docnames), method) +| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 535, in write +| self._write_serial(sorted(docnames)) +| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 542, in _write_serial +| doctree = self.env.get_and_resolve_doctree(docname, self) +| File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 539, in get_and_resolve_doctree +| self.apply_post_transforms(doctree, docname) +| File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 585, in apply_post_transforms +| transformer.apply_transforms() +| File "/usr/lib/python3.7/site-packages/sphinx/transforms/__init__.py", line 87, in apply_transforms +| super().apply_transforms() +| File "/usr/lib/python3.7/site-packages/docutils/transforms/__init__.py", line 171, in apply_transforms +| transform.apply(**kwargs) +| File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 44, in apply +| self.run(**kwargs) +| File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 88, in run +| typ, target, node, contnode) +| File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7502, in resolve_xref +| target, node, contnode)[0] +| File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7375, in _resolve_xref_inner +| assert parentSymbol # should be there +|AssertionError + +Actually the macro is not needed. So, just remove it until sphinx is fixed. + +Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> +--- + .../hpx/static_reinit/reinitializable_static.hpp | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp +index 08980b9e269e..3c99400b9553 100644 +--- a/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp ++++ b/libs/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp +@@ -17,14 +17,6 @@ + #include <mutex> + #include <type_traits> + +-// clang-format off +-#if !defined(HPX_WINDOWS) +-# define HPX_EXPORT_REINITIALIZABLE_STATIC HPX_EXPORT +-#else +-# define HPX_EXPORT_REINITIALIZABLE_STATIC +-#endif +-// clang-format on +- + namespace hpx { namespace util { + /////////////////////////////////////////////////////////////////////////// + // Provides thread-safe initialization of a single static instance of T. +@@ -39,11 +31,11 @@ namespace hpx { namespace util { + // functions used by the HPX runtime system to reinitialize the held data + // structures. + template <typename T, typename Tag = T, std::size_t N = 1> +- struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static; ++ struct HPX_EXPORT reinitializable_static; + + ////////////////////////////////////////////////////////////////////////// + template <typename T, typename Tag, std::size_t N> +- struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static ++ struct HPX_EXPORT reinitializable_static + { + public: + HPX_NON_COPYABLE(reinitializable_static); +@@ -157,5 +149,3 @@ namespace hpx { namespace util { + template <typename T, typename Tag, std::size_t N> + std::once_flag reinitializable_static<T, Tag, N>::constructed_; + }} // namespace hpx::util +- +-#undef HPX_EXPORT_REINITIALIZABLE_STATIC +-- +2.26.2 + diff --git a/sys-cluster/hpx/files/hpx-1.4.1-python.patch b/sys-cluster/hpx/files/hpx-1.5.1-python.patch index d28c8a61f238..51e225e8f5bc 100644 --- a/sys-cluster/hpx/files/hpx-1.4.1-python.patch +++ b/sys-cluster/hpx/files/hpx-1.5.1-python.patch @@ -1,4 +1,4 @@ -From 641d9766c73d2ee08aac8e1e0dd123b9d6db0c25 Mon Sep 17 00:00:00 2001 +From 0d250c5747f3a80ddda6f5bf298cead9048d1c28 Mon Sep 17 00:00:00 2001 From: Kurt Kanzenbach <kurt@kmk-computers.de> Date: Tue, 17 Mar 2020 16:20:35 +0100 Subject: [PATCH] cmake: python: Use standard python interpreter @@ -23,7 +23,7 @@ index 81f38f89367d..a0fd7837b066 100755 # Copyright (c) 2014 Steven R. Brandt # diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in -index 0e9f04a60495..7ccd2715a697 100755 +index 44a79e7cbffb..d4ab6020485e 100755 --- a/cmake/templates/hpxrun.py.in +++ b/cmake/templates/hpxrun.py.in @@ -1,4 +1,4 @@ @@ -33,5 +33,5 @@ index 0e9f04a60495..7ccd2715a697 100755 # Copyright (c) 2014 Thomas Heller # -- -2.24.1 +2.26.2 diff --git a/sys-cluster/hpx/files/hpx-1.5.1-tests.patch b/sys-cluster/hpx/files/hpx-1.5.1-tests.patch new file mode 100644 index 000000000000..4a930eb0c0c7 --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.5.1-tests.patch @@ -0,0 +1,111 @@ +From e623c902bc57f85b3d1b09e58b75fb01898b409e Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach <kurt@kmk-computers.de> +Date: Fri, 18 Sep 2020 08:32:01 +0200 +Subject: [PATCH] tests: Disable failing tests + +Within portage the following tests fail: + +|99% tests passed, 5 tests failed out of 920 +| +|Total Test time (real) = 1069.51 sec +| +|The following tests FAILED: +| 299 - tests.unit.modules.async_mpi.mpi_ring_async_executor (Failed) +| 351 - tests.unit.modules.compute.numa_allocator (Failed) +| 492 - tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508 (Failed) +| 919 - tests.unit.parcelset.distributed.mpi.put_parcels_with_coalescing (Failed) +| 920 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed) + +Disable them. + +Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> +--- + libs/async_mpi/tests/unit/CMakeLists.txt | 2 +- + libs/compute/tests/unit/CMakeLists.txt | 2 +- + .../tests/regressions/CMakeLists.txt | 4 +--- + .../segmented_algorithms/tests/unit/CMakeLists.txt | 2 +- + tests/unit/parcelset/CMakeLists.txt | 14 +++++++------- + 5 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/libs/async_mpi/tests/unit/CMakeLists.txt b/libs/async_mpi/tests/unit/CMakeLists.txt +index 30e6de80fa01..d78490089f02 100644 +--- a/libs/async_mpi/tests/unit/CMakeLists.txt ++++ b/libs/async_mpi/tests/unit/CMakeLists.txt +@@ -4,7 +4,7 @@ + # 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) + +-set(tests mpi_ring_async_executor) ++# set(tests mpi_ring_async_executor) + + set(mpi_ring_async_executor_PARAMETERS THREADS_PER_LOCALITY 4 LOCALITIES 2 + RUNWRAPPER mpi +diff --git a/libs/compute/tests/unit/CMakeLists.txt b/libs/compute/tests/unit/CMakeLists.txt +index c7c43c91ef08..349483642d33 100644 +--- a/libs/compute/tests/unit/CMakeLists.txt ++++ b/libs/compute/tests/unit/CMakeLists.txt +@@ -8,7 +8,7 @@ + set(tests block_allocator) + + if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER) +- set(tests ${tests} numa_allocator) ++ # set(tests ${tests} numa_allocator) + endif() + + # NB. threads = -2 = threads = 'cores' NB. threads = -1 = threads = 'all' +diff --git a/libs/performance_counters/tests/regressions/CMakeLists.txt b/libs/performance_counters/tests/regressions/CMakeLists.txt +index adf982876e21..406b2edf1837 100644 +--- a/libs/performance_counters/tests/regressions/CMakeLists.txt ++++ b/libs/performance_counters/tests/regressions/CMakeLists.txt +@@ -5,9 +5,7 @@ + # 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) + +-set(tests discover_counters_1787 dynamic_counters_loaded_1508 statistics_2666 +- uptime_1737 +-) ++set(tests discover_counters_1787 statistics_2666 uptime_1737) + + set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component) + +diff --git a/libs/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/segmented_algorithms/tests/unit/CMakeLists.txt +index 6dba64d19fc4..ccaa56b1a0ea 100644 +--- a/libs/segmented_algorithms/tests/unit/CMakeLists.txt ++++ b/libs/segmented_algorithms/tests/unit/CMakeLists.txt +@@ -8,7 +8,7 @@ set(tests + partitioned_vector_adjacent_difference1 + partitioned_vector_adjacent_difference2 + partitioned_vector_adjacent_find1 +- partitioned_vector_adjacent_find2 ++ # partitioned_vector_adjacent_find2 + partitioned_vector_all_of1 + partitioned_vector_all_of2 + partitioned_vector_any_of1 +diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt +index 1981e2baf8cd..b374292ceee7 100644 +--- a/tests/unit/parcelset/CMakeLists.txt ++++ b/tests/unit/parcelset/CMakeLists.txt +@@ -12,13 +12,13 @@ set(put_parcels_PARAMETERS LOCALITIES 2) + set(put_parcels_FLAGS DEPENDENCIES iostreams_component) + set(set_parcel_write_handler_PARAMETERS LOCALITIES 2) + +-if(HPX_WITH_PARCEL_COALESCING) +- set(tests ${tests} put_parcels_with_coalescing) +- set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2) +- set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component +- parcel_coalescing +- ) +-endif() ++# if(HPX_WITH_PARCEL_COALESCING) ++# set(tests ${tests} put_parcels_with_coalescing) ++# set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2) ++# set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component ++# parcel_coalescing ++# ) ++# endif() + + if(HPX_WITH_COMPRESSION_BZIP2 + OR HPX_WITH_COMPRESSION_ZLIB +-- +2.26.2 + diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.5.1.ebuild index 7206bca40824..7481a6229a72 100644 --- a/sys-cluster/hpx/hpx-1.4.1.ebuild +++ b/sys-cluster/hpx/hpx-1.5.1.ebuild @@ -3,16 +3,16 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..8} ) +PYTHON_COMPAT=( python3_{6..9} ) if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" else - SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz" + SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit cmake fortran-2 python-single-r1 check-reqs multiprocessing +inherit check-reqs cmake multiprocessing python-single-r1 DESCRIPTION="C++ runtime system for parallel and distributed applications" HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/" @@ -35,7 +35,7 @@ BDEPEND=" $(python_gen_cond_dep ' dev-python/sphinx[${PYTHON_MULTI_USEDEP}] dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] - >=dev-python/breathe-4.14[${PYTHON_MULTI_USEDEP}] + >=dev-python/breathe-4.22[${PYTHON_MULTI_USEDEP}] ') ) test? ( ${PYTHON_DEPS} ) @@ -53,10 +53,10 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-boost.patch" - "${FILESDIR}/${P}-disable-failing-tests.patch" - "${FILESDIR}/${P}-placeholder.patch" + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-docs.patch" "${FILESDIR}/${P}-python.patch" + "${FILESDIR}/${P}-tests.patch" ) hpx_memory_requirement() { diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index 168825c65b05..f8bb574e3255 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -3,16 +3,16 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..8} ) +PYTHON_COMPAT=( python3_{6..9} ) if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" else - SRC_URI="https://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz" + SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit cmake fortran-2 python-single-r1 check-reqs multiprocessing +inherit check-reqs cmake multiprocessing python-single-r1 DESCRIPTION="C++ runtime system for parallel and distributed applications" HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/" @@ -35,7 +35,7 @@ BDEPEND=" $(python_gen_cond_dep ' dev-python/sphinx[${PYTHON_MULTI_USEDEP}] dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] - >=dev-python/breathe-4.14[${PYTHON_MULTI_USEDEP}] + >=dev-python/breathe-4.22[${PYTHON_MULTI_USEDEP}] ') ) test? ( ${PYTHON_DEPS} ) |