[sys-cluster/openmpi] Add support for knem open-mx and psm

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 159 insertions, 9 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index a3afea050d02..ccceec8e3a3b 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmpi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.94 2011/12/17 13:01:31 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.95 2012/01/20 13:15:19 alexxy Exp $
+
+*openmpi-1.5.4-r2 (20 Jan 2012)
+
+  20 Jan 2012; Alexey Shvetsov <alexxy@gentoo.org> +openmpi-1.5.4-r2.ebuild,
+  metadata.xml:
+  Add support for knem open-mx and psm
 
   17 Dec 2011; Fabian Groffen <grobian@gentoo.org> openmpi-1.5.4-r1.ebuild:
   Complete some Prefix related fixes
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index c3ad69a47a5b..4fc54665c787 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
 AUX openmpi-r24328.patch 1707 RMD160 4db5f60d692268e1e42ebbc5379cec245b14daa5 SHA1 25a3ac77307b4681e3f917e61ff88daa58dab508 SHA256 3149f47463057e3263a242b2df88b588074f07395d437b585c5ce37f84aadf83
@@ -13,13 +13,24 @@ EBUILD openmpi-1.5.3-r1.ebuild 3038 RMD160 27c44dd4cf4e18caf3e9bec1bab08b92dab68
 EBUILD openmpi-1.5.3-r2.ebuild 3150 RMD160 e1c86d7768a03d6b8bc41179c57be490018fefc7 SHA1 a96868b3c815c0b532f097c09e97534d96e84427 SHA256 82758c65eae163f21bb7a1ef77deaa2aea3c45c86078d79b7589780b8131f90d
 EBUILD openmpi-1.5.3.ebuild 2866 RMD160 05ea9a199fdebbea163219e59a286c45f7385308 SHA1 ccdddf8f49328cedc1a5f58fcda8e568cb5ca52e SHA256 aabfd0213c13ce3eecb45bd6eaafc25a777cf8e9470b36609208716453adcaec
 EBUILD openmpi-1.5.4-r1.ebuild 3283 RMD160 2beb7fc6e4279d1df87e59f2faccd85b2e662401 SHA1 2ba33622f98362717583d425ffd2e19c05daed9b SHA256 80dc0f4026656a5894d5d59ae2716d93699a93c10ca6c109a0fa1fb92e6d77f8
+EBUILD openmpi-1.5.4-r2.ebuild 3584 RMD160 270c0d92777842db7ec79d466117cbc7a4de3fb5 SHA1 8993d7079ddef7ec6b8ce6d28a7efab5815b1b94 SHA256 e56e54e4f42a3fdc801867885336909248aedee7020b3339c719cea6ee092687
 EBUILD openmpi-1.5.4.ebuild 3163 RMD160 08ef9dff9ca9b6841f4e169873dd44b34fd66ca0 SHA1 f7914d3af94e2a9db11e9a99eefbb26a3a55f679 SHA256 c0ac7ea59a092908aaaa858879ac9fc29087796f7e9faf61a48b50902a46f1f0
