Merge pull request #7026 from ggouaillardet/topic/openpmix_refresh

pmix/pmix4x: refresh to the latest open PMIx master

Author: ggouaillardet

.gitignore

@@ -373,51 +373,51 @@ opal/mca/hwloc/base/static-components.h.new.struct
 
 opal/mca/installdirs/config/install_dirs.h
 
-!opal/mca/pmix/pmix*/pmix/AUTHORS
-!opal/mca/pmix/pmix*/pmix/contrib/perf_tools/Makefile
-opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h
-opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h.in
-opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in
-opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h
-opal/mca/pmix/pmix*/pmix/src/include/frameworks.h
-opal/mca/pmix/pmix*/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h
-opal/mca/pmix/pmix*/pmix/config/autogen_found_items.m4
-opal/mca/pmix/pmix*/pmix/config/mca_library_paths.txt
-opal/mca/pmix/pmix*/pmix/config/test-driver
-opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h
-opal/mca/pmix/pmix*/pmix/src/include/pmix_config.h.in
-opal/mca/pmix/pmix*/pmix/include/pmix_common.h
-opal/mca/pmix/pmix*/pmix/include/pmix_rename.h
-opal/mca/pmix/pmix*/pmix/include/pmix_version.h
-opal/mca/pmix/pmix*/pmix/src/util/keyval/keyval_lex.c
-opal/mca/pmix/pmix*/pmix/src/util/show_help_lex.c
-opal/mca/pmix/pmix*/pmix/examples/alloc
-opal/mca/pmix/pmix*/pmix/examples/client
-opal/mca/pmix/pmix*/pmix/examples/debugger
-opal/mca/pmix/pmix*/pmix/examples/debuggerd
-opal/mca/pmix/pmix*/pmix/examples/dmodex
-opal/mca/pmix/pmix*/pmix/examples/dynamic
-opal/mca/pmix/pmix*/pmix/examples/fault
-opal/mca/pmix/pmix*/pmix/examples/jctrl
-opal/mca/pmix/pmix*/pmix/examples/pub
-opal/mca/pmix/pmix*/pmix/examples/server
-opal/mca/pmix/pmix*/pmix/examples/tool
-opal/mca/pmix/pmix*/pmix/test/run_tests00.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests01.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests02.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests03.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests04.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests05.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests06.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests07.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests08.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests09.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests10.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests11.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests12.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests13.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests14.pl
-opal/mca/pmix/pmix*/pmix/test/run_tests15.pl
+!opal/mca/pmix/pmix*/openpmix/AUTHORS
+!opal/mca/pmix/pmix*/openpmix/contrib/perf_tools/Makefile
+opal/mca/pmix/pmix*/openpmix/include/pmix/autogen/config.h
+opal/mca/pmix/pmix*/openpmix/include/pmix/autogen/config.h.in
+opal/mca/pmix/pmix*/openpmix/src/include/private/autogen/config.h.in
+opal/mca/pmix/pmix*/openpmix/src/include/private/autogen/config.h
+opal/mca/pmix/pmix*/openpmix/src/include/frameworks.h
+opal/mca/pmix/pmix*/openpmix/src/mca/pinstalldirs/config/pinstall_dirs.h
+opal/mca/pmix/pmix*/openpmix/config/autogen_found_items.m4
+opal/mca/pmix/pmix*/openpmix/config/mca_library_paths.txt
+opal/mca/pmix/pmix*/openpmix/config/test-driver
+opal/mca/pmix/pmix*/openpmix/src/include/pmix_config.h
+opal/mca/pmix/pmix*/openpmix/src/include/pmix_config.h.in
+opal/mca/pmix/pmix*/openpmix/include/pmix_common.h
+opal/mca/pmix/pmix*/openpmix/include/pmix_rename.h
+opal/mca/pmix/pmix*/openpmix/include/pmix_version.h
+opal/mca/pmix/pmix*/openpmix/src/util/keyval/keyval_lex.c
+opal/mca/pmix/pmix*/openpmix/src/util/show_help_lex.c
+opal/mca/pmix/pmix*/openpmix/examples/alloc
+opal/mca/pmix/pmix*/openpmix/examples/client
+opal/mca/pmix/pmix*/openpmix/examples/debugger
+opal/mca/pmix/pmix*/openpmix/examples/debuggerd
+opal/mca/pmix/pmix*/openpmix/examples/dmodex
+opal/mca/pmix/pmix*/openpmix/examples/dynamic
+opal/mca/pmix/pmix*/openpmix/examples/fault
+opal/mca/pmix/pmix*/openpmix/examples/jctrl
+opal/mca/pmix/pmix*/openpmix/examples/pub
+opal/mca/pmix/pmix*/openpmix/examples/server
+opal/mca/pmix/pmix*/openpmix/examples/tool
+opal/mca/pmix/pmix*/openpmix/test/run_tests00.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests01.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests02.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests03.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests04.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests05.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests06.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests07.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests08.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests09.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests10.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests11.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests12.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests13.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests14.pl
+opal/mca/pmix/pmix*/openpmix/test/run_tests15.pl
 
 
 opal/mca/pmix/ext4x/ext4x.c

opal/mca/pmix/pmix4x/Makefile.am

@@ -15,7 +15,7 @@ EXTRA_DIST = autogen.subdirs
 
 dist_opaldata_DATA = help-pmix-pmix4x.txt
 
-SUBDIRS = pmix
+SUBDIRS = openpmix
 
 sources = \
         pmix4x.h \
@@ -43,7 +43,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
 mca_pmix_pmix4x_la_SOURCES = $(sources)
 mca_pmix_pmix4x_la_CFLAGS = $(opal_pmix_pmix4x_CFLAGS)
 mca_pmix_pmix4x_la_CPPFLAGS = \
-        -I$(srcdir)/pmix/include $(opal_pmix_pmix4x_CPPFLAGS)
+        -I$(srcdir)/openpmix/include $(opal_pmix_pmix4x_CPPFLAGS)
 mca_pmix_pmix4x_la_LDFLAGS = -module -avoid-version $(opal_pmix_pmix4x_LDFLAGS)
 mca_pmix_pmix4x_la_LIBADD = $(top_builddir)/opal/lib@[email protected] \
 	$(opal_pmix_pmix4x_LIBS)

opal/mca/pmix/pmix4x/autogen.subdirs

@@ -1 +1 @@
-pmix
+openpmix

opal/mca/pmix/pmix4x/configure.m4

@@ -59,7 +59,7 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
           [opal_pmix_pmix4x_args="--with-devel-headers  $opal_pmix_pmix4x_args"])
     CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include -I$OPAL_TOP_BUILDDIR/opal/include $CPPFLAGS"
 
-    OPAL_CONFIG_SUBDIR([$opal_pmix_pmix4x_basedir/pmix],
+    OPAL_CONFIG_SUBDIR([$opal_pmix_pmix4x_basedir/openpmix],
                        [$opal_pmix_pmix4x_args $opal_subdir_args 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'],
                        [opal_pmix_pmix4x_happy=1], [opal_pmix_pmix4x_happy=0])
 
@@ -83,9 +83,9 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
                   AC_MSG_ERROR([CANNOT CONTINUE])])
            # Build flags for our Makefile.am
            opal_pmix_pmix4x_LDFLAGS=
