Version bump. Use system hwloc. Switch to hydra instead of mpd for pm. Disable more tests as suggested by upstream. #362655.

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

3 files changed, 51 insertions, 26 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 9bbe99aaf..eae2a9b6c 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.4_rc2 (02 May 2011)
+
+  02 May 2011; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.3.ebuild,
+  +mpich2-1.4_rc2.ebuild:
+  Version bump. Use system hwloc. Switch to hydra instead of mpd for
+  pm. Disable more tests as suggested by upstream. #362655.
+
   22 Mar 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1-r2.ebuild:
   Use MPI_UNCLASSED_DEP_STR over MPI_UNCLASSED_BLOCKERS
 
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index e2afaec8f..a1abdd0e6 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ecb0192ea7a2a568ee422e SHA1 88cb1d7cc60a1eb7a2a7ea07c8058ebb3318c734 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa
 AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33
 AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00
@@ -10,8 +13,15 @@ AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7
 AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b
 AUX mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch 1053 RMD160 e38a0c503bde8b66cd1d7efbeb674f14e0008a8d SHA1 f5691827c39a9bbf01c4c7e13d5fdf4aa1774558 SHA256 a0e79be986c29cc5aa1b0abb1bba27dc368a530d632a332e8701e9c02967224e
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
-DIST mpich2-1.3.tar.gz 19394388 RMD160 e48e9116ad42cc9922497c12f9e926d6d3490976 SHA1 a6c5518ddf94c60397e0508898f770c693948619 SHA256 c76e869045ce274ee0494b0c72d884f9e2d3176a4689d362e684754ae0430e63
+DIST mpich2-1.4rc2.tar.gz 19764158 RMD160 2d5cbac33cd728ba0fb6b74d2fcd7f166f1bfc1e SHA1 53afd67e0527e0c1459330d70d7077a1da52fe0f SHA256 820fc929bd349a9b4e6ce4a2fa5e3b88b3abf6941a147f6921e3ab44f4a6015a
 EBUILD mpich2-1.2.1_p1-r2.ebuild 4999 RMD160 e3003de505a38998e0163603fbedb6314ed2046d SHA1 eb17186e8ff543febad806e28acc8a6b358c14be SHA256 9a394130ebdc6c55ca6443fa66df14b5ee877b57eac1999db7760c4368542386
-EBUILD mpich2-1.3.ebuild 3623 RMD160 b76f842287d68188ba8c8b020edbebead1214fae SHA1 44ff4d1fc90dbc05d1c985fec3b430dd6113d5fe SHA256 49f7bff34d653b6010f1dfc5543ea1503fd84a1abc6bbe63e197a89519821321
-MISC ChangeLog 4311 RMD160 fb11ca6e43b596a790405608a0482e5414a59891 SHA1 b2c7ce500728bc323f69914eea399de7886fc977 SHA256 ddaf9b5f28d2d64f8a6c0cf2a28b870c43105c01a2258d6d37fb0e011631c6f7
+EBUILD mpich2-1.4_rc2.ebuild 4240 RMD160 12cc73097a3c341761640c0c08f47dbdb4e532c4 SHA1 084d010e3f9f2f655c8dceab5fa6c53b3f273196 SHA256 35623fd0cabd58109c4969e58f41ba5a0cc6fba86cb72089a5d5a43d56e9fba7
+MISC ChangeLog 4571 RMD160 4c3a60fa15ca19b0809b1261ce4f120b80364035 SHA1 b5bbc182be8d4841c7e89d0d9d7c27a71a04efc0 SHA256 b674cf196c25f632e8133bc7d56f97bf03857d2d4b48e7ebe3000dfeb6e3a028
 MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2+B18ACgkQ4MrvBE1wQ8kk+QCdFCrEXGB/ZlF4Za6Rq9wQtV6M
+1egAoJE3liwXeK24NIQzv52vWCISJL6a
+=xSJv
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/mpich2-1.3.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index 591d51107..859310adf 100644
--- a/sys-cluster/mpich2/mpich2-1.3.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,11 +12,11 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran threads romio mpi-threads"
 
 COMMON_DEPEND="dev-libs/libaio
-	sys-apps/hwloc
+	>=sys-apps/hwloc-1.1.1
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
 
@@ -44,20 +44,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# We need f90 to include the directory with mods, and to
-	# fix hardcoded paths for src_test()
-	# Submitted upstream.
+	# Cannot use bin/mpiexec, as hydra is built by autotools and is
+	# a shell wrapped executabled.
 	sed -i \
-		-e "s,FCFLAGS\( *\)=,FCFLAGS\1?=," \
-		-e "s,\$(bindir)/,${S}/bin/,g" \
-		-e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \
+		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
 		$(find ./test/ -name 'Makefile.in') || die
 
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
 	# 293665:  Should check in on MPICH2_MPIX_FLAGS in later releases
 	# (>1.3) as this is seeing some development in trunk as of r6350.
 	sed -i \
@@ -78,7 +70,7 @@ src_configure() {
 	if use mpi-threads; then
 		# MPI-THREAD requries threading.
 		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=default"
+		c="${c} --enable-threads=runtime"
 	else
 		if use threads ; then
 			c="${c} --with-thread-package=pthreads"
@@ -102,6 +94,8 @@ src_configure() {
 		--with-pm=hydra \
 		--disable-mpe \
 		--with-hwloc-prefix=/usr \
+		--disable-fast \
+		--enable-smpcoll \
 		$(use_enable romio) \
 		$(use_enable cxx) \
 		|| die
@@ -110,28 +104,42 @@ src_configure() {
 src_compile() {
 	# Oh, the irony.
 	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
+	# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
 	emake -j1 || die
 }
 
 src_test() {
-	local rc
+	if ! use romio; then
+		# These tests in errhan/ rely on MPI::File ...which is in romio
+		echo "" > test/mpi/errors/cxx/errhan/testlist
+	fi
 
-	make \
+	# See #362655 and comments in the testlist files.
+	# large_message:  only on machines with > 8gb of ram
+	# bcastlength:  This is an extension to MPI that's not necessary
+	# non_zero_root: performance test
+	# Also note that I/O tests may fail on non-local filesystems.
+	sed -i '/^[# ]*large_message/d' test/mpi/pt2pt/testlist || die
+	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
+	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
+
+	if use debug; then
+		# http://bugs.gentoo.org/show_bug.cgi?id=362655#c8
+		sed -i '/^[# ]*scancel/d' test/mpi/pt2pt/testlist || die
+		sed -i '/^[# ]*pscancel/d' test/mpi/pt2pt/testlist || die
+		sed -i '/^[# ]*cancelrecv/d' test/mpi/pt2pt/testlist || die
+	fi
+
+	emake -j1 \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \
 		F77="${S}"/bin/mpif77 \
 		FC="${S}"/bin/mpif90 \
-		FCFLAGS="${FCFLAGS} -I${S}/src/binding/f90/" \
 		testing
-	rc=$?
-
-	return ${rc}
 }
 
 src_install() {
 	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
-	local f
 
 	emake DESTDIR="${D}" install || die