From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B3EFD1383B0 for ; Thu, 10 Jan 2013 01:53:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FE86E05A1; Thu, 10 Jan 2013 01:53:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1638CE05A1 for ; Thu, 10 Jan 2013 01:53:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB06133DA6C for ; Thu, 10 Jan 2013 01:53:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 68AD9E4075 for ; Thu, 10 Jan 2013 01:53:33 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <1357782777.46a2616dc39a6192809f3781d4a22ac93c883da1.jsbronder@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/openmpi/ChangeLog sys-cluster/openmpi/metadata.xml sys-cluster/openmpi/openmpi-1.5.3.ebuild sys-cluster/openmpi/openmpi-1.6.3.ebuild X-VCS-Directories: sys-cluster/openmpi/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: 46a2616dc39a6192809f3781d4a22ac93c883da1 X-VCS-Branch: master Date: Thu, 10 Jan 2013 01:53:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c5a71c23-1828-448b-8015-d8de191add16 X-Archives-Hash: 380e69355e2e2a2ab37255c0426f5fe2 commit: 46a2616dc39a6192809f3781d4a22ac93c883da1 Author: Justin Bronder gentoo org> AuthorDate: Thu Jan 10 01:52:57 2013 +0000 Commit: Justin Bronder gentoo org> CommitDate: Thu Jan 10 01:52:57 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=46a2616d sync with gentoo-x86 Package-Manager: portage-2.1.11.38 --- sys-cluster/openmpi/ChangeLog | 8 ++- sys-cluster/openmpi/metadata.xml | 2 - sys-cluster/openmpi/openmpi-1.5.3.ebuild | 115 ---------------------- sys-cluster/openmpi/openmpi-1.6.3.ebuild | 157 ++++++++++++++++++++++++++++++ 4 files changed, 164 insertions(+), 118 deletions(-) diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog index 3b69a84..5596f04 100644 --- a/sys-cluster/openmpi/ChangeLog +++ b/sys-cluster/openmpi/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sys-cluster/openmpi -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openmpi-1.6.3 (10 Jan 2013) + + 10 Jan 2013; Justin Bronder -openmpi-1.5.3.ebuild, + +openmpi-1.6.3.ebuild: + sync with gentoo-x86 + 14 Aug 2011; Kacper Kowalik openmpi-1.5.3.ebuild: Add slurm support by Nicolas Bigaouette diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml index f583154..44da45e 100644 --- a/sys-cluster/openmpi/metadata.xml +++ b/sys-cluster/openmpi/metadata.xml @@ -8,10 +8,8 @@ Enable features required for heterogeneous platform support - Add support for the Portable Batch System (PBS) Build the ROMIO MPI-IO component Enable MPI_THREAD_MULTIPLE Enable bundled VampirTrace support - Enable infiniband support diff --git a/sys-cluster/openmpi/openmpi-1.5.3.ebuild b/sys-cluster/openmpi/openmpi-1.5.3.ebuild deleted file mode 100644 index a9a0f60..0000000 --- a/sys-cluster/openmpi/openmpi-1.5.3.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $ - -EAPI=4 -inherit eutils flag-o-matic fortran-2 mpi multilib toolchain-funcs - -MY_P=${P/-mpi} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="A high-performance message passing library (MPI)" -HOMEPAGE="http://www.open-mpi.org" -SRC_URI="http://www.open-mpi.org/software/ompi/v1.5/downloads/${MY_P}.tar.bz2" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 mpi-threads pbs romio slurm threads vt" -MPI_UNCLASSED_DEP_STR=" - vt? ( - !dev-libs/libotf - !app-text/lcdf-typetools - )" -RDEPEND="pbs? ( sys-cluster/torque ) - slurm? ( sys-cluster/slurm ) - infiniband? ( sys-infiniband/libibverbs ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) - >=sys-apps/hwloc-1.1.1 - $(mpi_imp_deplist)" -DEPEND="${RDEPEND}" -REQUIRED_USE="pbs? ( !slurm ) - slurm? ( !pbs )" - -pkg_setup() { - fortran-2_pkg_setup - MPI_ESELECT_FILE="eselect.mpi.openmpi" - - if use mpi-threads; then - echo - ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by" - ewarn "default and officially unsupported by upstream." - ewarn "You may stop now and set USE=-mpi-threads" - echo - fi - - echo - 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." - echo -} - -src_prepare() { - # Fix --as-needed problems with f77 and f90. - sed -i 's:^libs=:libs=-Wl,--no-as-needed :' \ - ompi/tools/wrappers/mpif{77,90}-wrapper-data.txt.in - - # Necessary for scalibility, see - # http://www.open-mpi.org/community/lists/users/2008/09/6514.php - if use threads; then - echo 'oob_tcp_listen_mode = listen_thread' \ - >> opal/etc/openmpi-mca-params.conf - fi - - # Gentoo bug 360185 - epatch "${FILESDIR}"/openmpi-r24328.patch -} - -src_configure() { - local myconf=( - --sysconfdir="${EPREFIX}/etc/${PN}" - --enable-pretty-print-stacktrace - --enable-orterun-prefix-by-default - --with-hwloc=/usr - ) - - if use mpi-threads; then - myconf+=(--enable-mpi-threads - --enable-progress-threads) - fi - - if use fortran; then - if [[ $(tc-getFC) =~ g77 ]]; then - myconf+=(--disable-mpi-f90) - elif [[ $(tc-getFC) =~ if ]]; then - # Enabled here as gfortran compile times are huge with this enabled. - myconf+=(--with-mpi-f90-size=medium) - fi - else - myconf+=(--disable-mpi-f90 --disable-mpi-f77) - fi - - ! use vt && myconf+=(--enable-contrib-no-build=vt) - - econf $(mpi_econf_args) "${myconf[@]}" \ - $(use_enable cxx mpi-cxx) \ - $(use_enable romio io-romio) \ - $(use_enable heterogeneous) \ - $(use_with pbs tm) \ - $(use_with slurm) \ - $(use_enable ipv6) \ - $(use_with infiniband openib) -} - -src_install () { - emake DESTDIR="${D}" install || die - # From USE=vt see #359917 - rm "${D}"/$(mpi_root)/usr/share/libtool &> /dev/null - mpi_dodoc README AUTHORS NEWS VERSION || die - mpi_imp_add_eselect -} - -src_test() { - # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check || die -} diff --git a/sys-cluster/openmpi/openmpi-1.6.3.ebuild b/sys-cluster/openmpi/openmpi-1.6.3.ebuild new file mode 100644 index 0000000..1902e42 --- /dev/null +++ b/sys-cluster/openmpi/openmpi-1.6.3.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $ + +EAPI=4 + +FORTRAN_NEEDED=fortran + +inherit eutils flag-o-matic fortran-2 multilib mpi toolchain-funcs versionator + +MY_P=${P/-mpi} +S=${WORKDIR}/${MY_P} + +IUSE_OPENMPI_FABRICS=" + openmpi_fabrics_dapl + openmpi_fabrics_ofed + openmpi_fabrics_knem + openmpi_fabrics_open-mx + openmpi_fabrics_psm + openmpi_fabrics_sctp" + +IUSE_OPENMPI_RM=" + openmpi_rm_pbs + openmpi_rm_slurm" + +IUSE_OPENMPI_OFED_FEATURES=" + openmpi_ofed_features_control-hdr-padding + openmpi_ofed_features_connectx-xrc + openmpi_ofed_features_rdmacm + openmpi_ofed_features_dynamic-sl + openmpi_ofed_features_failover" + +DESCRIPTION="A high-performance message passing library (MPI)" +HOMEPAGE="http://www.open-mpi.org" +SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux" +IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt + ${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_connectx-xrc? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )" + +MPI_UNCLASSED_DEP_STR=" + vt? ( + !dev-libs/libotf + !app-text/lcdf-typetools + )" + +RDEPEND=" + >=sys-apps/hwloc-1.3 + elibc_FreeBSD? ( dev-libs/libexecinfo ) + openmpi_fabrics_dapl? ( sys-infiniband/dapl ) + openmpi_fabrics_ofed? ( sys-infiniband/ofed ) + openmpi_fabrics_knem? ( sys-cluster/knem ) + openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) + openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm ) + openmpi_fabrics_sctp? ( net-misc/lksctp-tools ) + openmpi_rm_pbs? ( sys-cluster/torque ) + openmpi_rm_slurm? ( sys-cluster/slurm ) + openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm ) + $(mpi_imp_deplist)" +DEPEND="${RDEPEND}" + +pkg_setup() { + fortran-2_pkg_setup + MPI_ESELECT_FILE="eselect.mpi.openmpi" + + if use mpi-threads; then + echo + ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by" + ewarn "default and officially unsupported by upstream." + ewarn "You may stop now and set USE=-mpi-threads" + echo + fi + + echo + 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." + echo +} + +src_prepare() { + # Necessary for scalibility, see + # http://www.open-mpi.org/community/lists/users/2008/09/6514.php + if use threads; then + echo 'oob_tcp_listen_mode = listen_thread' \ + >> opal/etc/openmpi-mca-params.conf + fi +} + +src_configure() { + local myconf=( + --sysconfdir="${EPREFIX}/etc/${PN}" + --enable-pretty-print-stacktrace + --enable-orterun-prefix-by-default + --with-hwloc="${EPREFIX}/usr" + ) + + if use mpi-threads; then + myconf+=(--enable-mpi-threads + --enable-opal-multi-threads) + fi + + if use fortran; then + if [[ $(tc-getFC) =~ g77 ]]; then + myconf+=(--disable-mpi-f90) + elif [[ $(tc-getFC) =~ if ]]; then + # Enabled here as gfortran compile times are huge with this enabled. + myconf+=(--with-mpi-f90-size=medium) + fi + else + myconf+=(--disable-mpi-f90 --disable-mpi-f77) + fi + + ! use vt && myconf+=(--enable-contrib-no-build=vt) + + econf $(mpi_econf_args) "${myconf[@]}" \ + $(use_enable cxx mpi-cxx) \ + $(use_enable romio io-romio) \ + $(use_enable heterogeneous) \ + $(use_enable ipv6) \ + $(use_with openmpi_fabrics_dapl udapl "${EPREFIX}"/usr) \ + $(use_with openmpi_fabrics_ofed openib "${EPREFIX}"/usr) \ + $(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \ + $(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \ + $(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \ + $(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \ + $(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \ + $(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \ + $(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \ + $(use_enable openmpi_ofed_features_failover btl-openib-failover) \ + $(use_with openmpi_fabrics_sctp sctp) \ + $(use_with openmpi_rm_pbs tm) \ + $(use_with openmpi_rm_slurm slurm) +} + +src_install () { + emake DESTDIR="${D}" install || die "make install failed" + # From USE=vt see #359917 + rm "${D}"/$(mpi_root)/usr/share/libtool &> /dev/null + mpi_dodoc README AUTHORS NEWS VERSION || die + mpi_imp_add_eselect +} + +src_test() { + # Doesn't work with the default src_test as the dry run (-n) fails. + emake -j1 check || die "emake check failed" +}