Changes 3.0.3:

A new stable release of MPICH, 3.0.3, is now available for download. This release adds several performance features for MPI-RMA and fixes several bugs present in 3.0.2. Please use this release instead of 3.0.2.

6 files changed, 79 insertions, 42 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 143410fd6fd..c6c497329e2 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,53 +1,48 @@
-# $NetBSD: Makefile,v 1.73 2013/03/17 17:08:51 asau Exp $
+# $NetBSD: Makefile,v 1.74 2013/04/15 21:40:17 adam Exp $
 
-DISTNAME=	mpich-3.0.1
+DISTNAME=	mpich-3.0.3
 CATEGORIES=	parallel
-MASTER_SITES=	http://www.mpich.org/static/tarballs/$(PKGVERSION_NOREV)/
+MASTER_SITES=	http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/
 
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://www.mpich.org/
 COMMENT=	Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago
 
-MAKE_JOBS_SAFE=		no
-
 DEPENDS+=	bash-[0-9]*:../../shells/bash
 
-# MPI_SUBPREFIX=		mpich
-# MPI_PREFIX=		$(LOCALBASE)/$(MPI_SUBPREFIX)
-MPI_PREFIX=		$(LOCALBASE)
-INSTALLATION_PREFIX=	$(MPI_PREFIX)
+#MPI_SUBPREFIX=		mpich
+#MPI_PREFIX=		${LOCALBASE}/${MPI_SUBPREFIX}
+MPI_PREFIX=		${LOCALBASE}
+INSTALLATION_PREFIX=	${MPI_PREFIX}
 
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++ fortran77
-
-PKG_SYSCONFSUBDIR=	mpich
-
-GNU_CONFIGURE_PREFIX=	$(MPI_PREFIX)
-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+=	--with-pm=hydra:gforker
+USE_LIBTOOL=		yes
+USE_TOOLS+=		perl:run
+GNU_CONFIGURE=		yes
+GNU_CONFIGURE_PREFIX=	${MPI_PREFIX}
+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:Q) # reuse it
-CONFIGURE_ARGS+=	--with-hwloc-prefix=$(BUILDLINK_PREFIX.hwloc:Q) # reuse it
+CONFIGURE_ARGS+=	--with-openpa-prefix=${BUILDLINK_PREFIX.openpa}
+CONFIGURE_ARGS+=	--with-hwloc-prefix=${BUILDLINK_PREFIX.hwloc}
+CONFIGURE_ARGS+=	--with-pm=hydra:gforker
 
-USE_TOOLS+=		perl:run
+PKG_SYSCONFSUBDIR=	mpich
 
-BUILDLINK_PASSTHRU_RPATHDIRS+=	$(MPI_PREFIX)/lib
+BUILDLINK_PASSTHRU_RPATHDIRS+=	${MPI_PREFIX}/lib
 
-CONF_FILES+=		share/$(PKGBASE)/examples/mpicc.conf \
-			$(PKG_SYSCONFDIR)/mpicc.conf
-CONF_FILES+=		share/$(PKGBASE)/examples/mpicxx.conf \
-			$(PKG_SYSCONFDIR)/mpicxx.conf
-CONF_FILES+=		share/$(PKGBASE)/examples/mpif77.conf \
-			$(PKG_SYSCONFDIR)/mpif77.conf
+CONF_FILES+=		share/${PKGBASE}/examples/mpicc.conf \
+			${PKG_SYSCONFDIR}/mpicc.conf
+CONF_FILES+=		share/${PKGBASE}/examples/mpicxx.conf \
+			${PKG_SYSCONFDIR}/mpicxx.conf
+CONF_FILES+=		share/${PKGBASE}/examples/mpif77.conf \
+			${PKG_SYSCONFDIR}/mpif77.conf
 
 # FreeBSD 6 hack:
 .include "../../mk/bsd.prefs.mk"
-.if $(OPSYS) == "FreeBSD" || $(OPSYS) == "DragonFly"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 BUILDLINK_TRANSFORM+=	rm:-lrt
 .endif
 
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index 389b0055626..d43e6fbd94b 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/03/17 17:08:51 asau Exp $
+@comment $NetBSD: PLIST,v 1.19 2013/04/15 21:40:17 adam Exp $
 bin/hydra_nameserver
 bin/hydra_persist
 bin/hydra_pmi_proxy
@@ -21,6 +21,7 @@ lib/libfmpich.la
 lib/libmpich.la
 lib/libmpichcxx.la
 lib/libmpl.la
+lib/libpmpich.la
 lib/pkgconfig/mpich.pc
 man/man1/mpicc.1
 man/man1/mpicxx.1
diff --git a/parallel/mpi-ch/PLIST.mpd b/parallel/mpi-ch/PLIST.mpd
index 0f3a526bcd8..b9e6dafc3e3 100644
--- a/parallel/mpi-ch/PLIST.mpd
+++ b/parallel/mpi-ch/PLIST.mpd
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.mpd,v 1.2 2013/04/06 04:03:37 rodent Exp $
+@comment $NetBSD: PLIST.mpd,v 1.3 2013/04/15 21:40:17 adam Exp $
 bin/mpd
 bin/mpd.py
 bin/mpdallexit
