4 files changed, 247 insertions, 287 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index d311e33ccad5..c90130f016db 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -1,11 +1,7 @@
 # $FreeBSD$
 
-# TODO:
-#  - etc/*.sample support
-
 PORTNAME=	openmpi
-PORTVERSION=	1.10.7
-PORTREVISION=	7
+PORTVERSION=	4.0.3
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
 
@@ -15,15 +11,20 @@ COMMENT=	High Performance Message Passing Library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv6=		fails to package: pkg-static: mca_patcher_overwrite.la: No such file or directory
+BROKEN_armv7=		fails to package: pkg-static: mca_patcher_overwrite.la: No such file or directory
+BROKEN_sparc64=		fails to compile on sparc64
+
 LIB_DEPENDS=	libhwloc.so:devel/hwloc \
 		libltdl.so:devel/libltdl \
-		libevent.so:devel/libevent
+		libevent.so:devel/libevent \
+		libmunge.so:security/munge
 
-HAS_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 # :keepla because port uses lt_dlopen
-USES=		compiler:c11 fortran gmake libtool:keepla perl5 pkgconfig \
-		tar:bzip2
+USES=		fortran gmake libtool:keepla localbase perl5 \
+		pkgconfig shebangfix tar:bzip2
+
+HAS_CONFIGURE=	yes
 USE_PERL5=	build
 
 MPIBASE?=	mpi
@@ -32,33 +33,45 @@ MPIDIR?=	${MPIBASE}/${PKGBASE}
 PLIST_SUB+=	MPIBASE=${MPIBASE}
 PLIST_SUB+=	MPIDIR=${MPIDIR}
 
+# Workaround for https://github.com/open-mpi/ompi/issues/7516
+CONFIGURE_ENV+=		DISABLE_gds_ds12=1 DISABLE_gds_ds21=1
+
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
 			--mandir=${PREFIX}/${MPIDIR}/man \
 			--program-prefix= \
-			--with-hwloc=${LOCALBASE} \
-			--with-libltdl=${LOCALBASE} \
+			--with-hwloc=external \
+			--with-libltdl \
 			--enable-mpi-fortran=usempi \
+			--enable-mpi-cxx \
+			--enable-cxx-exceptions \
+			--enable-mpi-thread-multiple \
 			--with-libevent=external \
+			--enable-mca-no-build=verbs,btl_openib,oob_ud \
+			--without-verbs \
 			--with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 			ompi_cv_fortran_ignore_tkr_data=0
 
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 		${PREFIX}/${MPIDIR}/lib/openmpi
 
 MANPREFIX=	${PREFIX}/${MPIDIR}
 
-OPTIONS_DEFINE=	IPV6 SLURM TORQUE VT
+SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
+		ompi/mca/common/monitoring/aggregate_profile.pl
+
+OPTIONS_DEFINE=	DEBUG IPV6 SLURM TORQUE
 TORQUE_DESC=	Enable Torque support
 SLURM_DESC=	Enable SLURM support
-VT_DESC=		Enable VampirTrace support
 OPTIONS_DEFAULT=	SLURM
+OPTIONS_EXCLUDE_i386=	SLURM
 OPTIONS_SUB=	yes
 
+DEBUG_CONFIGURE_ENABLE=	debug
+DEBUG_INSTALL_TARGET_OFF=	install-strip
+
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-TORQUE_CONFIGURE_ON=	--with-tm=${LOCALBASE}
-TORQUE_CONFIGURE_OFF=	--without-tm
+TORQUE_CONFIGURE_WITH=	tm
 TORQUE_LIB_DEPENDS=	libtorque.so:sysutils/torque
 TORQUE_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_plm_tm.so \
 			${MPIDIR}/lib/openmpi/mca_plm_tm.la \
@@ -77,12 +90,20 @@ SLURM_PLIST_FILES=	${MPIDIR}/lib/openmpi/mca_ess_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_plm_slurm.so \
 			${MPIDIR}/lib/openmpi/mca_ras_slurm.la \
 			${MPIDIR}/lib/openmpi/mca_ras_slurm.so \
+			${MPIDIR}/lib/openmpi/mca_schizo_slurm.la \
+			${MPIDIR}/lib/openmpi/mca_schizo_slurm.so \
 			${MPIDIR}/share/openmpi/help-plm-slurm.txt \
 			${MPIDIR}/share/openmpi/help-ras-slurm.txt
 
