[gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/

["Justin Bronder" <jsbronder@gentoo.org>]

commit:     58d41ac415cb352b759ea895d9f041a461f52ffc
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 01:22:40 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon May  2 01:22:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=58d41ac4

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)

---
 sys-cluster/mpich2/ChangeLog                       |    7 +++
 .../{mpich2-1.3.ebuild => mpich2-1.4_rc2.ebuild}   |   54 +++++++++++--------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 9bbe99a..eae2a9b 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/mpich2-1.3.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
similarity index 73%
rename from sys-cluster/mpich2/mpich2-1.3.ebuild
rename to sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index 591d511..859310a 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