@@ -23,6 +23,7 @@ bin/mpdlistjobs.py
 bin/mpdman.py
 bin/mpdringtest
 bin/mpdringtest.py
+bin/mpdroot
 bin/mpdrun
 bin/mpdsigjob
 bin/mpdsigjob.py
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index d277d6b32b8..7cacfcdac4e 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.21 2013/03/17 17:08:51 asau Exp $
+$NetBSD: distinfo,v 1.22 2013/04/15 21:40:17 adam Exp $
 
-SHA1 (mpich-3.0.1.tar.gz) = 61ed0b9fac26e1d102d93503bd8e1ac73f246b5a
-RMD160 (mpich-3.0.1.tar.gz) = a30aa14f9360b9cf2e88f9cd4f06b24b8800c55d
-Size (mpich-3.0.1.tar.gz) = 10934260 bytes
+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 (patch-Makefile.in) = 32a78a384ecb94a30631a8a756e746edbe6e0060
+SHA1 (patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h) = e0f3de9c7c229fee3de5e85e589b88987ef11a11
 SHA1 (patch-src_pm_hydra_configure) = c8d25676499386e4a2616db5ab2d86443f29b1f7
diff --git a/parallel/mpi-ch/options.mk b/parallel/mpi-ch/options.mk
index 206f759fdb5..bd1644199e9 100644
--- a/parallel/mpi-ch/options.mk
+++ b/parallel/mpi-ch/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2010/12/17 02:47:18 asau Exp $
+# $NetBSD: options.mk,v 1.2 2013/04/15 21:40:17 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mpich
 PKG_SUPPORTED_OPTIONS=	debug mpich-mpd threads
@@ -18,10 +18,11 @@ CONFIGURE_ARGS+=	--with-thread-package=posix # aka pthreads
 
 # Allow coexistance of MPICH2 and musicpd by disabling MPICH2 parts:
 .if !empty(PKG_OPTIONS:Mmpich-mpd)
-CONFLICTS+=	musicpd-[0-9]*	# installs bin/mpd
-REPLACE_PYTHON+=	src/pm/mpd/*.py src/pm/mpd/test/*.py
+CONFLICTS+=		musicpd-[0-9]*	# installs bin/mpd
 CONFIGURE_ARGS+=	--with-pm=hydra:mpd:gforker
-PLIST_SRC+=	PLIST.mpd
+CONFIGURE_ARGS+=	--with-python=python${PYVERSSUFFIX}
+PLIST_SRC+=		PLIST.mpd
+REPLACE_PYTHON+=	src/pm/mpd/*.py src/pm/mpd/test/*.py
 .include "../../lang/python/application.mk"
 .endif
 
diff --git a/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h b/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h
new file mode 100644
index 00000000000..e5eee81d1b2
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_mpid_ch3_channels_nemesis_include_mpidi_ch3_impl.h,v 1.1 2013/04/15 21:40:17 adam Exp $
+
+Use pthread_mutexattr_setpshared() only when available.
+
+--- src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h.orig	2013-04-15 21:03:05.000000000 +0000
++++ src/mpid/ch3/channels/nemesis/include/mpidi_ch3_impl.h
+@@ -99,6 +99,7 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **wi
+                              "**pthread_unlock %s", strerror(pt_err));                  \
+     } while (0)
+ 
++#ifdef _POSIX_THREAD_PROCESS_SHARED
+ #define MPIDI_CH3I_SHM_MUTEX_INIT(win_ptr)                                              \
+     do {                                                                                \
+         int pt_err;                                                                     \
+@@ -117,6 +118,23 @@ int MPIDI_CH3_SHM_Win_free(MPID_Win **wi
+         MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex",       \
+                              "**pthread_mutex %s", strerror(pt_err));                   \
+     } while (0);
++#else
++#define MPIDI_CH3I_SHM_MUTEX_INIT(win_ptr)                                              \
++    do {                                                                                \
++        int pt_err;                                                                     \
++        pthread_mutexattr_t attr;                                                       \
++                                                                                        \
++        pt_err = pthread_mutexattr_init(&attr);                                         \
++        MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex",       \
++                             "**pthread_mutex %s", strerror(pt_err));                   \
++        pt_err = pthread_mutex_init((win_ptr)->shm_mutex, &attr);                       \
++        MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex",       \
++                             "**pthread_mutex %s", strerror(pt_err));                   \
++        pt_err = pthread_mutexattr_destroy(&attr);                                      \
++        MPIU_ERR_CHKANDJUMP1(pt_err, mpi_errno, MPI_ERR_OTHER, "**pthread_mutex",       \
++                             "**pthread_mutex %s", strerror(pt_err));                   \
++    } while (0);
++#endif
+ 
+ #define MPIDI_CH3I_SHM_MUTEX_DESTROY(win_ptr)                                           \
+     do {                                                                                \