* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2020-03-25 11:17 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-03-25 11:17 UTC (permalink / raw
To: gentoo-commits
commit: adf9ea11ed30a334eb70735eb86c82fad4ef35f0
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Mar 15 18:47:13 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 11:17:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf9ea11
sys-cluster/hpx: Bump version to v1.4.1
The existing version is a year old. Add the current version.
Announce: http://stellar-group.org/2020/02/hpx-1-4-1-released/
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 +
sys-cluster/hpx/files/hpx-1.4.1-boost.patch | 30 ++++
.../files/hpx-1.4.1-disable-failing-tests.patch | 157 +++++++++++++++++++++
sys-cluster/hpx/files/hpx-1.4.1-python.patch | 37 +++++
sys-cluster/hpx/hpx-1.4.1.ebuild | 117 +++++++++++++++
5 files changed, 342 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index cad2be6c824..18b6ea7b1ed 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
DIST hpx_1.2.1.tar.gz 3919474 BLAKE2B 5f62f97a047c1b931068b671855bc9d7b8ff03d7f26793ee58445fb4c567d68c6c24c87844c7a6463901d784e11afe475120a41038e783a67cc75ede508473c5 SHA512 057724de1ef252e941a776174fa594a855255b5600461725a4da6e9002b1424a1e59be3f8a40673bb3db5a8aabd3c7b38abbb78042490befe247dd73c921b87c
+DIST hpx_1.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582
diff --git a/sys-cluster/hpx/files/hpx-1.4.1-boost.patch b/sys-cluster/hpx/files/hpx-1.4.1-boost.patch
new file mode 100644
index 00000000000..939f4f77813
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.4.1-boost.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 00000000000..492cbaf2378
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.4.1-disable-failing-tests.patch
@@ -0,0 +1,157 @@
+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-python.patch b/sys-cluster/hpx/files/hpx-1.4.1-python.patch
new file mode 100644
index 00000000000..d28c8a61f23
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.4.1-python.patch
@@ -0,0 +1,37 @@
+From 641d9766c73d2ee08aac8e1e0dd123b9d6db0c25 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 0e9f04a60495..7ccd2715a697 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.24.1
+
diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild
new file mode 100644
index 00000000000..dd34133656e
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.4.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+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"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit cmake fortran-2 python-single-r1 check-reqs
+
+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 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.14[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ test? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/boost:=
+ sys-apps/hwloc
+ sys-libs/zlib
+ papi? ( dev-libs/papi )
+ perftools? ( dev-util/google-perftools )
+ tbb? ( dev-cpp/tbb )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-boost.patch"
+ "${FILESDIR}/${P}-disable-failing-tests.patch"
+ "${FILESDIR}/${P}-python.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=`echo ${MAKEOPTS} | cut -d j -f 2`
+ 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_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}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2020-10-31 9:47 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-10-31 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 7b6a14caf639a25079c06286c0a07c4ca31d6620
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Sep 18 20:01:02 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:47:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6a14ca
sys-cluster/hpx: Bump version to v1.5.1
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 +
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/hpx-1.5.1.ebuild | 120 +++++++++++++++++++++++++++
6 files changed, 392 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 1fa6355399d..519246709a7 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
+DIST hpx-1.5.1.tar.gz 4576475 BLAKE2B 8702638461f92d9d94d0e2ac4ec32527d995a45f54babcbf08d644d1cac8fa37692fb66f59e221930f7738861b41a93fd0ab64d11c4e46d4e039ff3b0e4fec72 SHA512 ab2603adca8780808b62b55f57a03bf8491b805665831c1c484eeba8e7b306bb3269884c8940ad2fc4c5b0d679c54b1e33bc077cdb7ea6d1cb9a715ff70b9842
DIST hpx_1.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582
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 00000000000..ab31178bbe6
--- /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 00000000000..a9978ea2955
--- /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.5.1-python.patch b/sys-cluster/hpx/files/hpx-1.5.1-python.patch
new file mode 100644
index 00000000000..51e225e8f5b
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.5.1-python.patch
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 00000000000..4a930eb0c0c
--- /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.5.1.ebuild b/sys-cluster/hpx/hpx-1.5.1.ebuild
new file mode 100644
index 00000000000..7481a6229a7
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.5.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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://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}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2020-10-31 9:47 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-10-31 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 14fe4e4392d78029ea9d761696b3b3d4fda08999
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Fri Sep 18 20:04:19 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:47:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fe4e43
sys-cluster/hpx: Drop old
The new version v1.5 builds with clang and boost-1.74. So, the build failure
bugs related to v1.4 can be closed.
Closes: https://bugs.gentoo.org/741960
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 -
sys-cluster/hpx/files/hpx-1.4.1-boost.patch | 30 ----
.../files/hpx-1.4.1-disable-failing-tests.patch | 157 ---------------------
sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch | 79 -----------
sys-cluster/hpx/files/hpx-1.4.1-python.patch | 37 -----
sys-cluster/hpx/hpx-1.4.1.ebuild | 120 ----------------
6 files changed, 424 deletions(-)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 519246709a7..b94551a449f 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.4.1.tar.gz 4213023 BLAKE2B dc8a9cda3061359ea1bb8eba9ccee60dea308f5425cfe0f18d9003032726962d74d417b8748124c8e6a0b207624093ccf625c82e9e1a71fce8dde74d41d987d2 SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582
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 939f4f77813..00000000000
--- 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 492cbaf2378..00000000000
--- 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 94271e6c0ec..00000000000
--- 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.4.1-python.patch b/sys-cluster/hpx/files/hpx-1.4.1-python.patch
deleted file mode 100644
index d28c8a61f23..00000000000
--- a/sys-cluster/hpx/files/hpx-1.4.1-python.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 641d9766c73d2ee08aac8e1e0dd123b9d6db0c25 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 0e9f04a60495..7ccd2715a697 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.24.1
-
diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild
deleted file mode 100644
index 7206bca4082..00000000000
--- a/sys-cluster/hpx/hpx-1.4.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_{6..8} )
-
-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"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-inherit cmake fortran-2 python-single-r1 check-reqs multiprocessing
-
-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.14[${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}-boost.patch"
- "${FILESDIR}/${P}-disable-failing-tests.patch"
- "${FILESDIR}/${P}-placeholder.patch"
- "${FILESDIR}/${P}-python.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}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2021-03-04 17:22 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2021-03-04 17:22 UTC (permalink / raw
To: gentoo-commits
commit: 8b39bcf6af6eb60d49ff6d6ce09f7fd6da862ae7
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Feb 27 18:23:53 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 4 17:22:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b39bcf6
sys-cluster/hpx: Bump to version v1.6.0
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
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 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index b94551a449f..146cb785163 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
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.6.0-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
new file mode 100644
index 00000000000..646084e7729
--- /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 <kurt@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 <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 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
new file mode 100644
index 00000000000..3823bab918b
--- /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 <kurt@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 <kurt@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
new file mode 100644
index 00000000000..412e7289bc5
--- /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 <kurt@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 <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 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 00000000000..8a6884a57a1
--- /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 <kurt@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 <kurt@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
new file mode 100644
index 00000000000..e5e15ce69bc
--- /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}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2021-03-04 17:22 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2021-03-04 17:22 UTC (permalink / raw
To: gentoo-commits
commit: 86a0e86408021af204903819813d13699cdfe719
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Feb 27 18:24:47 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 4 17:22:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a0e864
sys-cluster/hpx: Drop old
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/19692
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 -
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/hpx-1.5.1.ebuild | 120 ---------------------------
6 files changed, 392 deletions(-)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 146cb785163..3cdb83c4d05 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 ab31178bbe6..00000000000
--- 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 a9978ea2955..00000000000
--- 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 51e225e8f5b..00000000000
--- 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 4a930eb0c0c..00000000000
--- 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 81e5f374f8d..00000000000
--- 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}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2021-07-23 14:33 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2021-07-23 14:33 UTC (permalink / raw
To: gentoo-commits
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 <kurt@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 <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 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 <kurt@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 <kurt@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 <kurt@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 <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 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 <kurt@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 <kurt@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}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2021-08-24 8:50 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2021-08-24 8:50 UTC (permalink / raw
To: gentoo-commits
commit: cb5f6e4697232cd663ce85d9a72b0db00da81948
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Aug 19 18:27:23 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 08:50:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb5f6e46
sys-cluster/hpx: Bump version to v1.7.1
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 +
sys-cluster/hpx/files/hpx-1.7.1-python.patch | 30 ++++++++
sys-cluster/hpx/hpx-1.7.1.ebuild | 104 +++++++++++++++++++++++++++
3 files changed, 135 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index e89c5667bf2..7e92db81410 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
+DIST hpx-1.7.1.tar.gz 4751163 BLAKE2B 21e417dab5c118b16ab8d2955b0d65a95ca7d0e2f777496306855e4098cfb400962dd9e0cf03ebbab5e3348f2f985d1053d0a70124c0925c77859e8ada209cec SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3
diff --git a/sys-cluster/hpx/files/hpx-1.7.1-python.patch b/sys-cluster/hpx/files/hpx-1.7.1-python.patch
new file mode 100644
index 00000000000..21b7ce3ceef
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.7.1-python.patch
@@ -0,0 +1,30 @@
+From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 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 1/4] 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(-)
+
+--- 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
+ #
+--- 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
+ #
diff --git a/sys-cluster/hpx/hpx-1.7.1.ebuild b/sys-cluster/hpx/hpx-1.7.1.ebuild
new file mode 100644
index 00000000000..2ab8ea741f3
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.7.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ?? ( jemalloc perftools tbb )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/asio
+ dev-libs/boost:=
+ sys-apps/hwloc
+ sys-libs/zlib
+ jemalloc? ( dev-libs/jemalloc )
+ mpi? ( virtual/mpi )
+ papi? ( dev-libs/papi )
+ perftools? ( dev-util/google-perftools )
+ tbb? ( dev-cpp/tbb )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-python.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=OFF
+ -DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
+ -DHPX_WITH_PAPI=$(usex papi)
+ -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
+ -DBUILD_TESTING=OFF
+ )
+ 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
+}
+
+src_install() {
+ cmake_src_install
+ use examples && dodoc -r examples/
+ python_fix_shebang "${ED}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2022-06-03 8:35 Florian Schmaus
0 siblings, 0 replies; 10+ messages in thread
From: Florian Schmaus @ 2022-06-03 8:35 UTC (permalink / raw
To: gentoo-commits
commit: 64d66a0d31a271b0c8614e968f70c90b83a2bf29
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon May 30 18:51:48 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 08:35:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d66a0d
sys-cluster/hpx: add 1.8.0
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 +
sys-cluster/hpx/files/hpx-1.8.0-python.patch | 30 ++++++++
sys-cluster/hpx/hpx-1.8.0.ebuild | 105 +++++++++++++++++++++++++++
3 files changed, 136 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 32cfd01e4d9c..0e04f6bf71bc 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
DIST hpx-1.7.1.tar.gz 4751163 BLAKE2B 21e417dab5c118b16ab8d2955b0d65a95ca7d0e2f777496306855e4098cfb400962dd9e0cf03ebbab5e3348f2f985d1053d0a70124c0925c77859e8ada209cec SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3
+DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-python.patch b/sys-cluster/hpx/files/hpx-1.8.0-python.patch
new file mode 100644
index 000000000000..21b7ce3ceeff
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-python.patch
@@ -0,0 +1,30 @@
+From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 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 1/4] 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(-)
+
+--- 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
+ #
+--- 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
+ #
diff --git a/sys-cluster/hpx/hpx-1.8.0.ebuild b/sys-cluster/hpx/hpx-1.8.0.ebuild
new file mode 100644
index 000000000000..a1b86f1f953f
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.8.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+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://hpx.stellar-group.org/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="examples jemalloc mpi papi +perftools tbb zlib"
+# tests fail to compile
+RESTRICT="test"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ?? ( jemalloc perftools tbb )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-cpp/asio-1.12.0
+ dev-libs/boost:=
+ sys-apps/hwloc:=
+ jemalloc? ( dev-libs/jemalloc:= )
+ mpi? ( virtual/mpi )
+ papi? ( dev-libs/papi )
+ perftools? ( dev-util/google-perftools:= )
+ tbb? ( dev-cpp/tbb:= )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-python.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=OFF
+ -DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
+ -DHPX_WITH_PAPI=$(usex papi)
+ -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
+ -DHPX_WITH_COMPRESSION_ZLIB=$(usex zlib)
+ -DHPX_WITH_TESTS=OFF
+ )
+ 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
+}
+
+src_install() {
+ cmake_src_install
+ use examples && dodoc -r examples/
+ python_fix_shebang "${ED}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2024-07-13 8:11 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2024-07-13 8:11 UTC (permalink / raw
To: gentoo-commits
commit: b3ff0a4b0cd54a6b1c51c6ca293be33d11e0d263
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Jun 9 17:21:35 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 08:11:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ff0a4b
sys-cluster/hpx: add 1.10.0
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 +
sys-cluster/hpx/files/hpx-1.10.0-python.patch | 30 ++++++++
sys-cluster/hpx/hpx-1.10.0.ebuild | 105 ++++++++++++++++++++++++++
3 files changed, 136 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 5899fb6e1134..c034dc54e809 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
+DIST hpx-1.10.0.tar.gz 6146815 BLAKE2B eeab350944e5a7e68a0bbf2a7bac22c6d739359113ed75d5ed2ff601887c9466c6f92b80823be140e02e1a47480323b69a5f193f13b415f505ccae02792f6e1c SHA512 e1cc9fa72cba4e66b5d6eff2487e93d5d553c32e6eebcfe9131bf69c5b595ab72295ff0986c81d5dc6a7caa8303d6709df91333f64efe59ee256d99a8c289dc5
DIST hpx-1.9.1.tar.gz 5662661 BLAKE2B 81631333b8899a7271e8c6edf587d0a3afadde28f2605ac4f8ff6ddc3fa5afb5ad8d05818ae6d0bfa8fb7241d3aebfe5f838b85b77f54327010308b22b4900b7 SHA512 a7972beada950cf6ef3b61f20496a08b220e4f48c28c11d57c20683906ca5124a9f36ac2552318883a5ab1db6efdbf63d1141b6e0c484c560a8c1311ae2d7090
diff --git a/sys-cluster/hpx/files/hpx-1.10.0-python.patch b/sys-cluster/hpx/files/hpx-1.10.0-python.patch
new file mode 100644
index 000000000000..573529e76588
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.10.0-python.patch
@@ -0,0 +1,30 @@
+From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 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 1/4] 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(-)
+
+--- 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
+ #
+--- 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
+ #
diff --git a/sys-cluster/hpx/hpx-1.10.0.ebuild b/sys-cluster/hpx/hpx-1.10.0.ebuild
new file mode 100644
index 000000000000..0c9138e2ed8a
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.10.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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/v${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://hpx.stellar-group.org/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="examples jemalloc mpi papi +perftools tbb zlib"
+# tests fail to compile
+RESTRICT="test"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ?? ( jemalloc perftools tbb )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-cpp/asio-1.12.0
+ dev-libs/boost:=
+ sys-apps/hwloc:=
+ jemalloc? ( dev-libs/jemalloc:= )
+ mpi? ( virtual/mpi )
+ papi? ( dev-libs/papi )
+ perftools? ( dev-util/google-perftools:= )
+ tbb? ( dev-cpp/tbb:= )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-python.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=OFF
+ -DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
+ -DHPX_WITH_PAPI=$(usex papi)
+ -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
+ -DHPX_WITH_COMPRESSION_ZLIB=$(usex zlib)
+ -DHPX_WITH_TESTS=OFF
+ )
+ 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
+}
+
+src_install() {
+ cmake_src_install
+ use examples && dodoc -r examples/
+ python_fix_shebang "${ED}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/
@ 2024-07-13 8:11 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2024-07-13 8:11 UTC (permalink / raw
To: gentoo-commits
commit: afdeb05e8253e98a85dd5cfe0ef552110f65fe29
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon Jun 10 18:10:05 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 08:11:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afdeb05e
sys-cluster/hpx: drop 1.9.1
Closes: https://bugs.gentoo.org/917256
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 -
sys-cluster/hpx/files/hpx-1.8.0-python.patch | 30 --------
sys-cluster/hpx/hpx-1.9.1.ebuild | 105 ---------------------------
3 files changed, 136 deletions(-)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index c034dc54e809..36d7613c78b9 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,2 +1 @@
DIST hpx-1.10.0.tar.gz 6146815 BLAKE2B eeab350944e5a7e68a0bbf2a7bac22c6d739359113ed75d5ed2ff601887c9466c6f92b80823be140e02e1a47480323b69a5f193f13b415f505ccae02792f6e1c SHA512 e1cc9fa72cba4e66b5d6eff2487e93d5d553c32e6eebcfe9131bf69c5b595ab72295ff0986c81d5dc6a7caa8303d6709df91333f64efe59ee256d99a8c289dc5
-DIST hpx-1.9.1.tar.gz 5662661 BLAKE2B 81631333b8899a7271e8c6edf587d0a3afadde28f2605ac4f8ff6ddc3fa5afb5ad8d05818ae6d0bfa8fb7241d3aebfe5f838b85b77f54327010308b22b4900b7 SHA512 a7972beada950cf6ef3b61f20496a08b220e4f48c28c11d57c20683906ca5124a9f36ac2552318883a5ab1db6efdbf63d1141b6e0c484c560a8c1311ae2d7090
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-python.patch b/sys-cluster/hpx/files/hpx-1.8.0-python.patch
deleted file mode 100644
index 21b7ce3ceeff..000000000000
--- a/sys-cluster/hpx/files/hpx-1.8.0-python.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 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 1/4] 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(-)
-
---- 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
- #
---- 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
- #
diff --git a/sys-cluster/hpx/hpx-1.9.1.ebuild b/sys-cluster/hpx/hpx-1.9.1.ebuild
deleted file mode 100644
index 8deb0b7b7817..000000000000
--- a/sys-cluster/hpx/hpx-1.9.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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/v${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://hpx.stellar-group.org/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="examples jemalloc mpi papi +perftools tbb zlib"
-# tests fail to compile
-RESTRICT="test"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( jemalloc perftools tbb )
-"
-
-BDEPEND="
- virtual/pkgconfig
-"
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-cpp/asio-1.12.0
- dev-libs/boost:=
- sys-apps/hwloc:=
- jemalloc? ( dev-libs/jemalloc:= )
- mpi? ( virtual/mpi )
- papi? ( dev-libs/papi )
- perftools? ( dev-util/google-perftools:= )
- tbb? ( dev-cpp/tbb:= )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.0-python.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=OFF
- -DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
- -DHPX_WITH_PAPI=$(usex papi)
- -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
- -DHPX_WITH_COMPRESSION_ZLIB=$(usex zlib)
- -DHPX_WITH_TESTS=OFF
- )
- 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
-}
-
-src_install() {
- cmake_src_install
- use examples && dodoc -r examples/
- python_fix_shebang "${ED}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-07-13 8:11 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-24 8:50 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/files/, sys-cluster/hpx/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-07-13 8:11 Joonas Niilola
2024-07-13 8:11 Joonas Niilola
2022-06-03 8:35 Florian Schmaus
2021-07-23 14:33 Joonas Niilola
2021-03-04 17:22 Joonas Niilola
2021-03-04 17:22 Joonas Niilola
2020-10-31 9:47 Joonas Niilola
2020-10-31 9:47 Joonas Niilola
2020-03-25 11:17 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox