Merge pull request #6751 from ggouaillardet/topic/pmix_refresh

pmix/pmix4x: refresh to the latest PMIx master

Author: ggouaillardet

opal/mca/pmix/pmix4x/pmix/VERSION

@@ -30,7 +30,7 @@ greek=a1
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=gitbde4a8a5
+repo_rev=git186dca19
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Apr 23, 2019"
+date="Jun 10, 2019"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix4x/pmix/bindings/python/Makefile.am

@@ -21,7 +21,7 @@
 # $HEADER$
 #
 
-helpers = setup.py client.py server.py pmix.pyx
+helpers = setup.py pmix.pyx
 
 if WANT_PYTHON_BINDINGS
 

opal/mca/pmix/pmix4x/pmix/bindings/python/client.py.in

@@ -0,0 +1,33 @@
+@PMIX_PYTHON_PATH@
+
+from pmix import *
+
+def main():
+    foo = PMIxClient()
+    print("Testing PMIx ", foo.get_version())
+    info = {PMIX_PROGRAMMING_MODEL: ('TEST', PMIX_STRING), PMIX_MODEL_LIBRARY_NAME: ("PMIX", PMIX_STRING)}
+    my_result = foo.init(info)
+    print("Init result ", my_result)
+    if 0 != my_result:
+        print("FAILED TO INIT")
+        exit(1)
+    # try putting something
+    print("PUT")
+    rc = foo.put(PMIX_GLOBAL, "mykey", (1, PMIX_INT32))
+    print("Put result ", rc);
+    # commit it
+    print("COMMIT")
+    rc = foo.commit()
+    print ("Commit result ", rc)
+    # execute fence
+    print("FENCE")
+    procs = []
+    info = {}
+    rc = foo.fence(procs, info)
+    print("Fence result ", rc)
+    # finalize
+    info = {}
+    foo.finalize(info)
+    print("Client finalize complete")
+if __name__ == '__main__':
+    main()

opal/mca/pmix/pmix4x/pmix/bindings/python/server.py.in

