From bcb60bc5545947901192e23c9d404e8809b4d60c Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 29 Oct 2021 23:13:16 +0100 Subject: sys-cluster/hpx: add tbb subslot operator Signed-off-by: Sam James --- sys-cluster/hpx/hpx-1.7.1-r1.ebuild | 104 ++++++++++++++++++++++++++++++++++++ sys-cluster/hpx/hpx-1.7.1.ebuild | 104 ------------------------------------ sys-cluster/hpx/hpx-9999.ebuild | 8 +-- 3 files changed, 108 insertions(+), 108 deletions(-) create mode 100644 sys-cluster/hpx/hpx-1.7.1-r1.ebuild delete mode 100644 sys-cluster/hpx/hpx-1.7.1.ebuild diff --git a/sys-cluster/hpx/hpx-1.7.1-r1.ebuild b/sys-cluster/hpx/hpx-1.7.1-r1.ebuild new file mode 100644 index 000000000000..c1be762e1c26 --- /dev/null +++ b/sys-cluster/hpx/hpx-1.7.1-r1.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-1.12.0 + 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}" +} diff --git a/sys-cluster/hpx/hpx-1.7.1.ebuild b/sys-cluster/hpx/hpx-1.7.1.ebuild deleted file mode 100644 index 15cacad6996f..000000000000 --- a/sys-cluster/hpx/hpx-1.7.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# 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-1.12.0 - 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}" -} diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index 0c573198a762..e9869e80d74e 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -35,13 +35,13 @@ RDEPEND=" ${PYTHON_DEPS} >=dev-cpp/asio-1.12.0 dev-libs/boost:= - sys-apps/hwloc + sys-apps/hwloc:= sys-libs/zlib - jemalloc? ( dev-libs/jemalloc ) + jemalloc? ( dev-libs/jemalloc:= ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) - perftools? ( dev-util/google-perftools ) - tbb? ( dev-cpp/tbb ) + perftools? ( dev-util/google-perftools:= ) + tbb? ( dev-cpp/tbb:= ) " DEPEND="${RDEPEND}" -- cgit v1.2.3-65-gdbad