From aae6b7aae666c0fa704f458bc39c9eeafe5a04f3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 29 Oct 2021 23:36:45 +0100 Subject: sys-cluster/mpich2: add hwloc subslot operator Signed-off-by: Sam James --- sys-cluster/mpich2/mpich2-1.5-r1.ebuild | 123 -------------------------------- sys-cluster/mpich2/mpich2-1.5-r2.ebuild | 123 ++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 sys-cluster/mpich2/mpich2-1.5-r1.ebuild create mode 100644 sys-cluster/mpich2/mpich2-1.5-r2.ebuild diff --git a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild deleted file mode 100644 index b436f7e5fe9d..000000000000 --- a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -FORTRAN_NEEDED=fortran - -inherit epatch fortran-2 flag-o-matic - -MY_PV=${PV/_/} -DESCRIPTION="A high performance and portable MPI implementation" -HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" -SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz" - -SLOT="0" -LICENSE="mpich2" -KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+cxx doc fortran mpi-threads romio threads" - -COMMON_DEPEND=" - dev-libs/libaio - net-libs/libnsl:0= - sys-apps/hwloc - romio? ( net-fs/nfs-utils )" - -DEPEND="${COMMON_DEPEND} - dev-lang/perl - sys-devel/libtool" - -RDEPEND="${COMMON_DEPEND} - !sys-cluster/mpich - !sys-cluster/openmpi" - -S="${WORKDIR}"/${PN}-${MY_PV} - -pkg_setup() { - FORTRAN_STANDARD="77 90" - fortran-2_pkg_setup - - if use mpi-threads && ! use threads; then - ewarn "mpi-threads requires threads, assuming that's what you want" - fi -} - -src_prepare() { - epatch "${FILESDIR}/${P}-fno-common.patch" - - # Using MPICH2LIB_LDFLAGS doesn't seem to full work. - sed -i 's| *@WRAPPER_LDFLAGS@ *||' \ - src/packaging/pkgconfig/mpich2.pc.in \ - src/env/*.in \ - || die -} - -src_configure() { - local c="--enable-shared --disable-static" - - # The configure statements can be somewhat confusing, as they - # don't all show up in the top level configure, however, they - # are picked up in the children directories. - - if use mpi-threads; then - # MPI-THREAD requries threading. - c="${c} --with-thread-package=pthreads" - c="${c} --enable-threads=runtime" - else - if use threads ; then - c="${c} --with-thread-package=pthreads" - else - c="${c} --with-thread-package=none" - fi - c="${c} --enable-threads=single" - fi - - # GCC 10 compatibility workaround - # bug #725722 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - export MPICH2LIB_CFLAGS=${CFLAGS} - export MPICH2LIB_CPPFLAGS=${CPPFLAGS} - export MPICH2LIB_CXXFLAGS=${CXXFLAGS} - export MPICH2LIB_FFLAGS=${FFLAGS} - export MPICH2LIB_FCFLAGS=${FCFLAGS} - export MPICH2LIB_LDFLAGS=${LDFLAGS} - # dropped w/ bug #725722 fix - #unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS - - c="${c} --sysconfdir=${EPREFIX}/etc/${PN}" - c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}" - - # Forcing Bash as there's quite a few bashisms in the build system - CONFIG_SHELL="${BROOT}/bin/bash" econf ${c} \ - --with-pm=hydra \ - --disable-mpe \ - --disable-fast \ - --enable-smpcoll \ - --enable-versioning \ - $(use_enable romio) \ - $(use_enable cxx) \ - $(use_enable fortran f77) \ - $(use_enable fortran fc) -} - -src_test() { - emake -j1 check -} - -src_install() { - default - - dodir /usr/share/doc/${PF} - dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES - newdoc src/pm/hydra/README README.hydra - if use romio; then - newdoc src/mpi/romio/README README.romio - fi - - if ! use doc; then - rm -rf "${D}"usr/share/doc/${PF}/www* - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-cluster/mpich2/mpich2-1.5-r2.ebuild b/sys-cluster/mpich2/mpich2-1.5-r2.ebuild new file mode 100644 index 000000000000..cc4ea60778ce --- /dev/null +++ b/sys-cluster/mpich2/mpich2-1.5-r2.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +FORTRAN_NEEDED=fortran + +inherit epatch fortran-2 flag-o-matic + +MY_PV=${PV/_/} +DESCRIPTION="A high performance and portable MPI implementation" +HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php" +SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz" + +SLOT="0" +LICENSE="mpich2" +KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" +IUSE="+cxx doc fortran mpi-threads romio threads" + +COMMON_DEPEND=" + dev-libs/libaio + net-libs/libnsl:0= + sys-apps/hwloc:= + romio? ( net-fs/nfs-utils )" + +DEPEND="${COMMON_DEPEND} + dev-lang/perl + sys-devel/libtool" + +RDEPEND="${COMMON_DEPEND} + !sys-cluster/mpich + !sys-cluster/openmpi" + +S="${WORKDIR}"/${PN}-${MY_PV} + +pkg_setup() { + FORTRAN_STANDARD="77 90" + fortran-2_pkg_setup + + if use mpi-threads && ! use threads; then + ewarn "mpi-threads requires threads, assuming that's what you want" + fi +} + +src_prepare() { + epatch "${FILESDIR}/${P}-fno-common.patch" + + # Using MPICH2LIB_LDFLAGS doesn't seem to full work. + sed -i 's| *@WRAPPER_LDFLAGS@ *||' \ + src/packaging/pkgconfig/mpich2.pc.in \ + src/env/*.in \ + || die +} + +src_configure() { + local c="--enable-shared --disable-static" + + # The configure statements can be somewhat confusing, as they + # don't all show up in the top level configure, however, they + # are picked up in the children directories. + + if use mpi-threads; then + # MPI-THREAD requries threading. + c="${c} --with-thread-package=pthreads" + c="${c} --enable-threads=runtime" + else + if use threads ; then + c="${c} --with-thread-package=pthreads" + else + c="${c} --with-thread-package=none" + fi + c="${c} --enable-threads=single" + fi + + # GCC 10 compatibility workaround + # bug #725722 + append-fflags $(test-flags-FC -fallow-argument-mismatch) + + export MPICH2LIB_CFLAGS=${CFLAGS} + export MPICH2LIB_CPPFLAGS=${CPPFLAGS} + export MPICH2LIB_CXXFLAGS=${CXXFLAGS} + export MPICH2LIB_FFLAGS=${FFLAGS} + export MPICH2LIB_FCFLAGS=${FCFLAGS} + export MPICH2LIB_LDFLAGS=${LDFLAGS} + # dropped w/ bug #725722 fix + #unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS + + c="${c} --sysconfdir=${EPREFIX}/etc/${PN}" + c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}" + + # Forcing Bash as there's quite a few bashisms in the build system + CONFIG_SHELL="${BROOT}/bin/bash" econf ${c} \ + --with-pm=hydra \ + --disable-mpe \ + --disable-fast \ + --enable-smpcoll \ + --enable-versioning \ + $(use_enable romio) \ + $(use_enable cxx) \ + $(use_enable fortran f77) \ + $(use_enable fortran fc) +} + +src_test() { + emake -j1 check +} + +src_install() { + default + + dodir /usr/share/doc/${PF} + dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES + newdoc src/pm/hydra/README README.hydra + if use romio; then + newdoc src/mpi/romio/README README.romio + fi + + if ! use doc; then + rm -rf "${D}"usr/share/doc/${PF}/www* + fi + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad