Changes 3.0.4:

This release adds several performance features for the Hydra process manager, support for communicator-specific tuning of eager/rendezvous thresholds, and fixes several bugs present in 3.0.3. Please use this release instead of 3.0.3.

5 files changed, 59 insertions, 47 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 84f251b4548..1aee7f81316 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2013/04/30 07:03:33 asau Exp $
+# $NetBSD: Makefile,v 1.76 2013/05/10 08:24:57 adam Exp $
 
-DISTNAME=	mpich-3.0.3
-PKGREVISION=	1
+DISTNAME=	mpich-3.0.4
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/
 
@@ -16,7 +15,7 @@ DEPENDS+=	bash-[0-9]*:../../shells/bash
 MPI_PREFIX=		${LOCALBASE}
 INSTALLATION_PREFIX=	${MPI_PREFIX}
 
-USE_LANGUAGES=		c c++ fortran77
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
@@ -25,7 +24,6 @@ CONFIGURE_ARGS+=	--datadir=${MPI_PREFIX}/share/${PKGBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--docdir=${MPI_PREFIX}/share/doc/${PKGBASE}
 CONFIGURE_ARGS+=	--htmldir=${MPI_PREFIX}/share/doc/${PKGBASE}/html
-CONFIGURE_ARGS+=	--disable-fc		# problems?
 CONFIGURE_ARGS+=	--with-openpa-prefix=${BUILDLINK_PREFIX.openpa}
 CONFIGURE_ARGS+=	--with-hwloc-prefix=${BUILDLINK_PREFIX.hwloc}
 CONFIGURE_ARGS+=	--with-pm=hydra:gforker
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index 39685c8b73a..2a94ddf60d9 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,7 +1,37 @@
-@comment $NetBSD: PLIST,v 1.20 2013/04/17 20:25:27 asau Exp $
+@comment $NetBSD: PLIST,v 1.21 2013/05/10 08:24:57 adam Exp $
 bin/hydra_nameserver
 bin/hydra_persist
 bin/hydra_pmi_proxy
+${PLIST.mpd}bin/mpd
+${PLIST.mpd}bin/mpd.py
+${PLIST.mpd}bin/mpdallexit
+${PLIST.mpd}bin/mpdallexit.py
+${PLIST.mpd}bin/mpdboot
+${PLIST.mpd}bin/mpdboot.py
+${PLIST.mpd}bin/mpdcheck
+${PLIST.mpd}bin/mpdcheck.py
+${PLIST.mpd}bin/mpdchkpyver.py
+${PLIST.mpd}bin/mpdcleanup
+${PLIST.mpd}bin/mpdcleanup.py
+${PLIST.mpd}bin/mpdexit
+${PLIST.mpd}bin/mpdexit.py
+${PLIST.mpd}bin/mpdgdbdrv.py
+${PLIST.mpd}bin/mpdhelp
+${PLIST.mpd}bin/mpdhelp.py
+${PLIST.mpd}bin/mpdkilljob
+${PLIST.mpd}bin/mpdkilljob.py
+${PLIST.mpd}bin/mpdlib.py
+${PLIST.mpd}bin/mpdlistjobs
+${PLIST.mpd}bin/mpdlistjobs.py
+${PLIST.mpd}bin/mpdman.py
+${PLIST.mpd}bin/mpdringtest
+${PLIST.mpd}bin/mpdringtest.py
+${PLIST.mpd}bin/mpdroot
+${PLIST.mpd}bin/mpdrun
+${PLIST.mpd}bin/mpdsigjob
+${PLIST.mpd}bin/mpdsigjob.py
+${PLIST.mpd}bin/mpdtrace
+${PLIST.mpd}bin/mpdtrace.py
 bin/mpic++
 bin/mpicc
 bin/mpichversion
@@ -9,17 +39,24 @@ bin/mpicxx
 bin/mpiexec
 bin/mpiexec.gforker
 bin/mpiexec.hydra
+${PLIST.mpd}bin/mpiexec.mpd
 bin/mpif77
+${PLIST.f90}bin/mpif90
 bin/mpirun
 bin/parkill
 include/mpi.h
+${PLIST.f90}include/mpi.mod
+${PLIST.f90}include/mpi_base.mod
+${PLIST.f90}include/mpi_constants.mod
 include/mpicxx.h
 include/mpif.h
 include/mpio.h
 include/mpiof.h
+${PLIST.f90}include/mpi_sizeofs.mod
 lib/libfmpich.la
 lib/libmpich.la
 lib/libmpichcxx.la
+${PLIST.f90}lib/libmpichf90.la
 lib/libmpl.la
 lib/pkgconfig/mpich.pc
 man/man1/mpicc.1
@@ -422,3 +459,4 @@ share/doc/mpich/user.pdf
 share/mpich/examples/mpicc.conf
 share/mpich/examples/mpicxx.conf
 share/mpich/examples/mpif77.conf
+${PLIST.f90}share/mpich/examples/mpif90.conf
diff --git a/parallel/mpi-ch/PLIST.mpd b/parallel/mpi-ch/PLIST.mpd
deleted file mode 100644
index b9e6dafc3e3..00000000000
--- a/parallel/mpi-ch/PLIST.mpd
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST.mpd,v 1.3 2013/04/15 21:40:17 adam Exp $
-bin/mpd
-bin/mpd.py
-bin/mpdallexit
-bin/mpdallexit.py
-bin/mpdboot
-bin/mpdboot.py
-bin/mpdcheck
-bin/mpdcheck.py
-bin/mpdchkpyver.py
-bin/mpdcleanup
-bin/mpdcleanup.py
-bin/mpdexit
-bin/mpdexit.py
-bin/mpdgdbdrv.py
-bin/mpdhelp
-bin/mpdhelp.py
-bin/mpdkilljob
-bin/mpdkilljob.py
-bin/mpdlib.py
-bin/mpdlistjobs
-bin/mpdlistjobs.py
-bin/mpdman.py
-bin/mpdringtest
-bin/mpdringtest.py
-bin/mpdroot
-bin/mpdrun
-bin/mpdsigjob
-bin/mpdsigjob.py
-bin/mpdtrace
-bin/mpdtrace.py
-bin/mpiexec.mpd
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index f813906add4..c65d496ba94 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2013/04/20 17:39:00 asau Exp $
+$NetBSD: distinfo,v 1.24 2013/05/10 08:24:57 adam Exp $
 
-SHA1 (mpich-3.0.3.tar.gz) = cf515e9779e292d42ca5ceff34ee7b57b8978da2
-RMD160 (mpich-3.0.3.tar.gz) = 15ba7729108c39359624a937dd3857f3cdfacc0a
-Size (mpich-3.0.3.tar.gz) = 11018114 bytes
+SHA1 (mpich-3.0.4.tar.gz) = e89cc8de89d18d5718f7b881f3835b5a0943f897
+RMD160 (mpich-3.0.4.tar.gz) = c14b3b335be863dd36c0a58630c969719d8ef217
+Size (mpich-3.0.4.tar.gz) = 10921075 bytes
 SHA1 (patch-Makefile.in) = 32a78a384ecb94a30631a8a756e746edbe6e0060
 SHA1 (patch-configure) = 0e7fec4d30e33387d8b434c6b4e90bab1daa42ba
 SHA1 (patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h) = e0f3de9c7c229fee3de5e85e589b88987ef11a11
diff --git a/parallel/mpi-ch/options.mk b/parallel/mpi-ch/options.mk
index bd1644199e9..fa2d627b2a7 100644
--- a/parallel/mpi-ch/options.mk
+++ b/parallel/mpi-ch/options.mk
@@ -1,16 +1,26 @@
-# $NetBSD: options.mk,v 1.2 2013/04/15 21:40:17 adam Exp $
+# $NetBSD: options.mk,v 1.3 2013/05/10 08:24:57 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mpich
-PKG_SUPPORTED_OPTIONS=	debug mpich-mpd threads
+PKG_SUPPORTED_OPTIONS=	debug f90 mpich-mpd threads
 PKG_SUGGESTED_OPTIONS=	threads
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	f90 mpd
+
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-g=debug	# problems
 INSTALL_UNSTRIPPED=	yes
 .endif
 
+.if !empty(PKG_OPTIONS:Mf90)
+USE_LANGUAGES+=		fortran
+PLIST.f90=		yes
+.else
+USE_LANGUAGES+=		fortran77
+CONFIGURE_ARGS+=	--disable-fc
+.endif
+
 .if !empty(PKG_OPTIONS:Mthreads)
 CONFIGURE_ARGS+=	--with-thread-package=posix # aka pthreads
 .include "../../mk/pthread.buildlink3.mk"
@@ -21,9 +31,7 @@ CONFIGURE_ARGS+=	--with-thread-package=posix # aka pthreads
 CONFLICTS+=		musicpd-[0-9]*	# installs bin/mpd
 CONFIGURE_ARGS+=	--with-pm=hydra:mpd:gforker
 CONFIGURE_ARGS+=	--with-python=python${PYVERSSUFFIX}
-PLIST_SRC+=		PLIST.mpd
+PLIST.mpd=		yes
 REPLACE_PYTHON+=	src/pm/mpd/*.py src/pm/mpd/test/*.py
 .include "../../lang/python/application.mk"
 .endif
-
-PLIST_SRC+=	PLIST