@@ -0,0 +1,107 @@
+@PMIX_PYTHON_PATH@
+
+from pmix import *
+import signal, time
+import os
+import select
+import subprocess
+
+global killer
+
+class GracefulKiller:
+  kill_now = False
+  def __init__(self):
+    signal.signal(signal.SIGINT, self.exit_gracefully)
+    signal.signal(signal.SIGTERM, self.exit_gracefully)
+
+  def exit_gracefully(self,signum, frame):
+    self.kill_now = True
+
+def clientconnected(proc:tuple is not None):
+    print("CLIENT CONNECTED", proc)
+    return PMIX_SUCCESS
+
+def clientfinalized(proc:tuple is not None):
+    print("CLIENT FINALIZED", proc)
+    return PMIX_SUCCESS
+
+def clientfence(args:dict is not None):
+    print("SERVER FENCE", args)
+    return PMIX_SUCCESS
+
+def main():
+    try:
+        foo = PMIxServer()
+    except:
+        print("FAILED TO CREATE SERVER")
+        exit(1)
+    print("Testing server version ", foo.get_version())
+    args = {'FOOBAR': ('VAR', PMIX_STRING), 'BLAST': (7, PMIX_INT32)}
+    map = {'clientconnected': clientconnected,
+           'clientfinalized': clientfinalized,
+           'fencenb': clientfence}
+    my_result = foo.init(args, map)
+    print("Testing PMIx_Initialized")
+    rc = foo.initialized()
+    print("Initialized: ", rc)
+    vers = foo.get_version()
+    print("Version: ", vers)
+    # get our environment as a base
+    env = os.environ.copy()
+    # register an nspace for the client app
+    darray = (PMIX_SIZE, [1, 2, 3, 4, 5])
+    kvals = {'testkey': (darray, PMIX_DATA_ARRAY)}
+    print("REGISTERING NSPACE")
+    rc = foo.register_nspace("testnspace", 1, kvals)
+    print("RegNspace ", rc)
+    # register a client
+    uid = os.getuid()
+    gid = os.getgid()
+    rc = foo.register_client(("testnspace", 0), uid, gid)
+    print("RegClient ", rc)
+    # setup the fork
+    rc = foo.setup_fork(("testnspace", 0), env)
+    print("SetupFrk", rc)
+    # setup the client argv
+    args = ["./client.py"]
+    # open a subprocess with stdout and stderr
+    # as distinct pipes so we can capture their
+    # output as the process runs
+    p = subprocess.Popen(args, env=env,
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    # define storage to catch the output
+    stdout = []
+    stderr = []
+    # loop until the pipes close
+    while True:
+        reads = [p.stdout.fileno(), p.stderr.fileno()]
+        ret = select.select(reads, [], [])
+
+        stdout_done = True
+        stderr_done = True
+
+        for fd in ret[0]:
+            # if the data
+            if fd == p.stdout.fileno():
+                read = p.stdout.readline()
+                if read:
+                    read = read.decode('utf-8').rstrip()
+                    print('stdout: ' + read)
+                    stdout_done = False
+            elif fd == p.stderr.fileno():
+                read = p.stderr.readline()
+                if read:
+                    read = read.decode('utf-8').rstrip()
+                    print('stderr: ' + read)
+                    stderr_done = False
+
+        if stdout_done and stderr_done:
+            break
+
+    print("FINALIZING")
+    foo.finalize()
+
+if __name__ == '__main__':
+    global killer
+    killer = GracefulKiller()
+    main()

opal/mca/pmix/pmix4x/pmix/config/pmix.m4

@@ -418,7 +418,8 @@ AC_DEFUN([PMIX_SETUP_CORE],[
                       ioLib.h sockLib.h hostLib.h limits.h \
                       sys/fcntl.h sys/statfs.h sys/statvfs.h \
                       netdb.h ucred.h zlib.h sys/auxv.h \
-                      sys/sysctl.h])
+                      sys/sysctl.h termio.h termios.h pty.h \
+                      libutil.h util.h grp.h sys/cdefs.h utmp.h stropts.h])
 
     AC_CHECK_HEADERS([sys/mount.h], [], [],
                      [AC_INCLUDES_DEFAULT
@@ -663,7 +664,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[
     # -lrt might be needed for clock_gettime
     PMIX_SEARCH_LIBS_CORE([clock_gettime], [rt])
 
-    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep statfs statvfs getpeereid getpeerucred strnlen posix_fallocate tcgetpgrp])
+    AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf strsignal socketpair strncpy_s usleep statfs statvfs getpeereid getpeerucred strnlen posix_fallocate tcgetpgrp setpgid ptsname openpty])
 
     # On some hosts, htonl is a define, so the AC_CHECK_FUNC will get
     # confused.  On others, it's in the standard library, but stubbed with