-           opal_pmix_pmix4x_LIBS="$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/pmix/src/libpmix.la"
-           opal_pmix_pmix4x_CPPFLAGS="-I$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/pmix/include -I$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/pmix -I$OPAL_TOP_SRCDIR/$opal_pmix_pmix4x_basedir/pmix/include -I$OPAL_TOP_SRCDIR/$opal_pmix_pmix4x_basedir/pmix"
-           opal_pmix_pmix4x_DEPENDENCIES="$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/pmix/src/libpmix.la"])
+           opal_pmix_pmix4x_LIBS="$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/openpmix/src/libpmix.la"
+           opal_pmix_pmix4x_CPPFLAGS="-I$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/openpmix/include -I$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/openpmix -I$OPAL_TOP_SRCDIR/$opal_pmix_pmix4x_basedir/openpmix/include -I$OPAL_TOP_SRCDIR/$opal_pmix_pmix4x_basedir/openpmix"
+           opal_pmix_pmix4x_DEPENDENCIES="$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/openpmix/src/libpmix.la"])
 
    AC_SUBST([opal_pmix_pmix4x_LIBS])
    AC_SUBST([opal_pmix_pmix4x_CPPFLAGS])
@@ -94,7 +94,7 @@ AC_DEFUN([MCA_opal_pmix_pmix4x_CONFIG],[
 
    # Finally, add some flags to the wrapper compiler so that our
    # headers can be found.
-   pmix_pmix4x_status_filename="$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/pmix/config.status"
+   pmix_pmix4x_status_filename="$OPAL_TOP_BUILDDIR/$opal_pmix_pmix4x_basedir/openpmix/config.status"
    pmix_pmix4x_WRAPPER_EXTRA_CPPFLAGS=`egrep PMIX_EMBEDDED_CPPFLAGS $pmix_pmix4x_status_filename | cut -d\" -f4`
    pmix_pmix4x_WRAPPER_EXTRA_LDFLAGS=`egrep PMIX_EMBEDDED_LDFLAGS $pmix_pmix4x_status_filename | cut -d\" -f4`
    pmix_pmix4x_WRAPPER_EXTRA_LIBS=`egrep PMIX_EMBEDDED_LIBS $pmix_pmix4x_status_filename | cut -d\" -f4`

opal/mca/pmix/pmix4x/pmix/AUTHORS renamed to opal/mca/pmix/pmix4x/openpmix/AUTHORS

@@ -11,7 +11,7 @@
 #                         All rights reserved.
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved.
-# Copyright (c) 2013-2018 Intel, Inc.  All rights reserved.
+# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2019      Amazon.com, Inc. or its affiliates.  All Rights
 #                         reserved.
 # $COPYRIGHT$
@@ -32,7 +32,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --disable-dlopen
 headers =
 sources =
 nodist_headers =
-EXTRA_DIST = AUTHORS README HACKING INSTALL VERSION LICENSE autogen.pl
+EXTRA_DIST = AUTHORS README HACKING INSTALL VERSION LICENSE autogen.pl Makefile.pmix-rules
 
 # Only install the valgrind suppressions file and man pages
 # if we're building in standalone mode

opal/mca/pmix/pmix4x/pmix/HACKING renamed to opal/mca/pmix/pmix4x/openpmix/HACKING

@@ -0,0 +1,37 @@
+# -*- makefile -*-
+# Copyright (c) 2008-2018 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2019      Intel, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+TRIM_OPTIONS=
+
+.1in.1:
+	$(PMIX_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
+	  --package-name='@PACKAGE_NAME@' \
+	  --package-version='@PACKAGE_VERSION@' \
+	  --pmix-date='@PMIX_RELEASE_DATE@' \
+	  --input=$< \
+	  --output=$@
+
+.3in.3:
+	$(PMIX_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
+	  --package-name='@PACKAGE_NAME@' \
+	  --package-version='@PACKAGE_VERSION@' \
+	  --pmix-date='@PMIX_RELEASE_DATE@' \
+	  $(TRIM_OPTIONS) \
+	  --input=$< \
+	  --output=$@
+
+.7in.7:
+	$(PMIX_V_GEN) $(top_srcdir)/contrib/make_manpage.pl \
+	  --package-name='@PACKAGE_NAME@' \
+	  --package-version='@PACKAGE_VERSION@' \
+	  --pmix-date='@PMIX_RELEASE_DATE@' \
+	  --input=$< \
+	  --output=$@