-VT_CONFIGURE_OFF=	--enable-contrib-no-build=vt --disable-vt
-VT_USE=			JAVA=yes
-
-BROKEN_sparc64=		Does not compile on sparc64
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/${MPIDIR}/libdata/pkgconfig|g' \
+		${WRKSRC}/ompi/tools/wrappers/Makefile.am \
+		${WRKSRC}/ompi/tools/wrappers/Makefile.in \
+		${WRKSRC}/opal/tools/wrappers/Makefile.am \
+		${WRKSRC}/opal/tools/wrappers/Makefile.in \
+		${WRKSRC}/orte/tools/wrappers/Makefile.am \
+		${WRKSRC}/orte/tools/wrappers/Makefile.in
+	@${REINPLACE_CMD} 's|define MCA_hwloc_external_.*header "|&${LOCALBASE}/include/|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index 76986bf4eb6f..e5a6269508ff 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497724776
-SHA256 (openmpi-1.10.7.tar.bz2) = a089ece151fec974905caa35b0a59039b227bdea4e7933069e94bee4ed0e5a90
-SIZE (openmpi-1.10.7.tar.bz2) = 13435131
+TIMESTAMP = 1586692006
+SHA256 (openmpi-4.0.3.tar.bz2) = 1402feced8c3847b3ab8252165b90f7d1fa28c23b6b2ca4632b6e4971267fd03
+SIZE (openmpi-4.0.3.tar.bz2) = 9856669
diff --git a/net/openmpi/files/patch-opal_mca_pmix_pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c b/net/openmpi/files/patch-opal_mca_pmix_pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c
new file mode 100644
index 000000000000..2718655bf401
--- /dev/null
+++ b/net/openmpi/files/patch-opal_mca_pmix_pmix3x_pmix_src_mca_pshmem_mmap_pshmem__mmap.c
@@ -0,0 +1,20 @@
+--- opal/mca/pmix/pmix3x/pmix/src/mca/pshmem/mmap/pshmem_mmap.c.orig	2020-04-12 11:49:10 UTC
++++ opal/mca/pmix/pmix3x/pmix/src/mca/pshmem/mmap/pshmem_mmap.c
+@@ -79,6 +79,9 @@ static int _mmap_segment_create(pmix_pshmem_seg_t *sm_
+     if (0 != (rc = posix_fallocate(sm_seg->seg_id, 0, size))) {
+         pmix_output_verbose(2, pmix_globals.debug_output,
+                 "sys call posix_fallocate(2) fail\n");
++        if (EINVAL == rc) {
++            goto ftruncate;
++        }
+         if (ENOSPC == rc) {
+             rc = PMIX_ERR_OUT_OF_RESOURCE;
+             goto out;
+@@ -98,6 +101,7 @@ static int _mmap_segment_create(pmix_pshmem_seg_t *sm_
+         goto map_memory;
+     }
+ #endif
++ftruncate:
+     if (0 != ftruncate(sm_seg->seg_id, size)) {
+         pmix_output_verbose(2, pmix_globals.debug_output,
+                 "sys call ftruncate(2) fail\n");
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 48b0a17da6ea..4bab824f21d6 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -1,3 +1,4 @@
+%%MPIDIR%%/bin/aggregate_profile.pl
 %%MPIDIR%%/bin/mpiCC
 %%MPIDIR%%/bin/mpic++
 %%MPIDIR%%/bin/mpicc
@@ -8,174 +9,24 @@
 %%MPIDIR%%/bin/mpifort
 %%MPIDIR%%/bin/mpirun
 %%MPIDIR%%/bin/ompi-clean
-%%MPIDIR%%/bin/ompi-ps
 %%MPIDIR%%/bin/ompi-server
-%%MPIDIR%%/bin/ompi-top
 %%MPIDIR%%/bin/ompi_info
 %%MPIDIR%%/bin/opal_wrapper
 %%MPIDIR%%/bin/orte-clean
-%%MPIDIR%%/bin/orte-dvm
 %%MPIDIR%%/bin/orte-info
-%%MPIDIR%%/bin/orte-ps
 %%MPIDIR%%/bin/orte-server
-%%MPIDIR%%/bin/orte-submit
-%%MPIDIR%%/bin/orte-top
 %%MPIDIR%%/bin/ortecc
-%%MPIDIR%%/bin/orterun
 %%MPIDIR%%/bin/orted
-%%VT%%%%MPIDIR%%/bin/mpiCC-vt
-%%VT%%%%MPIDIR%%/bin/mpic++-vt
-%%VT%%%%MPIDIR%%/bin/mpicc-vt
-%%VT%%%%MPIDIR%%/bin/mpicxx-vt
-%%VT%%%%MPIDIR%%/bin/mpif77-vt
-%%VT%%%%MPIDIR%%/bin/mpif90-vt
-%%VT%%%%MPIDIR%%/bin/mpifort-vt
-%%VT%%%%MPIDIR%%/bin/otfaux
-%%VT%%%%MPIDIR%%/bin/otfcompress
-%%VT%%%%MPIDIR%%/bin/otfconfig
-%%VT%%%%MPIDIR%%/bin/otfdecompress
-%%VT%%%%MPIDIR%%/bin/otfinfo
-%%VT%%%%MPIDIR%%/bin/otfmerge
-%%VT%%%%MPIDIR%%/bin/otfmerge-mpi
-%%VT%%%%MPIDIR%%/bin/otfprint
-%%VT%%%%MPIDIR%%/bin/otfprofile
-%%VT%%%%MPIDIR%%/bin/otfprofile-mpi
-%%VT%%%%MPIDIR%%/bin/otfshrink
-%%VT%%%%MPIDIR%%/bin/vtCC
-%%VT%%%%MPIDIR%%/bin/vtc++
-%%VT%%%%MPIDIR%%/bin/vtcc
-%%VT%%%%MPIDIR%%/bin/vtcxx
-%%VT%%%%MPIDIR%%/bin/vtf77
-%%VT%%%%MPIDIR%%/bin/vtf90
-%%VT%%%%MPIDIR%%/bin/vtfilter
-%%VT%%%%MPIDIR%%/bin/vtfilter-mpi
-%%VT%%%%MPIDIR%%/bin/vtfiltergen
-%%VT%%%%MPIDIR%%/bin/vtfiltergen-mpi
-%%VT%%%%MPIDIR%%/bin/vtfort
-%%VT%%%%MPIDIR%%/bin/vtrun
-%%VT%%%%MPIDIR%%/bin/vtsetup
-%%VT%%%%MPIDIR%%/bin/vtsetup.jar
-%%VT%%%%MPIDIR%%/bin/vtunify
-%%VT%%%%MPIDIR%%/bin/vtunify-mpi
-%%VT%%%%MPIDIR%%/bin/vtwrapper
-%%VT%%%%MPIDIR%%/etc/vtsetup-config.dtd
-%%VT%%%%MPIDIR%%/etc/vtsetup-config.xml
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_MsgMatching.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_State.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTFAUX_Thumbnail.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_CopyHandler_stream.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Definitions.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Errno.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_FileManager.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_File_iofsl.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Filenames.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_HandlerArray.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_KeyValue.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_MasterControl.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RBuffer.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_RStream.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Reader.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Version.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WBuffer.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_WStream.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_Writer.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/OTF_inttypes_unix.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/otf.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/open-trace-format/otfaux.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_inttypes.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user.inc
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_comment.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_comment.inc
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_control.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_control.inc
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_count.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_count.inc
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_marker.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_marker.inc
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_message.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_message.inc
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_region.h
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_user_region.inc
-%%VT%%%%MPIDIR%%/include/vampirtrace/vt_wrap_pthread.h
-%%VT%%%%MPIDIR%%/lib/libopen-trace-format.a
-%%VT%%%%MPIDIR%%/lib/libopen-trace-format.la
-%%VT%%%%MPIDIR%%/lib/libopen-trace-format.so
-%%VT%%%%MPIDIR%%/lib/libopen-trace-format.so.1
-%%VT%%%%MPIDIR%%/lib/libopen-trace-format.so.1.0.0
-%%VT%%%%MPIDIR%%/lib/libotfaux.a
-%%VT%%%%MPIDIR%%/lib/libotfaux.la
-%%VT%%%%MPIDIR%%/lib/libotfaux.so
-%%VT%%%%MPIDIR%%/lib/libotfaux.so.0
-%%VT%%%%MPIDIR%%/lib/libotfaux.so.0.0.0
-%%VT%%%%MPIDIR%%/lib/libvt-hyb.a
-%%VT%%%%MPIDIR%%/lib/libvt-hyb.la
-%%VT%%%%MPIDIR%%/lib/libvt-hyb.so
-%%VT%%%%MPIDIR%%/lib/libvt-hyb.so.0
-%%VT%%%%MPIDIR%%/lib/libvt-hyb.so.0.0.0
-%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.a
-%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.la
-%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.so
-%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.so.0
-%%VT%%%%MPIDIR%%/lib/libvt-mpi-unify.so.0.0.0
-%%VT%%%%MPIDIR%%/lib/libvt-mpi.a
-%%VT%%%%MPIDIR%%/lib/libvt-mpi.la
-%%VT%%%%MPIDIR%%/lib/libvt-mpi.so
-%%VT%%%%MPIDIR%%/lib/libvt-mpi.so.0
-%%VT%%%%MPIDIR%%/lib/libvt-mpi.so.0.0.0
-%%VT%%%%MPIDIR%%/lib/libvt-mt.a
-%%VT%%%%MPIDIR%%/lib/libvt-mt.la
-%%VT%%%%MPIDIR%%/lib/libvt-mt.so
-%%VT%%%%MPIDIR%%/lib/libvt-mt.so.0
-%%VT%%%%MPIDIR%%/lib/libvt-mt.so.0.0.0
-%%VT%%%%MPIDIR%%/lib/libvt.a
-%%VT%%%%MPIDIR%%/lib/libvt.la
-%%VT%%%%MPIDIR%%/lib/libvt.so
-%%VT%%%%MPIDIR%%/lib/libvt.so.0
-%%VT%%%%MPIDIR%%/lib/libvt.so.0.0.0
-%%VT%%%%MPIDIR%%/%%DATADIR%%/mpiCC-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/%%DATADIR%%/mpic++-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/%%DATADIR%%/mpicc-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/%%DATADIR%%/mpicxx-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/%%DATADIR%%/mpif77-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/%%DATADIR%%/mpif90-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/%%DATADIR%%/mpifort-vt-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/FILTER.SPEC
-%%VT%%%%MPIDIR%%/share/vampirtrace/GROUPS.SPEC
-%%VT%%%%MPIDIR%%/share/vampirtrace/METRICS.SPEC
-%%VT%%%%MPIDIR%%/share/vampirtrace/config.log
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/ChangeLog
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/LICENSE
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/UserManual.html
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/UserManual.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/ChangeLog
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/LICENSE
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otfprofile_clustering.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/otftools.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/otf/specification.pdf
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/vtsetup/ChangeLog
-%%VT%%%%MPIDIR%%/share/vampirtrace/doc/vtsetup/LICENSE
-%%VT%%%%MPIDIR%%/share/vampirtrace/libtool
-%%VT%%%%MPIDIR%%/share/vampirtrace/omp.h
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtCC-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtc++-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtcc-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtcxx-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtf77-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtf90-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtfort-wrapper-data.txt
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtsetup-data.dtd
-%%VT%%%%MPIDIR%%/share/vampirtrace/vtsetup-data.xml
+%%MPIDIR%%/bin/orterun
+%%MPIDIR%%/bin/profile2mat.pl
 %%MPIDIR%%/%%ETCDIR%%-default-hostfile
 %%MPIDIR%%/%%ETCDIR%%-mca-params.conf
 %%MPIDIR%%/%%ETCDIR%%-totalview.tcl
+%%MPIDIR%%/etc/pmix-mca-params.conf
 %%MPIDIR%%/include/mpi-ext.h
 %%MPIDIR%%/include/mpi.h
 %%MPIDIR%%/include/mpi_portable_platform.h
+%%MPIDIR%%/include/mpif-c-constants-decl.h
 %%MPIDIR%%/include/mpif-config.h
 %%MPIDIR%%/include/mpif-constants.h
 %%MPIDIR%%/include/mpif-ext.h
@@ -186,9 +37,15 @@
 %%MPIDIR%%/include/mpif-sentinels.h
 %%MPIDIR%%/include/mpif-sizeof.h
 %%MPIDIR%%/include/mpif.h
+%%MPIDIR%%/include/openmpi/mpiext/mpiext_affinity_c.h
+%%MPIDIR%%/include/openmpi/mpiext/mpiext_cuda_c.h
+%%MPIDIR%%/include/openmpi/mpiext/mpiext_pcollreq_c.h
+%%MPIDIR%%/include/openmpi/mpiext/mpiext_pcollreq_mpifh.h
+%%MPIDIR%%/include/openmpi/mpiext/pmpiext_pcollreq_c.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/comm_inln.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/constants.h
+%%MPIDIR%%/include/openmpi/ompi/mpi/cxx/cxx_glue.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/datatype.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/datatype_inln.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/errhandler.h
@@ -217,49 +74,59 @@
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/topology_inln.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win_inln.h
+%%MPIDIR%%/lib/libmca_common_dstore.la
+%%MPIDIR%%/lib/libmca_common_dstore.so
+%%MPIDIR%%/lib/libmca_common_dstore.so.1
+%%MPIDIR%%/lib/libmca_common_dstore.so.1.0.2
+%%MPIDIR%%/lib/libmca_common_monitoring.la
+%%MPIDIR%%/lib/libmca_common_monitoring.so
+%%MPIDIR%%/lib/libmca_common_monitoring.so.50
+%%MPIDIR%%/lib/libmca_common_monitoring.so.50.10.0
+%%MPIDIR%%/lib/libmca_common_ompio.la
+%%MPIDIR%%/lib/libmca_common_ompio.so
+%%MPIDIR%%/lib/libmca_common_ompio.so.41
+%%MPIDIR%%/lib/libmca_common_ompio.so.41.19.3
 %%MPIDIR%%/lib/libmca_common_sm.la
 %%MPIDIR%%/lib/libmca_common_sm.so
-%%MPIDIR%%/lib/libmca_common_sm.so.4
-%%MPIDIR%%/lib/libmca_common_sm.so.4.0.4
+%%MPIDIR%%/lib/libmca_common_sm.so.40
+%%MPIDIR%%/lib/libmca_common_sm.so.40.20.0
 %%MPIDIR%%/lib/libmpi.la
 %%MPIDIR%%/lib/libmpi.so
-%%MPIDIR%%/lib/libmpi.so.12
-%%MPIDIR%%/lib/libmpi.so.12.0.7
+%%MPIDIR%%/lib/libmpi.so.40
+%%MPIDIR%%/lib/libmpi.so.40.20.3
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so
-%%MPIDIR%%/lib/libmpi_cxx.so.1
-%%MPIDIR%%/lib/libmpi_cxx.so.1.1.3
+%%MPIDIR%%/lib/libmpi_cxx.so.40
+%%MPIDIR%%/lib/libmpi_cxx.so.40.20.1
 %%MPIDIR%%/lib/libmpi_mpifh.la
 %%MPIDIR%%/lib/libmpi_mpifh.so
-%%MPIDIR%%/lib/libmpi_mpifh.so.12
-%%MPIDIR%%/lib/libmpi_mpifh.so.12.0.1
+%%MPIDIR%%/lib/libmpi_mpifh.so.40
+%%MPIDIR%%/lib/libmpi_mpifh.so.40.20.2
 %%MPIDIR%%/lib/libmpi_usempi.la
 %%MPIDIR%%/lib/libmpi_usempi.so
-%%MPIDIR%%/lib/libmpi_usempi.so.5
-%%MPIDIR%%/lib/libmpi_usempi.so.5.2.0
+%%MPIDIR%%/lib/libmpi_usempi.so.40
+%%MPIDIR%%/lib/libmpi_usempi.so.40.20.0
 %%MPIDIR%%/lib/libompitrace.la
 %%MPIDIR%%/lib/libompitrace.so
-%%MPIDIR%%/lib/libompitrace.so.0
-%%MPIDIR%%/lib/libompitrace.so.0.0.0
+%%MPIDIR%%/lib/libompitrace.so.40
+%%MPIDIR%%/lib/libompitrace.so.40.20.0
 %%MPIDIR%%/lib/libopen-pal.la
 %%MPIDIR%%/lib/libopen-pal.so
-%%MPIDIR%%/lib/libopen-pal.so.13
-%%MPIDIR%%/lib/libopen-pal.so.13.0.4
+%%MPIDIR%%/lib/libopen-pal.so.40
+%%MPIDIR%%/lib/libopen-pal.so.40.20.3
 %%MPIDIR%%/lib/libopen-rte.la
 %%MPIDIR%%/lib/libopen-rte.so
-%%MPIDIR%%/lib/libopen-rte.so.12
-%%MPIDIR%%/lib/libopen-rte.so.12.0.4
+%%MPIDIR%%/lib/libopen-rte.so.40
+%%MPIDIR%%/lib/libopen-rte.so.40.20.3
 %%MPIDIR%%/lib/mpi.mod
+%%MPIDIR%%/lib/ompi_monitoring_prof.la
+%%MPIDIR%%/lib/ompi_monitoring_prof.so
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.la
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.so
 %%MPIDIR%%/lib/openmpi/mca_allocator_basic.la
 %%MPIDIR%%/lib/openmpi/mca_allocator_basic.so
 %%MPIDIR%%/lib/openmpi/mca_allocator_bucket.la
 %%MPIDIR%%/lib/openmpi/mca_allocator_bucket.so
-%%MPIDIR%%/lib/openmpi/mca_bcol_basesmuma.la
-%%MPIDIR%%/lib/openmpi/mca_bcol_basesmuma.so
-%%MPIDIR%%/lib/openmpi/mca_bcol_ptpcoll.la
-%%MPIDIR%%/lib/openmpi/mca_bcol_ptpcoll.so
 %%MPIDIR%%/lib/openmpi/mca_bml_r2.la
 %%MPIDIR%%/lib/openmpi/mca_bml_r2.so
 %%MPIDIR%%/lib/openmpi/mca_btl_self.la
@@ -272,14 +139,12 @@
 %%MPIDIR%%/lib/openmpi/mca_btl_vader.so
 %%MPIDIR%%/lib/openmpi/mca_coll_basic.la
 %%MPIDIR%%/lib/openmpi/mca_coll_basic.so
-%%MPIDIR%%/lib/openmpi/mca_coll_hierarch.la
-%%MPIDIR%%/lib/openmpi/mca_coll_hierarch.so
 %%MPIDIR%%/lib/openmpi/mca_coll_inter.la
 %%MPIDIR%%/lib/openmpi/mca_coll_inter.so
 %%MPIDIR%%/lib/openmpi/mca_coll_libnbc.la
 %%MPIDIR%%/lib/openmpi/mca_coll_libnbc.so
-%%MPIDIR%%/lib/openmpi/mca_coll_ml.la
-%%MPIDIR%%/lib/openmpi/mca_coll_ml.so
+%%MPIDIR%%/lib/openmpi/mca_coll_monitoring.la
+%%MPIDIR%%/lib/openmpi/mca_coll_monitoring.so
 %%MPIDIR%%/lib/openmpi/mca_coll_self.la
 %%MPIDIR%%/lib/openmpi/mca_coll_self.so
 %%MPIDIR%%/lib/openmpi/mca_coll_sm.la
@@ -294,18 +159,6 @@
 %%MPIDIR%%/lib/openmpi/mca_compress_gzip.so
 %%MPIDIR%%/lib/openmpi/mca_crs_none.la
 %%MPIDIR%%/lib/openmpi/mca_crs_none.so
-%%MPIDIR%%/lib/openmpi/mca_db_hash.la
-%%MPIDIR%%/lib/openmpi/mca_db_hash.so
-%%MPIDIR%%/lib/openmpi/mca_db_print.la
-%%MPIDIR%%/lib/openmpi/mca_db_print.so
-%%MPIDIR%%/lib/openmpi/mca_dfs_app.la
-%%MPIDIR%%/lib/openmpi/mca_dfs_app.so
-%%MPIDIR%%/lib/openmpi/mca_dfs_orted.la
-%%MPIDIR%%/lib/openmpi/mca_dfs_orted.so
-%%MPIDIR%%/lib/openmpi/mca_dfs_test.la
-%%MPIDIR%%/lib/openmpi/mca_dfs_test.so
-%%MPIDIR%%/lib/openmpi/mca_dpm_orte.la
-%%MPIDIR%%/lib/openmpi/mca_dpm_orte.so
 %%MPIDIR%%/lib/openmpi/mca_errmgr_default_app.la
 %%MPIDIR%%/lib/openmpi/mca_errmgr_default_app.so
 %%MPIDIR%%/lib/openmpi/mca_errmgr_default_hnp.la
@@ -318,6 +171,8 @@
 %%MPIDIR%%/lib/openmpi/mca_ess_env.so
 %%MPIDIR%%/lib/openmpi/mca_ess_hnp.la
 %%MPIDIR%%/lib/openmpi/mca_ess_hnp.so
+%%MPIDIR%%/lib/openmpi/mca_ess_pmi.la
+%%MPIDIR%%/lib/openmpi/mca_ess_pmi.so
 %%MPIDIR%%/lib/openmpi/mca_ess_singleton.la
 %%MPIDIR%%/lib/openmpi/mca_ess_singleton.so
 %%MPIDIR%%/lib/openmpi/mca_ess_tool.la
@@ -326,64 +181,78 @@
 %%MPIDIR%%/lib/openmpi/mca_fbtl_posix.so
 %%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic.la
 %%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic.so
+%%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic_gen2.la
+%%MPIDIR%%/lib/openmpi/mca_fcoll_dynamic_gen2.so
 %%MPIDIR%%/lib/openmpi/mca_fcoll_individual.la
 %%MPIDIR%%/lib/openmpi/mca_fcoll_individual.so
-%%MPIDIR%%/lib/openmpi/mca_fcoll_static.la
-%%MPIDIR%%/lib/openmpi/mca_fcoll_static.so
 %%MPIDIR%%/lib/openmpi/mca_fcoll_two_phase.la
 %%MPIDIR%%/lib/openmpi/mca_fcoll_two_phase.so
-%%MPIDIR%%/lib/openmpi/mca_fcoll_ylib.la
-%%MPIDIR%%/lib/openmpi/mca_fcoll_ylib.so
+%%MPIDIR%%/lib/openmpi/mca_fcoll_vulcan.la
+%%MPIDIR%%/lib/openmpi/mca_fcoll_vulcan.so
 %%MPIDIR%%/lib/openmpi/mca_filem_raw.la
 %%MPIDIR%%/lib/openmpi/mca_filem_raw.so
 %%MPIDIR%%/lib/openmpi/mca_fs_ufs.la
 %%MPIDIR%%/lib/openmpi/mca_fs_ufs.so
-%%MPIDIR%%/lib/openmpi/mca_grpcomm_bad.la
-%%MPIDIR%%/lib/openmpi/mca_grpcomm_bad.so
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_direct.la
+%%MPIDIR%%/lib/openmpi/mca_grpcomm_direct.so
 %%MPIDIR%%/lib/openmpi/mca_io_ompio.la
 %%MPIDIR%%/lib/openmpi/mca_io_ompio.so
-%%MPIDIR%%/lib/openmpi/mca_io_romio.la
-%%MPIDIR%%/lib/openmpi/mca_io_romio.so
+%%MPIDIR%%/lib/openmpi/mca_io_romio321.la
+%%MPIDIR%%/lib/openmpi/mca_io_romio321.so
 %%MPIDIR%%/lib/openmpi/mca_iof_hnp.la
 %%MPIDIR%%/lib/openmpi/mca_iof_hnp.so
-%%MPIDIR%%/lib/openmpi/mca_iof_mr_hnp.la
-%%MPIDIR%%/lib/openmpi/mca_iof_mr_hnp.so
-%%MPIDIR%%/lib/openmpi/mca_iof_mr_orted.la
-%%MPIDIR%%/lib/openmpi/mca_iof_mr_orted.so
 %%MPIDIR%%/lib/openmpi/mca_iof_orted.la
 %%MPIDIR%%/lib/openmpi/mca_iof_orted.so
 %%MPIDIR%%/lib/openmpi/mca_iof_tool.la
 %%MPIDIR%%/lib/openmpi/mca_iof_tool.so
-%%MPIDIR%%/lib/openmpi/mca_mpool_grdma.la
-%%MPIDIR%%/lib/openmpi/mca_mpool_grdma.so
-%%MPIDIR%%/lib/openmpi/mca_mpool_sm.la
-%%MPIDIR%%/lib/openmpi/mca_mpool_sm.so
+%%MPIDIR%%/lib/openmpi/mca_mpool_hugepage.la
+%%MPIDIR%%/lib/openmpi/mca_mpool_hugepage.so
 %%MPIDIR%%/lib/openmpi/mca_odls_default.la
 %%MPIDIR%%/lib/openmpi/mca_odls_default.so
+%%MPIDIR%%/lib/openmpi/mca_odls_pspawn.la
+%%MPIDIR%%/lib/openmpi/mca_odls_pspawn.so
 %%MPIDIR%%/lib/openmpi/mca_oob_tcp.la
 %%MPIDIR%%/lib/openmpi/mca_oob_tcp.so
+%%MPIDIR%%/lib/openmpi/mca_osc_monitoring.la
+%%MPIDIR%%/lib/openmpi/mca_osc_monitoring.so
 %%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.la
 %%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.so
+%%MPIDIR%%/lib/openmpi/mca_osc_rdma.la
+%%MPIDIR%%/lib/openmpi/mca_osc_rdma.so
 %%MPIDIR%%/lib/openmpi/mca_osc_sm.la
 %%MPIDIR%%/lib/openmpi/mca_osc_sm.so
+%%MPIDIR%%/lib/openmpi/mca_patcher_overwrite.la
+%%MPIDIR%%/lib/openmpi/mca_patcher_overwrite.so
 %%MPIDIR%%/lib/openmpi/mca_plm_isolated.la
 %%MPIDIR%%/lib/openmpi/mca_plm_isolated.so
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.la
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.so
-%%MPIDIR%%/lib/openmpi/mca_pml_bfo.la
-%%MPIDIR%%/lib/openmpi/mca_pml_bfo.so
+%%MPIDIR%%/lib/openmpi/mca_pmix_flux.la
+%%MPIDIR%%/lib/openmpi/mca_pmix_flux.so
+%%MPIDIR%%/lib/openmpi/mca_pmix_isolated.la
+%%MPIDIR%%/lib/openmpi/mca_pmix_isolated.so
+%%MPIDIR%%/lib/openmpi/mca_pmix_pmix3x.la
+%%MPIDIR%%/lib/openmpi/mca_pmix_pmix3x.so
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.la
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.so
+%%MPIDIR%%/lib/openmpi/mca_pml_monitoring.la
+%%MPIDIR%%/lib/openmpi/mca_pml_monitoring.so
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.la
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.so
 %%MPIDIR%%/lib/openmpi/mca_pstat_test.la
 %%MPIDIR%%/lib/openmpi/mca_pstat_test.so
-%%MPIDIR%%/lib/openmpi/mca_pubsub_orte.la
-%%MPIDIR%%/lib/openmpi/mca_pubsub_orte.so
 %%MPIDIR%%/lib/openmpi/mca_ras_simulator.la
 %%MPIDIR%%/lib/openmpi/mca_ras_simulator.so
-%%MPIDIR%%/lib/openmpi/mca_rcache_vma.la
-%%MPIDIR%%/lib/openmpi/mca_rcache_vma.so
+%%MPIDIR%%/lib/openmpi/mca_rcache_grdma.la
+%%MPIDIR%%/lib/openmpi/mca_rcache_grdma.so
+%%MPIDIR%%/lib/openmpi/mca_reachable_weighted.la
+%%MPIDIR%%/lib/openmpi/mca_reachable_weighted.so
+%%MPIDIR%%/lib/openmpi/mca_regx_fwd.la
+%%MPIDIR%%/lib/openmpi/mca_regx_fwd.so
+%%MPIDIR%%/lib/openmpi/mca_regx_naive.la
+%%MPIDIR%%/lib/openmpi/mca_regx_naive.so
+%%MPIDIR%%/lib/openmpi/mca_regx_reverse.la
+%%MPIDIR%%/lib/openmpi/mca_regx_reverse.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_mindist.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_mindist.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_ppr.la
@@ -396,26 +265,22 @@
 %%MPIDIR%%/lib/openmpi/mca_rmaps_round_robin.so
 %%MPIDIR%%/lib/openmpi/mca_rmaps_seq.la
 %%MPIDIR%%/lib/openmpi/mca_rmaps_seq.so
-%%MPIDIR%%/lib/openmpi/mca_rmaps_staged.la
-%%MPIDIR%%/lib/openmpi/mca_rmaps_staged.so
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.la
 %%MPIDIR%%/lib/openmpi/mca_rml_oob.so
 %%MPIDIR%%/lib/openmpi/mca_routed_binomial.la
 %%MPIDIR%%/lib/openmpi/mca_routed_binomial.so
-%%MPIDIR%%/lib/openmpi/mca_routed_debruijn.la
-%%MPIDIR%%/lib/openmpi/mca_routed_debruijn.so
 %%MPIDIR%%/lib/openmpi/mca_routed_direct.la
 %%MPIDIR%%/lib/openmpi/mca_routed_direct.so
 %%MPIDIR%%/lib/openmpi/mca_routed_radix.la
 %%MPIDIR%%/lib/openmpi/mca_routed_radix.so
-%%MPIDIR%%/lib/openmpi/mca_sbgp_basesmsocket.la
-%%MPIDIR%%/lib/openmpi/mca_sbgp_basesmsocket.so
-%%MPIDIR%%/lib/openmpi/mca_sbgp_basesmuma.la
-%%MPIDIR%%/lib/openmpi/mca_sbgp_basesmuma.so
-%%MPIDIR%%/lib/openmpi/mca_sbgp_p2p.la
-%%MPIDIR%%/lib/openmpi/mca_sbgp_p2p.so
-%%MPIDIR%%/lib/openmpi/mca_sec_basic.la
-%%MPIDIR%%/lib/openmpi/mca_sec_basic.so
+%%MPIDIR%%/lib/openmpi/mca_rtc_hwloc.la
+%%MPIDIR%%/lib/openmpi/mca_rtc_hwloc.so
+%%MPIDIR%%/lib/openmpi/mca_schizo_flux.la
+%%MPIDIR%%/lib/openmpi/mca_schizo_flux.so
+%%MPIDIR%%/lib/openmpi/mca_schizo_ompi.la
+%%MPIDIR%%/lib/openmpi/mca_schizo_ompi.so
+%%MPIDIR%%/lib/openmpi/mca_schizo_orte.la
+%%MPIDIR%%/lib/openmpi/mca_schizo_orte.so
 %%MPIDIR%%/lib/openmpi/mca_sharedfp_individual.la
 %%MPIDIR%%/lib/openmpi/mca_sharedfp_individual.so
 %%MPIDIR%%/lib/openmpi/mca_sharedfp_lockedfile.la
@@ -430,31 +295,63 @@
 %%MPIDIR%%/lib/openmpi/mca_shmem_sysv.so
 %%MPIDIR%%/lib/openmpi/mca_state_app.la
 %%MPIDIR%%/lib/openmpi/mca_state_app.so
-%%MPIDIR%%/lib/openmpi/mca_state_dvm.la
-%%MPIDIR%%/lib/openmpi/mca_state_dvm.so
 %%MPIDIR%%/lib/openmpi/mca_state_hnp.la
 %%MPIDIR%%/lib/openmpi/mca_state_hnp.so
 %%MPIDIR%%/lib/openmpi/mca_state_novm.la
 %%MPIDIR%%/lib/openmpi/mca_state_novm.so
 %%MPIDIR%%/lib/openmpi/mca_state_orted.la
 %%MPIDIR%%/lib/openmpi/mca_state_orted.so
-%%MPIDIR%%/lib/openmpi/mca_state_staged_hnp.la
-%%MPIDIR%%/lib/openmpi/mca_state_staged_hnp.so
-%%MPIDIR%%/lib/openmpi/mca_state_staged_orted.la
-%%MPIDIR%%/lib/openmpi/mca_state_staged_orted.so
 %%MPIDIR%%/lib/openmpi/mca_state_tool.la
 %%MPIDIR%%/lib/openmpi/mca_state_tool.so
 %%MPIDIR%%/lib/openmpi/mca_topo_basic.la
 %%MPIDIR%%/lib/openmpi/mca_topo_basic.so
+%%MPIDIR%%/lib/openmpi/mca_topo_treematch.la
+%%MPIDIR%%/lib/openmpi/mca_topo_treematch.so
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.la
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.so
-%%MPIDIR%%/lib/pkgconfig/ompi-c.pc
-%%MPIDIR%%/lib/pkgconfig/ompi-cxx.pc
-%%MPIDIR%%/lib/pkgconfig/ompi-f77.pc
-%%MPIDIR%%/lib/pkgconfig/ompi-f90.pc
-%%MPIDIR%%/lib/pkgconfig/ompi-fort.pc
-%%MPIDIR%%/lib/pkgconfig/ompi.pc
-%%MPIDIR%%/lib/pkgconfig/orte.pc
+%%MPIDIR%%/lib/pmix/mca_bfrops_v12.la
+%%MPIDIR%%/lib/pmix/mca_bfrops_v12.so
+%%MPIDIR%%/lib/pmix/mca_bfrops_v20.la
+%%MPIDIR%%/lib/pmix/mca_bfrops_v20.so
+%%MPIDIR%%/lib/pmix/mca_bfrops_v21.la
+%%MPIDIR%%/lib/pmix/mca_bfrops_v21.so
+%%MPIDIR%%/lib/pmix/mca_bfrops_v3.la
+%%MPIDIR%%/lib/pmix/mca_bfrops_v3.so
+%%MPIDIR%%/lib/pmix/mca_gds_hash.la
+%%MPIDIR%%/lib/pmix/mca_gds_hash.so
+%%MPIDIR%%/lib/pmix/mca_plog_default.la
+%%MPIDIR%%/lib/pmix/mca_plog_default.so
+%%MPIDIR%%/lib/pmix/mca_plog_stdfd.la
+%%MPIDIR%%/lib/pmix/mca_plog_stdfd.so
+%%MPIDIR%%/lib/pmix/mca_plog_syslog.la
+%%MPIDIR%%/lib/pmix/mca_plog_syslog.so
+%%MPIDIR%%/lib/pmix/mca_pnet_tcp.la
+%%MPIDIR%%/lib/pmix/mca_pnet_tcp.so
+%%MPIDIR%%/lib/pmix/mca_pnet_test.la
+%%MPIDIR%%/lib/pmix/mca_pnet_test.so
+%%MPIDIR%%/lib/pmix/mca_preg_native.la
+%%MPIDIR%%/lib/pmix/mca_preg_native.so
+%%MPIDIR%%/lib/pmix/mca_psec_native.la
+%%MPIDIR%%/lib/pmix/mca_psec_native.so
+%%MPIDIR%%/lib/pmix/mca_psec_none.la
+%%MPIDIR%%/lib/pmix/mca_psec_none.so
+%%MPIDIR%%/lib/pmix/mca_psensor_file.la
+%%MPIDIR%%/lib/pmix/mca_psensor_file.so
+%%MPIDIR%%/lib/pmix/mca_psensor_heartbeat.la
+%%MPIDIR%%/lib/pmix/mca_psensor_heartbeat.so
+%%MPIDIR%%/lib/pmix/mca_pshmem_mmap.la
+%%MPIDIR%%/lib/pmix/mca_pshmem_mmap.so
+%%MPIDIR%%/lib/pmix/mca_ptl_tcp.la
+%%MPIDIR%%/lib/pmix/mca_ptl_tcp.so
+%%MPIDIR%%/lib/pmix/mca_ptl_usock.la
+%%MPIDIR%%/lib/pmix/mca_ptl_usock.so
+%%MPIDIR%%/libdata/pkgconfig/ompi-c.pc
+%%MPIDIR%%/libdata/pkgconfig/ompi-cxx.pc
+%%MPIDIR%%/libdata/pkgconfig/ompi-f77.pc
+%%MPIDIR%%/libdata/pkgconfig/ompi-f90.pc
+%%MPIDIR%%/libdata/pkgconfig/ompi-fort.pc
+%%MPIDIR%%/libdata/pkgconfig/ompi.pc
+%%MPIDIR%%/libdata/pkgconfig/orte.pc
 %%MPIDIR%%/man/man1/mpiCC.1.gz
 %%MPIDIR%%/man/man1/mpic++.1.gz
 %%MPIDIR%%/man/man1/mpicc.1.gz
@@ -465,21 +362,38 @@
 %%MPIDIR%%/man/man1/mpifort.1.gz
 %%MPIDIR%%/man/man1/mpirun.1.gz
 %%MPIDIR%%/man/man1/ompi-clean.1.gz
-%%MPIDIR%%/man/man1/ompi-ps.1.gz
 %%MPIDIR%%/man/man1/ompi-server.1.gz
-%%MPIDIR%%/man/man1/ompi-top.1.gz
 %%MPIDIR%%/man/man1/ompi_info.1.gz
 %%MPIDIR%%/man/man1/opal_wrapper.1.gz
 %%MPIDIR%%/man/man1/orte-clean.1.gz
-%%MPIDIR%%/man/man1/orte-dvm.1.gz
 %%MPIDIR%%/man/man1/orte-info.1.gz
-%%MPIDIR%%/man/man1/orte-ps.1.gz
 %%MPIDIR%%/man/man1/orte-server.1.gz
-%%MPIDIR%%/man/man1/orte-submit.1.gz
-%%MPIDIR%%/man/man1/orte-top.1.gz
 %%MPIDIR%%/man/man1/orted.1.gz
 %%MPIDIR%%/man/man1/orterun.1.gz
 %%MPIDIR%%/man/man3/MPI.3.gz
+%%MPIDIR%%/man/man3/MPIX_Allgather_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Allgatherv_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Allreduce_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Alltoall_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Alltoallv_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Alltoallw_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Barrier_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Bcast_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Exscan_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Gather_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Gatherv_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Neighbor_allgather_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Neighbor_allgatherv_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Neighbor_alltoall_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Neighbor_alltoallv_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Neighbor_alltoallw_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Query_cuda_support.3.gz
+%%MPIDIR%%/man/man3/MPIX_Reduce_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Reduce_scatter_block_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Reduce_scatter_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Scan_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Scatter_init.3.gz
+%%MPIDIR%%/man/man3/MPIX_Scatterv_init.3.gz
 %%MPIDIR%%/man/man3/MPI_Abort.3.gz
 %%MPIDIR%%/man/man3/MPI_Accumulate.3.gz
 %%MPIDIR%%/man/man3/MPI_Add_error_class.3.gz
@@ -583,10 +497,14 @@
 %%MPIDIR%%/man/man3/MPI_File_get_type_extent.3.gz
 %%MPIDIR%%/man/man3/MPI_File_get_view.3.gz
 %%MPIDIR%%/man/man3/MPI_File_iread.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iread_all.3.gz
 %%MPIDIR%%/man/man3/MPI_File_iread_at.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iread_at_all.3.gz
 %%MPIDIR%%/man/man3/MPI_File_iread_shared.3.gz
 %%MPIDIR%%/man/man3/MPI_File_iwrite.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iwrite_all.3.gz
 %%MPIDIR%%/man/man3/MPI_File_iwrite_at.3.gz
+%%MPIDIR%%/man/man3/MPI_File_iwrite_at_all.3.gz
 %%MPIDIR%%/man/man3/MPI_File_iwrite_shared.3.gz
 %%MPIDIR%%/man/man3/MPI_File_open.3.gz
 %%MPIDIR%%/man/man3/MPI_File_preallocate.3.gz
@@ -709,6 +627,8 @@
 %%MPIDIR%%/man/man3/MPI_Keyval_create.3.gz
 %%MPIDIR%%/man/man3/MPI_Keyval_free.3.gz
 %%MPIDIR%%/man/man3/MPI_Lookup_name.3.gz
+%%MPIDIR%%/man/man3/MPI_Message_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_Message_f2c.3.gz
 %%MPIDIR%%/man/man3/MPI_Mprobe.3.gz
 %%MPIDIR%%/man/man3/MPI_Mrecv.3.gz
 %%MPIDIR%%/man/man3/MPI_Neighbor_allgather.3.gz
@@ -717,6 +637,7 @@
 %%MPIDIR%%/man/man3/MPI_Neighbor_alltoallv.3.gz
 %%MPIDIR%%/man/man3/MPI_Neighbor_alltoallw.3.gz
 %%MPIDIR%%/man/man3/MPI_Op_c2f.3.gz
+%%MPIDIR%%/man/man3/MPI_Op_commutative.3.gz
 %%MPIDIR%%/man/man3/MPI_Op_create.3.gz
 %%MPIDIR%%/man/man3/MPI_Op_f2c.3.gz
 %%MPIDIR%%/man/man3/MPI_Op_free.3.gz
@@ -887,6 +808,7 @@
 %%MPIDIR%%/man/man3/MPI_Win_wait.3.gz
 %%MPIDIR%%/man/man3/MPI_Wtick.3.gz
 %%MPIDIR%%/man/man3/MPI_Wtime.3.gz
+%%MPIDIR%%/man/man3/OMPI_Affinity_str.3.gz
 %%MPIDIR%%/man/man3/OpenMPI.3.gz
 %%MPIDIR%%/man/man7/ompi_crcp.7.gz
 %%MPIDIR%%/man/man7/opal_crs.7.gz
@@ -898,38 +820,26 @@
 %%MPIDIR%%/%%DATADIR%%/help-btl-vader.txt
 %%MPIDIR%%/%%DATADIR%%/help-coll-sync.txt
 %%MPIDIR%%/%%DATADIR%%/help-dash-host.txt
-%%MPIDIR%%/%%DATADIR%%/help-db-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-errmgr-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-ess-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-ess-hnp.txt
 %%MPIDIR%%/%%DATADIR%%/help-hostfile.txt
 %%MPIDIR%%/%%DATADIR%%/help-mca-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-mca-bml-r2.txt
 %%MPIDIR%%/%%DATADIR%%/help-mca-coll-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-mca-op-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-mca-hook-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-mca-var.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-api.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-btl-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-btl-sm.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-btl-tcp.txt
-%%MPIDIR%%/%%DATADIR%%/help-mpi-coll-ml.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-coll-sm.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-common-sm.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-errors.txt
-%%MPIDIR%%/%%DATADIR%%/help-mpi-pml-bfo.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-pml-ob1.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpi-runtime.txt
 %%MPIDIR%%/%%DATADIR%%/help-mpool-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-ompi-crcp-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-ompi-dpm-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-ompi-dpm-orte.txt
-%%MPIDIR%%/%%DATADIR%%/help-ompi-pubsub-orte.txt
 %%MPIDIR%%/%%DATADIR%%/help-oob-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-oob-tcp.txt
-%%MPIDIR%%/%%DATADIR%%/help-opal-compress-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-opal-compress-bzip.txt
-%%MPIDIR%%/%%DATADIR%%/help-opal-compress-gzip.txt
-%%MPIDIR%%/%%DATADIR%%/help-opal-crs-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-opal-crs-none.txt
 %%MPIDIR%%/%%DATADIR%%/help-opal-hwloc-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-opal-runtime.txt
@@ -940,34 +850,35 @@
 %%MPIDIR%%/%%DATADIR%%/help-opal-wrapper.txt
 %%MPIDIR%%/%%DATADIR%%/help-opal_info.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-clean.txt
-%%MPIDIR%%/%%DATADIR%%/help-orte-filem-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-filem-raw.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-info.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-odls-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-odls-default.txt
-%%MPIDIR%%/%%DATADIR%%/help-orte-ps.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-odls-pspawn.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-md.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-ppr.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-resilient.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-rr.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-rmaps-seq.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-rtc-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-orte-rtc-hwloc.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-runtime.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-server.txt
 %%MPIDIR%%/%%DATADIR%%/help-orte-snapc-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-orte-sstore-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-orte-top.txt
 %%MPIDIR%%/%%DATADIR%%/help-orted.txt
 %%MPIDIR%%/%%DATADIR%%/help-orterun.txt
+%%MPIDIR%%/%%DATADIR%%/help-osc-pt2pt.txt
 %%MPIDIR%%/%%DATADIR%%/help-plm-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-plm-rsh.txt
+%%MPIDIR%%/%%DATADIR%%/help-pmix-base.txt
+%%MPIDIR%%/%%DATADIR%%/help-pmix-pmix3x.txt
 %%MPIDIR%%/%%DATADIR%%/help-ras-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-ras-simulator.txt
+%%MPIDIR%%/%%DATADIR%%/help-rcache-base.txt
 %%MPIDIR%%/%%DATADIR%%/help-regex.txt
 %%MPIDIR%%/%%DATADIR%%/help-rmaps_rank_file.txt
-%%MPIDIR%%/%%DATADIR%%/help-sec-base.txt
-%%MPIDIR%%/%%DATADIR%%/help-state-staged-hnp.txt
-%%MPIDIR%%/%%DATADIR%%/mca-coll-ml.config
+%%MPIDIR%%/%%DATADIR%%/help-state-base.txt
 %%MPIDIR%%/%%DATADIR%%/mpiCC-wrapper-data.txt
 %%MPIDIR%%/%%DATADIR%%/mpic++-wrapper-data.txt
 %%MPIDIR%%/%%DATADIR%%/mpicc-wrapper-data.txt
@@ -977,3 +888,11 @@
 %%MPIDIR%%/%%DATADIR%%/mpifort-wrapper-data.txt
 %%MPIDIR%%/%%DATADIR%%/openmpi-valgrind.supp
 %%MPIDIR%%/%%DATADIR%%/ortecc-wrapper-data.txt
+%%MPIDIR%%/share/pmix/help-pmix-mca-base.txt
+%%MPIDIR%%/share/pmix/help-pmix-mca-var.txt
+%%MPIDIR%%/share/pmix/help-pmix-plog.txt
+%%MPIDIR%%/share/pmix/help-pmix-psensor-file.txt
+%%MPIDIR%%/share/pmix/help-pmix-psensor-heartbeat.txt
+%%MPIDIR%%/share/pmix/help-pmix-runtime.txt
+%%MPIDIR%%/share/pmix/help-pmix-server.txt
+%%MPIDIR%%/share/pmix/pmix-valgrind.supp