[sys-cluster/openmpi] Add slurm support

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

4 files changed, 142 insertions, 16 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index d7e8ae1a0515..b494f7f289b5 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.89 2011/07/02 16:37:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.90 2011/07/03 23:57:26 alexxy Exp $
+
+*openmpi-1.5.3-r2 (03 Jul 2011)
+
+  03 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> +openmpi-1.5.3-r2.ebuild:
+  Add slurm support
 
   02 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> openmpi-1.5.3-r1.ebuild:
   Fix hwloc location detection
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index dcdeb91a7824..ac13886f0413 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -9,23 +9,24 @@ DIST openmpi-1.5.3.tar.bz2 7589097 RMD160 c1d0950c9a5c53c8543838adadf6a7477abe39
 EBUILD openmpi-1.4.2.ebuild 2755 RMD160 5be40f5b45218df0650df27b24d33a5ec1e60164 SHA1 a58f360b08cec0343d27e9d7de239f8dcb3a5f8d SHA256 b9c496e2acf4b01687ed4224b440f81536245295a18779396cbceebe3334d7ca
 EBUILD openmpi-1.4.3.ebuild 2744 RMD160 02938b75b03428624d1164872db274dd75ede792 SHA1 15d0a7c5a28570eb70d430e9e54fc53e83b749cd SHA256 78434f6a7137ed809324c9428ec3e74a9f0ad7c3fea81d3a9ae4800f38e6aae2
 EBUILD openmpi-1.5.3-r1.ebuild 3038 RMD160 27c44dd4cf4e18caf3e9bec1bab08b92dab68ec9 SHA1 31d2084063e966a8691b2d996a2de0a737f87da0 SHA256 bc5297bb77d8e34bbccfd8a6c66d3aec43db68cff505e76771eff5995c3bf212
+EBUILD openmpi-1.5.3-r2.ebuild 3138 RMD160 7ccf4bb72f174eaa4a538b2559859579de6e7ab1 SHA1 805bcab4345400ad86bcbc68b3eab17cca6b143a SHA256 428bec14edb76315698bc2f61c03eefacc8566938fd6381ca4e424e610d08d1f
 EBUILD openmpi-1.5.3.ebuild 2866 RMD160 05ea9a199fdebbea163219e59a286c45f7385308 SHA1 ccdddf8f49328cedc1a5f58fcda8e568cb5ca52e SHA256 aabfd0213c13ce3eecb45bd6eaafc25a777cf8e9470b36609208716453adcaec
