summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Kanzenbach <kurt@kmk-computers.de>2021-02-27 19:24:47 +0100
committerJoonas Niilola <juippis@gentoo.org>2021-03-04 19:22:40 +0200
commit86a0e86408021af204903819813d13699cdfe719 (patch)
treeead4e8512ac0e637a0088dbabae9cfd873a6ea29 /sys-cluster/hpx
parentsys-cluster/hpx: Bump to version v1.6.0 (diff)
downloadgentoo-86a0e86408021af204903819813d13699cdfe719.tar.gz
gentoo-86a0e86408021af204903819813d13699cdfe719.tar.bz2
gentoo-86a0e86408021af204903819813d13699cdfe719.zip
sys-cluster/hpx: Drop old
Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de> Closes: https://github.com/gentoo/gentoo/pull/19692 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-cluster/hpx')
-rw-r--r--sys-cluster/hpx/Manifest1
-rw-r--r--sys-cluster/hpx/files/hpx-1.5.1-cmake.patch32
-rw-r--r--sys-cluster/hpx/files/hpx-1.5.1-docs.patch91
-rw-r--r--sys-cluster/hpx/files/hpx-1.5.1-python.patch37
-rw-r--r--sys-cluster/hpx/files/hpx-1.5.1-tests.patch111
-rw-r--r--sys-cluster/hpx/hpx-1.5.1.ebuild120
6 files changed, 0 insertions, 392 deletions
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 146cb785163b..3cdb83c4d054 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,2 +1 @@
-DIST hpx-1.5.1.tar.gz 4576475 BLAKE2B 8702638461f92d9d94d0e2ac4ec32527d995a45f54babcbf08d644d1cac8fa37692fb66f59e221930f7738861b41a93fd0ab64d11c4e46d4e039ff3b0e4fec72 SHA512 ab2603adca8780808b62b55f57a03bf8491b805665831c1c484eeba8e7b306bb3269884c8940ad2fc4c5b0d679c54b1e33bc077cdb7ea6d1cb9a715ff70b9842
DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc
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 <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
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 <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.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 <kurt@kmk-computers.de>
-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 <kurt@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 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 <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.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}"
-}