@@ -909,6 +910,10 @@ AC_DEFUN([PMIX_SETUP_CORE],[
         pmix_config_prefix[src/tools/pps/Makefile]
         pmix_config_prefix[src/tools/pattrs/Makefile]
         )
+    if test "$WANT_PYTHON_BINDINGS" = "1"; then
+        AC_CONFIG_FILES(pmix_config_prefix[bindings/python/server.py], [chmod +x bindings/python/server.py])
+        AC_CONFIG_FILES(pmix_config_prefix[bindings/python/client.py], [chmod +x bindings/python/client.py])
+    fi
 
     # publish any embedded flags so external wrappers can use them
     AC_SUBST(PMIX_EMBEDDED_LIBS)
@@ -1215,6 +1220,7 @@ if test "$WANT_PYTHON_BINDINGS" = "1"; then
     fi
     python_version=`python --version 2>&1`
     PMIX_SUMMARY_ADD([[Bindings]],[[Python]], [pmix_python], [yes ($python_version)])
+    AC_SUBST([PMIX_PYTHON_PATH], [#!"$PYTHON"], "Full Python executable path")
 
     AC_MSG_CHECKING([if Cython package installed])
     have_cython=`$srcdir/config/pmix_check_cython.py 2> /dev/null`
@@ -1251,6 +1257,40 @@ fi
 AS_IF([test -z "$enable_nonglobal_dlopen" && test "x$pmix_mode" = "xembedded" && test $WANT_INSTALL_HEADERS -eq 0 && test $pmix_need_libpmix -eq 1],
       [pmix_need_libpmix=0])
 
+#
+# Do we want PTY support?
+#
+
+AC_MSG_CHECKING([if want pty support])
+AC_ARG_ENABLE(pty-support,
+    AC_HELP_STRING([--enable-pty-support],
+                   [Enable/disable PTY support for STDIO forwarding.  (default: enabled)]))
+if test "$enable_pty_support" = "no" ; then
+    AC_MSG_RESULT([no])
+    PMIX_ENABLE_PTY_SUPPORT=0
+else
+    AC_MSG_RESULT([yes])
+    PMIX_ENABLE_PTY_SUPPORT=1
+fi
+AC_DEFINE_UNQUOTED([PMIX_ENABLE_PTY_SUPPORT], [$PMIX_ENABLE_PTY_SUPPORT],
+                   [Whether user wants PTY support or not])
+
+#
+# psec/dummy_handshake
+#
+
+AC_MSG_CHECKING([if want build psec/dummy_handshake])
+AC_ARG_ENABLE(dummy-handshake,
+              AC_HELP_STRING([--enable-dummy-handshake],
+                             [Enables psec dummy component intended to check the PTL handshake scenario (default: disabled)]))
+if test "$enable_dummy_handshake" != "yes"; then
+    AC_MSG_RESULT([no])
+    eval "DISABLE_psec_dummy_handshake=1"
+else
+    AC_MSG_RESULT([yes])
+    eval "DISABLE_psec_dummy_handshake=0"
+fi
+AM_CONDITIONAL(MCA_BUILD_PSEC_DUMMY_HANDSHAKE, test "$DISABLE_psec_dummy_handshake" = "0")
 ])dnl
 
 # This must be a standalone routine so that it can be called both by

opal/mca/pmix/pmix4x/pmix/config/pmix_check_psm2.m4

@@ -19,7 +19,7 @@
 # Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
-# Copyright (c) 2014-2018 Intel, Inc.  All rights reserved.
+# Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # Copyright (c) 2016-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
@@ -51,6 +51,11 @@ AC_CONFIG_AUX_DIR(./config)
 # -I in ACLOCAL_AMFLAGS in the top-level Makefile.am.
 AC_CONFIG_MACRO_DIR(./config)
 
+# autotools expects to perform tests without interference
+# from user-provided CFLAGS, so preserve them here
+PMIX_CFLAGS_user=$CFLAGS
+CFLAGS=
+
 PMIX_CAPTURE_CONFIGURE_CLI([PMIX_CONFIGURE_CLI])
 
 # Get our platform support file.  This has to be done very, very early
@@ -205,7 +210,17 @@ AS_IF([test -z "$CC_FOR_BUILD"],[
     AC_SUBST([CC_FOR_BUILD], [$CC])
 ])
 
+# restore any user-provided flags
+AS_IF([test ! -z "$PMIX_CFLAGS_user"], [CFLAGS="$CFLAGS $PMIX_CFLAGS_user"])
+
+# Delay setting pickyness until here so we
+# don't break configure code tests
+#if test "$WANT_PICKY_COMPILER" = "1"; then
+#    CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+#fi
+
 # Cleanup duplicate flags
+PMIX_FLAGS_UNIQ(CFLAGS)
 PMIX_FLAGS_UNIQ(CPPFLAGS)
 PMIX_FLAGS_UNIQ(LDFLAGS)
 PMIX_FLAGS_UNIQ(LIBS)
@@ -232,6 +247,17 @@ AC_MSG_RESULT([$LDFLAGS])
 AC_MSG_CHECKING([final LIBS])
 AC_MSG_RESULT([$LIBS])
 
+####################################################################
+# -Werror for CI scripts
+####################################################################
+
+AC_ARG_ENABLE(werror,
+    AC_HELP_STRING([--enable-werror],
+                   [Treat compiler warnings as errors]),
+[
+    CFLAGS="$CFLAGS -Werror"
+])
+
 ####################################################################
 # Version information
 ####################################################################