From 6d691ad5b6239929063441bbd14c489e92e7396e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Mar 2021 09:25:57 +0000 Subject: gentoo resync : 05.03.2021 --- sys-cluster/hpx/Manifest | 12 +-- sys-cluster/hpx/files/hpx-1.5.1-cmake.patch | 32 ------- sys-cluster/hpx/files/hpx-1.5.1-docs.patch | 91 -------------------- sys-cluster/hpx/files/hpx-1.5.1-python.patch | 37 --------- sys-cluster/hpx/files/hpx-1.5.1-tests.patch | 111 ------------------------- sys-cluster/hpx/files/hpx-1.6.0-cmake.patch | 32 +++++++ sys-cluster/hpx/files/hpx-1.6.0-docs.patch | 91 ++++++++++++++++++++ sys-cluster/hpx/files/hpx-1.6.0-python.patch | 37 +++++++++ sys-cluster/hpx/files/hpx-1.6.0-tests.patch | 115 +++++++++++++++++++++++++ sys-cluster/hpx/hpx-1.5.1.ebuild | 120 --------------------------- sys-cluster/hpx/hpx-1.6.0.ebuild | 120 +++++++++++++++++++++++++++ 11 files changed, 401 insertions(+), 397 deletions(-) delete mode 100644 sys-cluster/hpx/files/hpx-1.5.1-cmake.patch delete mode 100644 sys-cluster/hpx/files/hpx-1.5.1-docs.patch delete mode 100644 sys-cluster/hpx/files/hpx-1.5.1-python.patch delete mode 100644 sys-cluster/hpx/files/hpx-1.5.1-tests.patch create mode 100644 sys-cluster/hpx/files/hpx-1.6.0-cmake.patch create mode 100644 sys-cluster/hpx/files/hpx-1.6.0-docs.patch create mode 100644 sys-cluster/hpx/files/hpx-1.6.0-python.patch create mode 100644 sys-cluster/hpx/files/hpx-1.6.0-tests.patch delete mode 100644 sys-cluster/hpx/hpx-1.5.1.ebuild create mode 100644 sys-cluster/hpx/hpx-1.6.0.ebuild (limited to 'sys-cluster/hpx') diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index 48be371cbcf8..2a64a22daefc 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,8 +1,8 @@ -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 39aa87029c2d7a56ba29d7af0a1230f88f0ed8faeaa7a07c08c00583a84d4fdedb8e6845d6c482564a7c9ba83b95b0bf0e2f0abb2e44da4133166ccda0cddc53 SHA512 64b4a036e374f7d3632ea73a4ae9dd9772974ae92a0fbeaea21dac6213e92835b4a039bdbbfb1f3f1066895e52f70bfd35f727ba9fecae0a248735c209262725 +AUX hpx-1.6.0-cmake.patch 1135 BLAKE2B f8568002d02a86da600e0efa740f0a73a5e01f8cf8cba925fee727d5ff76e7c5d98961aace52a7d8188c88154b294540d5f4c7ab1d2a888026ce9b2a0ec9e27c SHA512 cf93f71e52fd49ca5d1aaaaa128e69f13e8b3808e5ee3a70bba7ce47b4539e6761a56d6a15a6106e825f8c6a9fec36fb4d43ec221a857091972d1d9b0c900dc0 +AUX hpx-1.6.0-docs.patch 4445 BLAKE2B 82d6288d0743b2d512f37e22dda7f33226e76ace62d96dab4b2d78f95cf80ec8cf247952d1632daabd8acd7d5b5f475103b5f924f11e778c70ae138fb100a2d1 SHA512 bc121d3709312cc510547286d4e25002f87659b4eea8de2f2b3247811c02d04fc2d694d1403164e6942e8e6b8090e622f020d41e0100a5349a6c4330a3725702 +AUX hpx-1.6.0-python.patch 1099 BLAKE2B e38ee7c0a724e521f67f2e018e83739db14476126b4a81dbc474537ef350c47fe9cf14cbc8b8e194067098c88034834f70027df1098006486b2c561564ad9313 SHA512 943fdffc0fce180a69a57819a84eed97a335efdfe939e33834cc3ff6485db22760eee80accf1ec63b59872d2352ca100af4445dae5966f7315a43cd8b7ae0d78 +AUX hpx-1.6.0-tests.patch 4965 BLAKE2B dfbc54a24095ce171657185a3f9ee3c1574bd08647397a6be0e80abd9934548bf03e03fd846813ac2067db28ec2349f8a07f7e203292c7710108af4bdf8aee7d SHA512 765295865ee2d5c581c976a36def227361b26d8dfb3262d21956a954a63122722a4160d5c49168b1dcea1703e60bedc4e7bade5d44bf2fe1a159827327a9b606 +DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc +EBUILD hpx-1.6.0.ebuild 2613 BLAKE2B d359f8307fa633ce2dd23ead6ebc0280548761c5f44ed9dcfd6520e0312678e831a4ad9b0c506c578a95f621ca10bcf57977027e77e3d45c079b1638bc589451 SHA512 7857998bea3fecaee3014a6c472a043362c3045b66653a14f9e09b2bac3964810ceb300fb06c73dc251fc1d1779dd01efc4255c916467375f5c41d2defb290a8 EBUILD hpx-9999.ebuild 2479 BLAKE2B b231c4bd3c31aabe377d3eaac23233c6d52e589e08fe332ddacd88919de691e019bd9408ae25683623caf2f03b433f94fa8f1b201975e03e228964df0b0d37d4 SHA512 693efe1598700f659a804f89993a92acaf563cc378ae9c6a1753aa6470493e78767b8c1554bc5bb2eb2b9ebcdd7460aef0372e897c50126f12472b1a33098fdb MISC metadata.xml 1189 BLAKE2B a6fedaeaa9c32038109691eb64fd62dd0cf0bc2104710fa49d57a95b09674a23d4e38d03fa2e306734b587a8682c1a7007ed078988226c39f17ccacece740a52 SHA512 eddd398a02bfa3716a373a6cb909a881efd72c11d7e4ce05a722da1fb5d5e464b59999d5bf0de2e608f768d6ceb50ccd64d43e77088c19fa1b28a19b404469da diff --git a/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch b/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch deleted file mode 100644 index ab31178bbe6d..000000000000 --- a/sys-cluster/hpx/files/hpx-1.5.1-cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8bee06baabf24c4b8f48766dba5c76d1979c8ea6 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -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 ---- - 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=$ - 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 deleted file mode 100644 index a9978ea29550..000000000000 --- a/sys-cluster/hpx/files/hpx-1.5.1-docs.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 785ade96043ab6fff85646a841996ccf6dfd0b62 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -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 ---- - .../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 - #include - --// 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 -- struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static; -+ struct HPX_EXPORT reinitializable_static; - - ////////////////////////////////////////////////////////////////////////// - template -- 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 - std::once_flag reinitializable_static::constructed_; - }} // namespace hpx::util -- --#undef HPX_EXPORT_REINITIALIZABLE_STATIC --- -2.26.2 - diff --git a/sys-cluster/hpx/files/hpx-1.5.1-python.patch b/sys-cluster/hpx/files/hpx-1.5.1-python.patch deleted file mode 100644 index 51e225e8f5bc..000000000000 --- a/sys-cluster/hpx/files/hpx-1.5.1-python.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0d250c5747f3a80ddda6f5bf298cead9048d1c28 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Tue, 17 Mar 2020 16:20:35 +0100 -Subject: [PATCH] cmake: python: Use standard python interpreter - -These scripts are needed during build and run time. So, use a python interpreter -which works for both cases. - -Signed-off-by: Kurt Kanzenbach ---- - cmake/templates/hpxcxx.in | 2 +- - cmake/templates/hpxrun.py.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in -index 81f38f89367d..a0fd7837b066 100755 ---- a/cmake/templates/hpxcxx.in -+++ b/cmake/templates/hpxcxx.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Steven R. Brandt - # -diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in -index 44a79e7cbffb..d4ab6020485e 100755 ---- a/cmake/templates/hpxrun.py.in -+++ b/cmake/templates/hpxrun.py.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Thomas Heller - # --- -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 deleted file mode 100644 index 4a930eb0c0c7..000000000000 --- a/sys-cluster/hpx/files/hpx-1.5.1-tests.patch +++ /dev/null @@ -1,111 +0,0 @@ -From e623c902bc57f85b3d1b09e58b75fb01898b409e Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -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 ---- - 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/files/hpx-1.6.0-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch new file mode 100644 index 000000000000..646084e77294 --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch @@ -0,0 +1,32 @@ +From 240f55e4bc57215e26fc0b0ae0ac0eca2eb93d65 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Sat, 19 Sep 2020 13:19:42 +0200 +Subject: [PATCH 2/3] 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 +--- + 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 3798549da0a8..7d3bfea1044e 100644 +--- a/tests/unit/build/CMakeLists.txt ++++ b/tests/unit/build/CMakeLists.txt +@@ -54,7 +54,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=$ + VERBATIM +-- +2.30.1 + diff --git a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch new file mode 100644 index 000000000000..3823bab918bd --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch @@ -0,0 +1,91 @@ +From 1de9f65fac6c4b65ff280501d60b9b6dd46c6a8c Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Mon, 22 Feb 2021 20:36:14 +0100 +Subject: [PATCH 3/3] 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 +--- + .../hpx/static_reinit/reinitializable_static.hpp | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp +index 51ccbf2481b2..b8661d1c84cb 100644 +--- a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp ++++ b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp +@@ -18,14 +18,6 @@ + #include + #include + +-// clang-format off +-#if !defined(HPX_WINDOWS) +-# define HPX_EXPORT_REINITIALIZABLE_STATIC HPX_CORE_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. +@@ -40,11 +32,11 @@ namespace hpx { namespace util { + // functions used by the HPX runtime system to reinitialize the held data + // structures. + template +- struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static; ++ struct HPX_EXPORT reinitializable_static; + + ////////////////////////////////////////////////////////////////////////// + template +- struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static ++ struct HPX_EXPORT reinitializable_static + { + public: + HPX_NON_COPYABLE(reinitializable_static); +@@ -160,5 +152,3 @@ namespace hpx { namespace util { + template + std::once_flag reinitializable_static::constructed_; + }} // namespace hpx::util +- +-#undef HPX_EXPORT_REINITIALIZABLE_STATIC +-- +2.30.1 + diff --git a/sys-cluster/hpx/files/hpx-1.6.0-python.patch b/sys-cluster/hpx/files/hpx-1.6.0-python.patch new file mode 100644 index 000000000000..412e7289bc5b --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.6.0-python.patch @@ -0,0 +1,37 @@ +From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Tue, 17 Mar 2020 16:20:35 +0100 +Subject: [PATCH 1/3] cmake: python: Use standard python interpreter + +These scripts are needed during build and run time. So, use a python interpreter +which works for both cases. + +Signed-off-by: Kurt Kanzenbach +--- + cmake/templates/hpxcxx.in | 2 +- + cmake/templates/hpxrun.py.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in +index 81f38f89367d..a0fd7837b066 100755 +--- a/cmake/templates/hpxcxx.in ++++ b/cmake/templates/hpxcxx.in +@@ -1,4 +1,4 @@ +-#! @PYTHON_EXECUTABLE@ ++#! /usr/bin/env python + # + # Copyright (c) 2014 Steven R. Brandt + # +diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in +index 60e59cc118d9..0c32bba98917 100755 +--- a/cmake/templates/hpxrun.py.in ++++ b/cmake/templates/hpxrun.py.in +@@ -1,4 +1,4 @@ +-#! @PYTHON_EXECUTABLE@ ++#! /usr/bin/env python + # + # Copyright (c) 2014 Thomas Heller + # +-- +2.30.1 + diff --git a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch b/sys-cluster/hpx/files/hpx-1.6.0-tests.patch new file mode 100644 index 000000000000..8a6884a57a1b --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.6.0-tests.patch @@ -0,0 +1,115 @@ +From e350546da5caee062684548b6727f4cb67981b7e Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Fri, 26 Feb 2021 18:28:14 +0100 +Subject: [PATCH] test: Disable failing tests + +The following tests fail within portage: + +|199 - tests.unit.modules.async_mpi.mpi_ring_async_executor (Timeout) +|250 - tests.unit.modules.compute.numa_allocator (Failed) +|268 - tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508 (Failed) +|318 - tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector_adjacent_find2 +|967 - tests.unit.parcelset.distributed.mpi.put_parcels_with_coalescing (Timeout) +|968 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed) + +Disable them. + +Signed-off-by: Kurt Kanzenbach +--- + libs/full/async_mpi/tests/unit/CMakeLists.txt | 2 +- + libs/full/compute/tests/unit/CMakeLists.txt | 6 +++--- + .../tests/regressions/CMakeLists.txt | 8 ++++---- + .../segmented_algorithms/tests/unit/CMakeLists.txt | 2 +- + tests/unit/parcelset/CMakeLists.txt | 14 +++++++------- + 5 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/libs/full/async_mpi/tests/unit/CMakeLists.txt b/libs/full/async_mpi/tests/unit/CMakeLists.txt +index 8f2d77fc3567..9cd7d39597b3 100644 +--- a/libs/full/async_mpi/tests/unit/CMakeLists.txt ++++ b/libs/full/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/full/compute/tests/unit/CMakeLists.txt b/libs/full/compute/tests/unit/CMakeLists.txt +index 7c700d5ae639..c655772234b8 100644 +--- a/libs/full/compute/tests/unit/CMakeLists.txt ++++ b/libs/full/compute/tests/unit/CMakeLists.txt +@@ -7,9 +7,9 @@ + + set(tests block_allocator) + +-if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER) +- set(tests ${tests} numa_allocator) +-endif() ++# if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER) ++# set(tests ${tests} numa_allocator) ++# endif() + + # NB. threads = -2 = threads = 'cores' NB. threads = -1 = threads = 'all' + set(numa_allocator_PARAMETERS +diff --git a/libs/full/performance_counters/tests/regressions/CMakeLists.txt b/libs/full/performance_counters/tests/regressions/CMakeLists.txt +index 9939ef701e3b..f0647b27a2dc 100644 +--- a/libs/full/performance_counters/tests/regressions/CMakeLists.txt ++++ b/libs/full/performance_counters/tests/regressions/CMakeLists.txt +@@ -7,10 +7,10 @@ + + set(tests discover_counters_1787 statistics_2666 uptime_1737) + +-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +- set(tests ${tests} dynamic_counters_loaded_1508) +- set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component) +-endif() ++# if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") ++# set(tests ${tests} dynamic_counters_loaded_1508) ++# set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component) ++# endif() + + foreach(test ${tests}) + set(sources ${test}.cpp) +diff --git a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt +index 7cfd7e596de5..b35c1de7ac94 100644 +--- a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt ++++ b/libs/full/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.30.1 + diff --git a/sys-cluster/hpx/hpx-1.5.1.ebuild b/sys-cluster/hpx/hpx-1.5.1.ebuild deleted file mode 100644 index 81e5f374f8d1..000000000000 --- a/sys-cluster/hpx/hpx-1.5.1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" -else - SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi -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/" - -SLOT="0" -LICENSE="Boost-1.0" -IUSE="doc examples jemalloc mpi papi +perftools tbb test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( jemalloc perftools tbb ) -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - ${PYTHON_DEPS} - app-doc/doxygen - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] - >=dev-python/breathe-4.22[${PYTHON_MULTI_USEDEP}] - ') - ) - test? ( ${PYTHON_DEPS} ) -" -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/boost:= - sys-apps/hwloc - sys-libs/zlib - mpi? ( virtual/mpi ) - papi? ( dev-libs/papi ) - perftools? ( dev-util/google-perftools ) - tbb? ( dev-cpp/tbb ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-docs.patch" - "${FILESDIR}/${P}-python.patch" - "${FILESDIR}/${P}-tests.patch" -) - -hpx_memory_requirement() { - # HPX needs enough main memory for compiling - # rule of thumb: 1G per job - if [[ -z ${MAKEOPTS} ]] ; then - echo "2G" - else - local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - echo "${jobs}G" - fi -} - -pkg_pretend() { - local CHECKREQS_MEMORY=$(hpx_memory_requirement) - check-reqs_pkg_setup -} - -pkg_setup() { - local CHECKREQS_MEMORY=$(hpx_memory_requirement) - check-reqs_pkg_setup - python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DHPX_WITH_EXAMPLES=OFF - -DHPX_WITH_DOCUMENTATION=$(usex doc) - -DHPX_WITH_PARCELPORT_MPI=$(usex mpi) - -DHPX_WITH_PAPI=$(usex papi) - -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) - -DBUILD_TESTING=$(usex test) - ) - if use jemalloc; then - mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc ) - elif use perftools; then - mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc ) - elif use tbb; then - mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc ) - else - mycmakeargs+=( -DHPX_WITH_MALLOC=system ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use test && cmake_build tests -} - -src_test() { - # avoid over-suscribing - cmake_src_test -j1 -} - -src_install() { - cmake_src_install - use examples && dodoc -r examples/ - python_fix_shebang "${ED}" -} diff --git a/sys-cluster/hpx/hpx-1.6.0.ebuild b/sys-cluster/hpx/hpx-1.6.0.ebuild new file mode 100644 index 000000000000..e5e15ce69bc6 --- /dev/null +++ b/sys-cluster/hpx/hpx-1.6.0.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" +else + SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi +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/" + +SLOT="0" +LICENSE="Boost-1.0" +IUSE="doc examples jemalloc mpi papi +perftools tbb test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ?? ( jemalloc perftools tbb ) +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + ${PYTHON_DEPS} + app-doc/doxygen + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + dev-python/breathe[${PYTHON_MULTI_USEDEP}] + ') + ) + test? ( ${PYTHON_DEPS} ) +" +RDEPEND=" + ${PYTHON_DEPS} + dev-libs/boost:= + sys-apps/hwloc + sys-libs/zlib + mpi? ( virtual/mpi ) + papi? ( dev-libs/papi ) + perftools? ( dev-util/google-perftools ) + tbb? ( dev-cpp/tbb ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-docs.patch" + "${FILESDIR}/${P}-python.patch" + "${FILESDIR}/${P}-tests.patch" +) + +hpx_memory_requirement() { + # HPX needs enough main memory for compiling + # rule of thumb: 1G per job + if [[ -z ${MAKEOPTS} ]] ; then + echo "2G" + else + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + echo "${jobs}G" + fi +} + +pkg_pretend() { + local CHECKREQS_MEMORY=$(hpx_memory_requirement) + check-reqs_pkg_setup +} + +pkg_setup() { + local CHECKREQS_MEMORY=$(hpx_memory_requirement) + check-reqs_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DHPX_WITH_EXAMPLES=OFF + -DHPX_WITH_DOCUMENTATION=$(usex doc) + -DHPX_WITH_PARCELPORT_MPI=$(usex mpi) + -DHPX_WITH_PAPI=$(usex papi) + -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) + -DBUILD_TESTING=$(usex test) + ) + if use jemalloc; then + mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc ) + elif use perftools; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc ) + elif use tbb; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc ) + else + mycmakeargs+=( -DHPX_WITH_MALLOC=system ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use test && cmake_build tests +} + +src_test() { + # avoid over-suscribing + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + use examples && dodoc -r examples/ + python_fix_shebang "${ED}" +} -- cgit v1.2.3