-MISC ChangeLog 14143 RMD160 fd816dd2fabc8592a3a07688cda1a7a69988a3a7 SHA1 a5a30c0b343637fea609ae255941a74fbf235766 SHA256 261dfd73b2cf26e2bc8135c751b2126dbd2b19a847ca4d3ba22c1f718e958457
-MISC metadata.xml 759 RMD160 caf718d3ef2cc604224ac3cdc22f5baefe782ef3 SHA1 76edf4e288621c70d3208c9684ab5f0726a99103 SHA256 fd1a5b65afaa1cc9edf9a8ac9fb7832276dac47bdc4a4109f3e49cdce91d8b1f
+MISC ChangeLog 14308 RMD160 4a0a4d5ab142ff33322ff02690945fedc2f180a6 SHA1 a9c9e165b313cb5134f59b4203cb93641256d301 SHA256 2331586b19e7ac889b95fb85bd477e23a746e68cbd2eeab73309752f39f98dcd
+MISC metadata.xml 975 RMD160 f018d88bafb6fff084b8fca9587e7c530c08f738 SHA1 9843ccb5ca4ab77ef4d469b0435bc6d34d684121 SHA256 6013730050494223daac882d90da64f6f72ed76ac850a53cabd95e7d57dda8ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7skrEACgkQX3X2B8XHTolpnwCeJhdN7MLt4BRF1nGwHJvUwwcw
-IwgAnjJyYetii08yxo/w7y5rUisAoROc
-=V2aQ
+iQIcBAEBCAAGBQJPGWj7AAoJEOf+E+/4L5LmHfoP/04pdzgNQFFf12+XiixIQOon
+C7iLWroYvo510ts5B0JOZUVF19DQ6ZkqH+A/7w1lkwGgfZcEjnQ27PGN/UCLLZJD
++hS+LmM2/VG2H5Uc4Ez8x2722/n+IhaUOTOwkByKvy1qKUibN2j/Rvb6oUJbQUN9
+n4yP30r7kV5rG53xSL88V7SrUsOQTLVwx2LxMrkW6a8oZR8E4p4rJ9NGemS2Q2gq
+1GqAO8KjSH+DhtvBrV7GVBWRXPBtAjVpuUMug6iJC1G7BxoreCpgb59J4qs41nrb
+DVLqZF+NlOrPnNZ/jOEbqHnhOCGj7JF8F8n9t+ADKgR3MbsI3CpvY4mYUSrD0WOC
+ZCMqwnlmnKQt8DKSEFJqI9swUH3LZSSWh5UBVdeVqzi2Xz9qJpwYe0gI8Lb0ay3C
+cfNNgXMDuPOF8Qm0DCirSwyoZzXf+fHB7t3COGLFatiL2VE4kGFxiYAc8jdIut70
+NwZR4DOgBw63ZRwZD+51CyFvqFFoSz/btWvHCBz13+235oA5hvs7nAzdpPS95w0F
+VkoMmK3+EfcsColeUQVLS0i4+A1jxegSGRNo4wti8tfuyrKcJQlkAx8KE4ctG+46
+QHWr+WMecrmTjwqQdJUh6QNW5mrhRdSwI5SSpxQD57iLPp7piWBnvLxBLG9BYz3Q
+VMuulQGYqjSfQSYR4fQ0
+=OocW
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 5455cf790366..014cce3b763e 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -15,5 +15,8 @@
 		<flag name='sctp'>Enable SCTP support</flag>
 		<flag name='slurm'>Add support for SLURM</flag>
 		<flag name='vt'>Enable bundled VampirTrace support</flag>
+		<flag name='knem'>Add High-Performance intranode communication</flag>
+		<flag name='psm'>Add support for Qlogic psm driver for IB</flag>
+		<flag name='open-mx'>Add support for Myrinet Express over Ethernet></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..624de8b2b87f
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild,v 1.1 2012/01/20 13:15:19 alexxy Exp $
+
+EAPI=4
+inherit eutils fortran-2 multilib flag-o-matic 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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 knem mpi-threads
+	+numa pbs open-mx psm romio sctp slurm threads vt"
+
+REQUIRED_USE="^^ (
+					( !slurm !pbs )
+					( slurm !pbs )
+					( !slurm pbs )
+				)
+			psm? ( infiniband )"
+
+RDEPEND="
+	fortran? ( virtual/fortran )
+	pbs? ( sys-cluster/torque )
+	infiniband? ( sys-infiniband/openib )
+	sctp? ( net-misc/lksctp-tools )
+	vt? (
+		!dev-libs/libotf
+		!app-text/lcdf-typetools
+	)
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	knem? ( sys-cluster/knem )
+	numa? ( sys-process/numactl )
+	open-mx? ( sys-cluster/open-mx )
+	psm? ( sys-infiniband/infinipath-psm )
+	>=sys-apps/hwloc-1.3
+	!sys-cluster/mpich
+	!sys-cluster/lam-mpi
+	!sys-cluster/mpich2
+	!sys-cluster/mpiexec"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	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
+
+	epatch "${FILESDIR}"/openmpi-r24328.patch
+}
+
+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-thread-multiple
+			--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)
+
+	use numa && myconf+=( --with-libnuma="${EPREFIX}/usr" )
+	use infiniband && myconf+=( --with-openib="${EPREFIX}/usr" )
+	use open-mx && myconf+=( --with-mx="${EPREFIX}/usr" )
+	use psm && myconf+=( --with-psm="${EPREFIX}/usr" )
+	use knem && myconf+=( --with-knem="${EPREFIX}/usr" )
+
+	econf "${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 sctp sctp)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	# From USE=vt see #359917
+	rm "${ED}"/usr/share/libtool &> /dev/null
+	dodoc README AUTHORS NEWS VERSION || die
+}
+
+src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check || die "emake check failed"
+}