From 9b561f5c757362a404c9a7505b7344602a649ad3 Mon Sep 17 00:00:00 2001 From: Jian Cao Date: Fri, 5 Apr 2019 04:46:56 +0800 Subject: sys-cluster/openmpi: specify external libraries and version bump Closes: https://bugs.gentoo.org/671510 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jian Cao Signed-off-by: Justin Bronder --- sys-cluster/openmpi/Manifest | 2 +- sys-cluster/openmpi/openmpi-4.0.0.ebuild | 172 ------------------------------- sys-cluster/openmpi/openmpi-4.0.1.ebuild | 172 +++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 173 deletions(-) delete mode 100644 sys-cluster/openmpi/openmpi-4.0.0.ebuild create mode 100644 sys-cluster/openmpi/openmpi-4.0.1.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest index e4dc0cd12..2f1c88c46 100644 --- a/sys-cluster/openmpi/Manifest +++ b/sys-cluster/openmpi/Manifest @@ -4,4 +4,4 @@ DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8 DIST openmpi-2.1.6.tar.bz2 8324626 BLAKE2B 4aed4b397c0e0ead24ed5e9bbf45ee8f6719a7566d74405cccf119ddf535891ece91c04cbcad96be5a5d9805c620aa13a1b51c0edd67c049827357e7668008b9 SHA512 f552f47961e040476e7d2949cdd3e5a0b5ad74bea2b6532608117ec893473a160cd368251d1f439fd773f4846950857baf939e7b3586bac2a099495f7bc0e349 DIST openmpi-3.0.3.tar.bz2 9316109 BLAKE2B e67e649917911eff3286c0f3d15e181b30e4ac6061891f6e13c75570368edb943fff55e4d41ffaa4a095b2060c84d24f8c32975758ad4632bae1813accd9f516 SHA512 12bbc5add4160e732ac10f302106c4bc2fa61ef2cde955e1fdd4a7aaad44b022d6babdd4bd529f687bb03fc5e5c3804ba6b1869e9609c9725bc291524c8304d7 DIST openmpi-3.1.3.tar.bz2 9442937 BLAKE2B 40067e1694a106d96e5ba41884a6facec9e605b5afba03ab908e4cf124f35b0691f0ab626e5190cffebc9c28d05b11b5c6401a5aa39ac17ec04650ed29e0976e SHA512 700821df676de5f85ce2793298242dcaea73f585f89540e30999792a568f193545a9f9b2bcb3ea22effa3bf14744531c4eb5fc4c84a8d7bbe5e5fdd76ab3a04a -DIST openmpi-4.0.0.tar.bz2 9812193 BLAKE2B e5307c22ce4c9aac8d0efe5a659dfa79b4471020ece095e84026914eab8edf030b59bbac2a37405851a904aeb4d4b3a33ce8de4cd25218dcb9f37626a3540ff5 SHA512 978097dcbb16df2a616dcbbef9536fed0f7be40914daa8f927882d91bdda9265e54334fc12aeef49b41073d8782321b5611a7e9c71182258a45bca5f640e927b +DIST openmpi-4.0.1.tar.bz2 9838152 BLAKE2B 75657940e37c23fbe88032f116588960c6bcf34c4928d77b45e8fde6fb51e814f521adb6c5155cb588fff9d1b382c2470873d90979a68598ff13e1aa205fc811 SHA512 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731 diff --git a/sys-cluster/openmpi/openmpi-4.0.0.ebuild b/sys-cluster/openmpi/openmpi-4.0.0.ebuild deleted file mode 100644 index 5fd6e1b85..000000000 --- a/sys-cluster/openmpi/openmpi-4.0.0.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_NEEDED=fortran - -inherit cuda eapi7-ver flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal mpi - -MY_P=${P/-mpi} -S=${WORKDIR}/${MY_P} - -IUSE_OPENMPI_FABRICS=" - openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" - -IUSE_OPENMPI_RM=" - openmpi_rm_pbs - openmpi_rm_slurm" - -IUSE_OPENMPI_OFED_FEATURES=" - openmpi_ofed_features_control-hdr-padding - openmpi_ofed_features_udcm - openmpi_ofed_features_rdmacm - openmpi_ofed_features_dynamic-sl" - -DESCRIPTION="A high-performance message passing library (MPI)" -HOMEPAGE="http://www.open-mpi.org" -SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio - ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" - -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) - openmpi_rm_pbs? ( !openmpi_rm_slurm ) - openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) - openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )" - -MPI_UNCLASSED_DEP_STR=" - !sys-cluster/pmix -" - -CDEPEND=" - >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads] - dev-libs/libltdl:0[${MULTILIB_USEDEP}] - >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP},numa?] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) - openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) - openmpi_fabrics_knem? ( sys-cluster/knem ) - openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) - openmpi_rm_pbs? ( sys-cluster/torque ) - openmpi_rm_slurm? ( sys-cluster/slurm ) - openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) - $(mpi_imp_deplist)" - -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.6 )" - -DEPEND="${CDEPEND} - java? ( >=virtual/jdk-1.6 )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/mpi.h - /usr/include/openmpi/ompi/mpi/java/mpiJava.h -) - -pkg_setup() { - fortran-2_pkg_setup - java-pkg-opt-2_pkg_setup - MPI_ESELECT_FILE="eselect.mpi.openmpi" - - elog - elog "OpenMPI has an overwhelming count of configuration options." - elog "Don't forget the EXTRA_ECONF environment variable can let you" - elog "specify configure options if you find them necessary." - elog -} - -src_prepare() { - default - - # Necessary for scalibility, see - # http://www.open-mpi.org/community/lists/users/2008/09/6514.php - echo 'oob_tcp_listen_mode = listen_thread' \ - >> opal/etc/openmpi-mca-params.conf || die -} - -multilib_src_configure() { - if use java; then - # We must always build with the right -source and -target - # flags. Passing flags to javac isn't explicitly supported here - # but we can cheat by overriding the configure test for javac. - export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - fi - - ECONF_SOURCE=${S} econf $(mpi_econf_args) \ - --sysconfdir="${EPREFIX}/etc/${PN}" \ - --enable-pretty-print-stacktrace \ - --enable-orterun-prefix-by-default \ - --with-hwloc="${EPREFIX}/usr" \ - --with-libltdl="${EPREFIX}/usr" \ - --with-libevent="${EPREFIX}/usr" \ - --enable-mpi-fortran=$(usex fortran all no) \ - $(use_enable cxx mpi-cxx) \ - $(use_with cma) \ - $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \ - $(use_enable romio io-romio) \ - $(use_enable heterogeneous) \ - $(use_enable ipv6) \ - $(multilib_native_use_enable java mpi-java) \ - $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \ - $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \ - $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \ - $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \ - $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \ - $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \ - $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \ - $(multilib_native_use_with openmpi_rm_pbs tm) \ - $(multilib_native_use_with openmpi_rm_slurm slurm) -} - -multilib_src_test() { - # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check -} - -multilib_src_install() { - default - - # fortran header cannot be wrapped (bug #540508), workaround part 1 - if multilib_is_native_abi && use fortran; then - mkdir "${T}"/fortran || die - mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die - else - # some fortran files get installed unconditionally - rm \ - "${ED}"/$(mpi_root)/usr/include/mpif* \ - "${ED}"/$(mpi_root)/usr/bin/mpif* \ - "${ED}"/$(mpi_root)/usr/bin/oshfort \ - "${ED}"/$(mpi_root)/usr/bin/shmemfort \ - || die - fi -} - -multilib_src_install_all() { - # fortran header cannot be wrapped (bug #540508), workaround part 2 - if use fortran; then - mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die - fi - - # Remove la files, no static libs are installed and we have pkg-config - find "${ED}" -name '*.la' -delete || die - - if use java; then - local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar - java-pkg_dojar "${mpi_jar}" - # We don't want to install the jar file twice - # so let's clean after ourselves. - rm "${mpi_jar}" || die - fi - - mpi_dodoc README AUTHORS NEWS VERSION - mpi_imp_add_eselect -} diff --git a/sys-cluster/openmpi/openmpi-4.0.1.ebuild b/sys-cluster/openmpi/openmpi-4.0.1.ebuild new file mode 100644 index 000000000..670d49012 --- /dev/null +++ b/sys-cluster/openmpi/openmpi-4.0.1.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +FORTRAN_NEEDED=fortran + +inherit cuda eapi7-ver flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal mpi + +MY_P=${P/-mpi} +S=${WORKDIR}/${MY_P} + +IUSE_OPENMPI_FABRICS=" + openmpi_fabrics_ofed + openmpi_fabrics_knem + openmpi_fabrics_psm" + +IUSE_OPENMPI_RM=" + openmpi_rm_pbs + openmpi_rm_slurm" + +IUSE_OPENMPI_OFED_FEATURES=" + openmpi_ofed_features_control-hdr-padding + openmpi_ofed_features_udcm + openmpi_ofed_features_rdmacm + openmpi_ofed_features_dynamic-sl" + +DESCRIPTION="A high-performance message passing library (MPI)" +HOMEPAGE="http://www.open-mpi.org" +SRC_URI="http://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux" +IUSE="cma cuda cxx elibc_FreeBSD fortran heterogeneous ipv6 java numa romio + ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" + +REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) + openmpi_rm_pbs? ( !openmpi_rm_slurm ) + openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )" + +MPI_UNCLASSED_DEP_STR=" + !sys-cluster/pmix +" + +CDEPEND=" + >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads] + dev-libs/libltdl:0[${MULTILIB_USEDEP}] + >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP},numa?] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) + elibc_FreeBSD? ( dev-libs/libexecinfo ) + openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) + openmpi_fabrics_knem? ( sys-cluster/knem ) + openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) + openmpi_rm_pbs? ( sys-cluster/torque ) + openmpi_rm_slurm? ( sys-cluster/slurm ) + openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* ) + $(mpi_imp_deplist)" + +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.6 )" + +DEPEND="${CDEPEND} + java? ( >=virtual/jdk-1.6 )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/mpi.h + /usr/include/openmpi/ompi/mpi/java/mpiJava.h +) + +pkg_setup() { + fortran-2_pkg_setup + java-pkg-opt-2_pkg_setup + MPI_ESELECT_FILE="eselect.mpi.openmpi" + + elog + elog "OpenMPI has an overwhelming count of configuration options." + elog "Don't forget the EXTRA_ECONF environment variable can let you" + elog "specify configure options if you find them necessary." + elog +} + +src_prepare() { + default + + # Necessary for scalibility, see + # http://www.open-mpi.org/community/lists/users/2008/09/6514.php + echo 'oob_tcp_listen_mode = listen_thread' \ + >> opal/etc/openmpi-mca-params.conf || die +} + +multilib_src_configure() { + if use java; then + # We must always build with the right -source and -target + # flags. Passing flags to javac isn't explicitly supported here + # but we can cheat by overriding the configure test for javac. + export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" + fi + + ECONF_SOURCE=${S} econf $(mpi_econf_args) \ + --sysconfdir="${EPREFIX}/etc/${PN}" \ + --enable-pretty-print-stacktrace \ + --enable-orterun-prefix-by-default \ + --with-hwloc="${EPREFIX}/usr" \ + --with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \ + --with-libltdl="${EPREFIX}/usr" \ + --with-libevent="${EPREFIX}/usr" \ + --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \ + --enable-mpi-fortran=$(usex fortran all no) \ + $(use_enable cxx mpi-cxx) \ + $(use_with cma) \ + $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \ + $(use_enable romio io-romio) \ + $(use_enable heterogeneous) \ + $(use_enable ipv6) \ + $(multilib_native_use_enable java mpi-java) \ + $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \ + $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \ + $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \ + $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \ + $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \ + $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \ + $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \ + $(multilib_native_use_with openmpi_rm_pbs tm) \ + $(multilib_native_use_with openmpi_rm_slurm slurm) +} + +multilib_src_test() { + # Doesn't work with the default src_test as the dry run (-n) fails. + emake -j1 check +} + +multilib_src_install() { + default + + # fortran header cannot be wrapped (bug #540508), workaround part 1 + if multilib_is_native_abi && use fortran; then + mkdir "${T}"/fortran || die + mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die + else + # some fortran files get installed unconditionally + rm \ + "${ED}"/$(mpi_root)/usr/include/mpif* \ + "${ED}"/$(mpi_root)/usr/bin/mpif* \ + || die + fi +} + +multilib_src_install_all() { + # fortran header cannot be wrapped (bug #540508), workaround part 2 + if use fortran; then + mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die + fi + + # Remove la files, no static libs are installed and we have pkg-config + find "${ED}" -name '*.la' -delete || die + + if use java; then + local mpi_jar="${ED}"/$(mpi_root)/usr/$(get_libdir)/mpi.jar + java-pkg_dojar "${mpi_jar}" + # We don't want to install the jar file twice + # so let's clean after ourselves. + rm "${mpi_jar}" || die + fi + + mpi_dodoc README AUTHORS NEWS VERSION + mpi_imp_add_eselect +} -- cgit v1.2.3