-MISC ChangeLog 13433 RMD160 cb6237a44074bb8234b6c70bf3e9c4d9f32c9714 SHA1 eea846c97cf0b919d502aecd191cf4a06d3da137 SHA256 9936fd7d4e0619666d5fd41b98d476a2f65a93d02dc277ee4c02ea4a6073db2d
-MISC metadata.xml 644 RMD160 0a87c367f8b53298f20ab41196ab5c2d8f5bf049 SHA1 442d5293d42d3e629a344ac762ac0e5248418b98 SHA256 ffdb0eb0f353ea82dd1324a1e2457d0903374d5328374399694919c9e14404bb
+MISC ChangeLog 13564 RMD160 3fc2dbfe8c9f8c42d6afe48f0db809cc563859b5 SHA1 68fa0a1f660662105a8ec87fa1f0fe782f35e17a SHA256 1231c9bd753d2ad7decb60326ed231d39aaf913ab9155e9f771177642d1cf906
+MISC metadata.xml 694 RMD160 426659426d5466df5a01f809fa25a9736908358d SHA1 46f709ae3e6e046e5f2db69e00455291c486380c SHA256 ed1283fc3e7bbb2a52e2e1444cf7f9c9bffb71df9d78ce551110efa80babc072
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOD0k5AAoJEOf+E+/4L5Lmk1kP/25QxHo8pXsVkHsm98ZsTTqB
-wFSReStgsNv04eWbl3otXEOFKQu3fFZyWkXDMa94tYaZ2y572Btxm05aGJ634OCj
-zS8fkzjI66yDpS4eQUahHlX20lxISLM45MJAEtDoG+VFQg0JWA98o/6KwwmLATGB
-U6i+3tHzYk7FYfknU4osK6NWJbf/uQ8i0Vfv2nvvCdCvnAGUwVbsY0NvH0pw1EN0
-znsY448v338LDfX/NDkn9AdJMNOtKVohTgagg/KogqvupG9u//aN+solGBWNdv23
-ggUaLzpvg1C/cNPpL5GMX5/T7p5f0wPg+P9ZFtggHkUODgByN7WA8MoXLNNdBWmf
-dO+6X1YFqHwT9zgvNiUv0Okkndr2b4CEjk2JDRhGlz+sMh6FGssF8NlSmxkr9uUj
-3PmipeJ1L/5Dh/Wdm/FKSoDUs3SjxQnAx9pPRbjeitQZEnTopP8PYw6ld4xnT1Tv
-2695xjKIsIz74XlsdKTDCKIWqFz//yUW7KCHQ4Rj6z4bnfSR0uec2IikKkKrmojk
-fv3XHMo1Q9ULgpkvzjbQ+o1A9Ruuyrm7qc9Hw3JSRFNMK7BROfGNIpkvc+wEuU2u
-HAajAnjNY6+UcVQiK6MR3qcqJcHL3qJYIPiZ2/YqgE9D4QFaBGA1gKkf/jgbA1ys
-edJ5+yg1Gu37kE0SyM7N
-=d/8U
+iQIcBAEBCAAGBQJOEQHkAAoJEOf+E+/4L5LmCVgP/RvJHivAB94v3OPFMsUfXm23
+7tNIgemxKxK7WPFR2nvTXTTscozVWaElg7PHHikrQ0CK9M1T9Cm25YUwRh+n5zCF
+lxlJciGAow63WYsY2cN3zBrrs2/lqGKEJxtMwczTKLGlFCsuwRdVgGYDFJOcvhlH
+w0NRnC/EbRrUQTbnEQ52vKYIiqk0ye+ty1ebIpCgDDTjaVMMEajlVBX3kr8v+DPx
+TZ9FLB9O/cE4KCNY3lZam9xAzyi+SzNp2htCFGFw5D6U2QlJJrtg9TrImPBKqej4
+SlK/7q5F/KTGRCRMxlRB2JRBn1YwrEQfWgz3Iyw744OjhjiHqvKpDhV9dmhejZqO
+vzrAHK+EjTM/OnCUDSF+08PY/QaPBttbu7OP8oYDKwbWjPXSRtbcC0d52boAdyZo
+xiFcZsjmoa+dpiBMDdNFhgvbO6/PmiJVMYOT2v2jJMhvLtqoDgqyFf8jEseAsaCC
+MKWtgaEI5utP/fNXALkb0t5BA4VWlcpiATwdycvnM+5aybhlQJeTKEoeTtTLQKkn
+Pj+bLmqfuxOx6YA+20aXhq7qcpMMh2OvZ7BtXNNS06WkxxBjyeAWV9EuaflRv5sY
+iDXVfZtFBKvPQ1Rb8v6kFhYfwPk+m2ut2xHFrcLakG8wMVbESz7r9YxK033/fjzo
+OkAFyXItBFB+qfjb15AM
+=AaYu
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index b7a50c2c915a..6e57dc7c39a8 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
 		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
 		<flag name='sctp'>Enable SCTP support</flag>
+		<flag name='slurm'>Add support for SLURM</flag>
 		<flag name='vt'>Enable bundled VampirTrace support</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.5.3-r2.ebuild b/sys-cluster/openmpi/openmpi-1.5.3-r2.ebuild
new file mode 100644
index 000000000000..438a812408ec
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.5.3-r2.ebuild
@@ -0,0 +1,119 @@
+# 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.5.3-r2.ebuild,v 1.1 2011/07/03 23:57:26 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 ~amd64-linux"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 mpi-threads pbs
+	romio sctp slurm threads vt"
+
+REQUIRED_USE="^^ (
+					( !slurm !pbs )
+					( slurm !pbs )
+					( !slurm pbs )
+				)"
+
+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 )
+	>=sys-apps/hwloc-1.1.1
+	!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-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 "${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) \
+		$(use_with sctp sctp)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	# From USE=vt see #359917
+	rm "${D}"/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.
+	cd "${S}"
+	emake -j1 check || die "emake check failed"
+}