From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QGhqy-0001Qn-HS for garchives@archives.gentoo.org; Mon, 02 May 2011 01:23:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97E851C0E8; Mon, 2 May 2011 01:23:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 580441C0E8 for ; Mon, 2 May 2011 01:23:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B29451B405A for ; Mon, 2 May 2011 01:23:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0858380509 for ; Mon, 2 May 2011 01:23:03 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <58d41ac415cb352b759ea895d9f041a461f52ffc.jsbronder@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/mpich2/ChangeLog sys-cluster/mpich2/mpich2-1.3.ebuild sys-cluster/mpich2/mpich2-1.4_rc2.ebuild X-VCS-Directories: sys-cluster/mpich2/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: 58d41ac415cb352b759ea895d9f041a461f52ffc Date: Mon, 2 May 2011 01:23:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 43944df5fcf754880b26d0fea8c763a9 commit: 58d41ac415cb352b759ea895d9f041a461f52ffc Author: Justin Bronder gentoo org> AuthorDate: Mon May 2 01:22:40 2011 +0000 Commit: Justin Bronder gentoo org> CommitDate: Mon May 2 01:22:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D58d41ac4 Version bump. Use system hwloc. Switch to hydra instead of mpd for pm. Di= sable 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 =3D> 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: $ =20 +*mpich2-1.4_rc2 (02 May 2011) + + 02 May 2011; Justin Bronder -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 mpich2-1.2.1_p1-r2.= ebuild: Use MPI_UNCLASSED_DEP_STR over MPI_UNCLASSED_BLOCKERS =20 diff --git a/sys-cluster/mpich2/mpich2-1.3.ebuild b/sys-cluster/mpich2/mp= ich2-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: $ =20 @@ -12,11 +12,11 @@ SRC_URI=3D"http://www.mcs.anl.gov/research/projects/m= pich2/downloads/tarballs/${MY =20 LICENSE=3D"as-is" SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" +KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86" IUSE=3D"+cxx debug doc fortran threads romio mpi-threads" =20 COMMON_DEPEND=3D"dev-libs/libaio - sys-apps/hwloc + >=3Dsys-apps/hwloc-1.1.1 romio? ( net-fs/nfs-utils ) $(mpi_imp_deplist)" =20 @@ -44,20 +44,12 @@ pkg_setup() { } =20 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\( *\)=3D,FCFLAGS\1?=3D," \ - -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 =20 - 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=3D"${c} --with-thread-package=3Dpthreads" - c=3D"${c} --enable-threads=3Ddefault" + c=3D"${c} --enable-threads=3Druntime" else if use threads ; then c=3D"${c} --with-thread-package=3Dpthreads" @@ -102,6 +94,8 @@ src_configure() { --with-pm=3Dhydra \ --disable-mpe \ --with-hwloc-prefix=3D/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 } =20 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 =20 - 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=3D362655#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=3D"${S}"/bin/mpicc \ CXX=3D"${S}"/bin/mpicxx \ F77=3D"${S}"/bin/mpif77 \ FC=3D"${S}"/bin/mpif90 \ - FCFLAGS=3D"${FCFLAGS} -I${S}/src/binding/f90/" \ testing - rc=3D$? - - return ${rc} } =20 src_install() { local d=3D$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g') - local f =20 emake DESTDIR=3D"${D}" install || die =20