commit: 55c06d283d3289f8350aec0ab9137fe97c3fa568 Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de> AuthorDate: Mon Jul 19 16:42:20 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Jul 23 14:33:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c06d28
sys-cluster/hpx: Drop old Closes: https://bugs.gentoo.org/733778 Closes: https://bugs.gentoo.org/774198 Closes: https://bugs.gentoo.org/800623 Closes: https://bugs.gentoo.org/800641 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de> Closes: https://github.com/gentoo/gentoo/pull/21714 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-cluster/hpx/Manifest | 1 - 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.6.0.ebuild | 120 --------------------------- 6 files changed, 396 deletions(-) diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index dddef438e7f..e89c5667bf2 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,2 +1 @@ -DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518 diff --git a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch deleted file mode 100644 index 646084e7729..00000000000 --- a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 240f55e4bc57215e26fc0b0ae0ac0eca2eb93d65 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach <k...@kmk-computers.de> -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 <k...@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 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=$<CONFIGURATION> - 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 deleted file mode 100644 index 3823bab918b..00000000000 --- a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1de9f65fac6c4b65ff280501d60b9b6dd46c6a8c Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach <k...@kmk-computers.de> -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 <k...@kmk-computers.de> ---- - .../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 <mutex> - #include <type_traits> - --// 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 <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); -@@ -160,5 +152,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.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 deleted file mode 100644 index 412e7289bc5..00000000000 --- a/sys-cluster/hpx/files/hpx-1.6.0-python.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach <k...@kmk-computers.de> -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 <k...@kmk-computers.de> ---- - 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 deleted file mode 100644 index 8a6884a57a1..00000000000 --- a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch +++ /dev/null @@ -1,115 +0,0 @@ -From e350546da5caee062684548b6727f4cb67981b7e Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach <k...@kmk-computers.de> -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 <k...@kmk-computers.de> ---- - 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.6.0.ebuild b/sys-cluster/hpx/hpx-1.6.0.ebuild deleted file mode 100644 index 6f139b5d384..00000000000 --- a/sys-cluster/hpx/hpx-1.6.0.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..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_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - dev-python/breathe[${PYTHON_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}" -}
