From a3842af709e133221e45a99ff3a76d08abc655d3 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 31 Aug 2015 07:47:46 -0700 Subject: [PATCH] Sync to PMIx tarball --- opal/mca/pmix/pmix1xx/pmix/LICENSE | 16 ++-- opal/mca/pmix/pmix1xx/pmix/README | 4 +- opal/mca/pmix/pmix1xx/pmix/VERSION | 4 +- opal/mca/pmix/pmix1xx/pmix/config/pmix.m4 | 3 - .../pmix/config/pmix_check_attributes.m4 | 58 +---------- .../pmix/config/pmix_check_broken_qsort.m4 | 4 +- .../config/pmix_check_compiler_version.m4 | 13 +-- .../pmix1xx/pmix/config/pmix_check_ident.m4 | 5 +- .../pmix1xx/pmix/config/pmix_check_munge.m4 | 4 +- .../pmix1xx/pmix/config/pmix_check_package.m4 | 4 +- .../pmix1xx/pmix/config/pmix_check_sasl.m4 | 2 +- .../pmix1xx/pmix/config/pmix_check_vendor.m4 | 15 +-- .../config/pmix_ensure_contains_optflags.m4 | 9 +- .../pmix1xx/pmix/config/pmix_functions.m4 | 19 ++-- .../pmix1xx/pmix/config/pmix_setup_hwloc.m4 | 2 +- .../pmix/config/pmix_setup_libevent.m4 | 2 +- opal/mca/pmix/pmix1xx/pmix/configure.ac | 12 +-- .../include/pmix/autogen/pmix_config_bottom.h | 21 ++-- .../include/pmix/autogen/pmix_config_top.h | 10 +- .../pmix1xx/pmix/src/buffer_ops/open_close.c | 10 +- .../pmix/pmix1xx/pmix/src/class/pmix_list.h | 8 +- .../pmix1xx/pmix/src/client/pmix_client.c | 4 +- .../pmix1xx/pmix/src/server/pmix_server.c | 4 +- .../pmix1xx/pmix/src/server/pmix_server_ops.c | 4 +- opal/mca/pmix/pmix1xx/pmix/src/usock/usock.c | 4 +- .../pmix/pmix1xx/pmix/src/util/Makefile.am | 2 - .../pmix1xx/pmix/src/util/help-pmix-util.txt | 95 ------------------- opal/mca/pmix/pmix1xx/pmix/src/util/output.c | 6 +- opal/mca/pmix/pmix1xx/pmix/src/util/output.h | 4 +- 29 files changed, 83 insertions(+), 265 deletions(-) delete mode 100644 opal/mca/pmix/pmix1xx/pmix/src/util/help-pmix-util.txt diff --git a/opal/mca/pmix/pmix1xx/pmix/LICENSE b/opal/mca/pmix/pmix1xx/pmix/LICENSE index 469eedd6de..f9e6f04791 100644 --- a/opal/mca/pmix/pmix1xx/pmix/LICENSE +++ b/opal/mca/pmix/pmix1xx/pmix/LICENSE @@ -1,9 +1,10 @@ Most files in this release are marked with the copyrights of the organizations who have edited them. The copyrights below are in no particular order and generally reflect members of the Open MPI core -team who have contributed code to this release. The copyrights for -code used under license from other parties are included in the -corresponding files. +team who have contributed code that may or may not have been ported +to PMIx. Per the terms of that LICENSE, we include the list here. +The copyrights for code used under license from other parties +are included in the corresponding files. Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana University Research and Technology @@ -11,12 +12,12 @@ Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana Copyright (c) 2004-2010 The University of Tennessee and The University of Tennessee Research Foundation. All rights reserved. -Copyright (c) 2004-2010 High Performance Computing Center Stuttgart, +Copyright (c) 2004-2010 High Performance Computing Center Stuttgart, University of Stuttgart. All rights reserved. Copyright (c) 2004-2008 The Regents of the University of California. All rights reserved. Copyright (c) 2006-2010 Los Alamos National Security, LLC. All rights - reserved. + reserved. Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved. Copyright (c) 2006-2010 Voltaire, Inc. All rights reserved. Copyright (c) 2006-2011 Sandia National Laboratories. All rights reserved. @@ -26,7 +27,7 @@ Copyright (c) 2006-2010 The University of Houston. All rights reserved. Copyright (c) 2006-2009 Myricom, Inc. All rights reserved. Copyright (c) 2007-2008 UT-Battelle, LLC. All rights reserved. Copyright (c) 2007-2010 IBM Corporation. All rights reserved. -Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing +Copyright (c) 1998-2005 Forschungszentrum Juelich, Juelich Supercomputing Centre, Federal Republic of Germany Copyright (c) 2005-2008 ZIH, TU Dresden, Federal Republic of Germany Copyright (c) 2007 Evergrid, Inc. All rights reserved. @@ -53,6 +54,9 @@ Additional copyrights may follow $HEADER$ +The following LICENSE pertains to both PMIx and any code ported +from Open MPI. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/opal/mca/pmix/pmix1xx/pmix/README b/opal/mca/pmix/pmix1xx/pmix/README index 9bdfda2824..ef92c4d141 100644 --- a/opal/mca/pmix/pmix1xx/pmix/README +++ b/opal/mca/pmix/pmix1xx/pmix/README @@ -152,9 +152,9 @@ INSTALLATION OPTIONS normal libraries (e.g., libmpi). 2. PMIx will not attempt to open any DSO's at run-time. - Note that this option does *not* imply that OMPI's libraries will be + Note that this option does *not* imply that PMIx's libraries will be built as static objects (e.g., libmpi.a). It only specifies the - location of OMPI's components: standalone DSOs or folded into the + location of PMIx's components: standalone DSOs or folded into the PMIx libraries. You can control whether PMIx's libraries are build as static or dynamic via --enable|disable-static and --enable|disable-shared. diff --git a/opal/mca/pmix/pmix1xx/pmix/VERSION b/opal/mca/pmix/pmix1xx/pmix/VERSION index 63dafcf914..4b740bca85 100644 --- a/opal/mca/pmix/pmix1xx/pmix/VERSION +++ b/opal/mca/pmix/pmix1xx/pmix/VERSION @@ -30,7 +30,7 @@ greek=a1 # command, or with the date (if "git describe" fails) in the form of # "date". -repo_rev=git11e7b06 +repo_rev=git9208efc # 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="Aug 30, 2015" +date="Aug 31, 2015" # The shared library version of each of PMIx's public libraries. # These versions are maintained in accordance with the "Library diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix.m4 index ce33918714..6d74702980 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix.m4 @@ -1,8 +1,5 @@ dnl -*- shell-script -*- dnl -dnl This code has been adapted from opal_configure_options.m4 in the Open MPI -dnl code base - per the Open MPI license, all copyrights are retained below. -dnl dnl Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana dnl University Research and Technology dnl Corporation. All rights reserved. diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_attributes.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_attributes.m4 index 65bdb100f8..bbafcc2b8b 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_attributes.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_attributes.m4 @@ -18,6 +18,7 @@ # Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013 Mellanox Technologies, Inc. # All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved. ######################### # $COPYRIGHT$ # @@ -48,13 +49,7 @@ AC_DEFUN([_PMIX_ATTRIBUTE_FAIL_SEARCH],[ ]) # -# Check for one specific attribute by compiling with C and C++ -# and possibly using a cross-check. -# -# If the cross-check is defined, a static function "usage" should be -# defined, which is to be called from main (to circumvent warnings -# regarding unused function in main file) -# static int usage (int * argument); +# Check for one specific attribute by compiling with C # # The last argument is for specific CFLAGS, that need to be set # for the compiler to generate a warning on the cross-check. @@ -64,7 +59,7 @@ AC_DEFUN([_PMIX_CHECK_SPECIFIC_ATTRIBUTE], [ AC_MSG_CHECKING([for __attribute__([$1])]) AC_CACHE_VAL(pmix_cv___attribute__[$1], [ # - # Try to compile using the C compiler, then C++ + # Try to compile using the C compiler # AC_TRY_COMPILE([$2],[], [ @@ -77,53 +72,6 @@ AC_DEFUN([_PMIX_CHECK_SPECIFIC_ATTRIBUTE], [ _PMIX_ATTRIBUTE_FAIL_SEARCH([$1]) ], [pmix_cv___attribute__[$1]=0]) - - # Only test C++ if we're building Open MPI (i.e., - # project_ompi). PMIX and ORTE do not use C++ at all, so - # let's not add a C++ compiler into their requirement list. - m4_ifdef([project_ompi], - [if test "$pmix_cv___attribute__[$1]" = "1" ; then - AC_LANG_PUSH(C++) - AC_TRY_COMPILE([ - extern "C" { - $2 - }],[], - [ - pmix_cv___attribute__[$1]=1 - _PMIX_ATTRIBUTE_FAIL_SEARCH([$1]) - ],[pmix_cv___attribute__[$1]=0]) - AC_LANG_POP(C++) - fi]) - - # - # If the attribute is supported by both compilers, - # try to recompile a *cross-check*, IFF defined. - # - if test '(' "$pmix_cv___attribute__[$1]" = "1" -a "[$3]" != "" ')' ; then - ac_c_werror_flag_safe=$ac_c_werror_flag - ac_c_werror_flag="yes" - CFLAGS_safe=$CFLAGS - CFLAGS="$CFLAGS [$4]" - - AC_TRY_COMPILE([$3], - [ - int i=4711; - i=usage(&i); - ], - [pmix_cv___attribute__[$1]=0], - [ - # - # In case we did NOT succeed: Fine, but was this due to the - # attribute being ignored? Grep for IgNoRe in conftest.err - # and if found, reset the pmix_cv__attribute__var=0 - # - pmix_cv___attribute__[$1]=1 - _PMIX_ATTRIBUTE_FAIL_SEARCH([$1]) - ]) - - ac_c_werror_flag=$ac_c_werror_flag_safe - CFLAGS=$CFLAGS_safe - fi ]) if test "$pmix_cv___attribute__[$1]" = "1" ; then diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_broken_qsort.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_broken_qsort.m4 index 443bd3bb9b..da4d14047e 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_broken_qsort.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_broken_qsort.m4 @@ -11,8 +11,8 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. -dnl Copyright (c) 2014 Intel, Inc. All rights reserved. -dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved. +dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_compiler_version.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_compiler_version.m4 index 65010c365f..b0a347e27b 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_compiler_version.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_compiler_version.m4 @@ -1,15 +1,8 @@ dnl -*- shell-script -*- dnl -dnl PMIx copyrights: +dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2013 Intel, Inc. All rights reserved dnl -dnl######################## -dnl This code has been adapted from pmix_setup_cc.m4 in the Open MPI -dnl code base - per the Open MPI license, all copyrights are retained below. -dnl -dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. -dnl -dnl######################## dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -21,7 +14,7 @@ dnl # PMIX_CHECK_COMPILER_VERSION_ID() # ---------------------------------------------------- # Try to figure out the compiler's name and version to detect cases, -# where users compile Open MPI with one version and compile the application +# where users compile PMIx with one version and compile the application # with a different compiler. # AC_DEFUN([PMIX_CHECK_COMPILER_VERSION_ID], @@ -62,7 +55,7 @@ int main (int argc, char * argv[]) CPPFLAGS=$CPPFLAGS_orig ]) AC_DEFINE_UNQUOTED([PMIX_BUILD_PLATFORM_COMPILER_$1], $pmix_cv_compiler_[$1], - [The compiler $lower which OMPI was built with]) + [The compiler $lower which PMIx was built with]) ])dnl diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_ident.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_ident.m4 index d49013ae27..0e2aa4f2cb 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_ident.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_ident.m4 @@ -1,6 +1,7 @@ dnl -*- shell-script -*- dnl -dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2015 Intel, Inc. All rights reserved dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -84,7 +85,7 @@ EOF [pmix_output="`strings -a conftest.${OBJEXT} | grep $pmix_ident`" grep $pmix_ident conftest.${OBJEXT} 2>&1 1>/dev/null pmix_status=$? - AS_IF([test "$pmix_output" != "" -o "$pmix_status" = "0"], + AS_IF([test "$pmix_output" != "" || test "$pmix_status" = "0"], [$6], [$7])], [PMIX_LOG_MSG([the failed program was:]) diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_munge.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_munge.m4 index baf873263d..6410749b2e 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_munge.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_munge.m4 @@ -1,7 +1,7 @@ # -*- shell-script -*- # # Copyright (c) 2015 Intel, Inc. All rights reserved -# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -26,7 +26,7 @@ AC_DEFUN([PMIX_MUNGE_CONFIG],[ pmix_munge_support=0 if test "$with_munge" != "no"; then AC_MSG_CHECKING([for munge in]) - if test ! -z "$with_munge" -a "$with_munge" != "yes"; then + if test ! -z "$with_munge" && test "$with_munge" != "yes"; then if test -d $with_munge/include/munge; then pmix_munge_dir=$with_munge/include/munge else diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_package.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_package.m4 index 861d07a20e..f4833c3b0a 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_package.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_package.m4 @@ -36,7 +36,7 @@ AC_DEFUN([_PMIX_CHECK_PACKAGE_HEADER], [ unset pmix_Header pmix_check_package_header_happy="no" - AS_IF([test "$3" = "/usr" -o "$3" = "/usr/local"], + AS_IF([test "$3" = "/usr" || test "$3" = "/usr/local"], [ # try as is... AC_VERBOSE([looking for header without includes]) AC_CHECK_HEADERS([$2], [pmix_check_package_header_happy="yes"], []) @@ -85,7 +85,7 @@ AC_DEFUN([_PMIX_CHECK_PACKAGE_LIB], [ unset pmix_Lib])], [ # libdir was not specified - go through search path pmix_check_package_libdir="$5" - AS_IF([test "$pmix_check_package_libdir" = "" -o "$pmix_check_package_libdir" = "/usr" -o "$pmix_check_package_libdir" = "/usr/local"], + AS_IF([test "$pmix_check_package_libdir" = "" || test "$pmix_check_package_libdir" = "/usr" || test "$pmix_check_package_libdir" = "/usr/local"], [ # try as is... AC_VERBOSE([looking for library without search path]) AC_CHECK_LIB([$2], [$3], diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_sasl.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_sasl.m4 index dddb4a1540..35c39845b7 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_sasl.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_sasl.m4 @@ -1,7 +1,7 @@ # -*- shell-script -*- # # Copyright (c) 2015 Intel, Inc. All rights reserved -# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_vendor.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_vendor.m4 index fa631aea26..cacff68cf4 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_vendor.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_check_vendor.m4 @@ -1,12 +1,5 @@ dnl -*- shell-script -*- dnl -dnl PMIx copyrights: -dnl Copyright (c) 2013 Intel, Inc. All rights reserved -dnl -dnl######################## -dnl This code has been adapted from pmix_check_vendor.m4 in the Open MPI -dnl code base - per the Open MPI license, all copyrights are retained below. -dnl dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana dnl University Research and Technology dnl Corporation. All rights reserved. @@ -18,8 +11,8 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. -dnl######################## -dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2013 Intel, Inc. All rights reserved +dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -112,8 +105,8 @@ AC_DEFUN([_PMIX_CHECK_COMPILER_VENDOR], [ if ($CC --version | grep gccfss) >/dev/null 2>&1; then AC_MSG_RESULT([gccfss]) - AC_MSG_WARN([Detected gccfss being used to compile Open MPI.]) - AC_MSG_WARN([Because of several issues Open MPI does not support]) + AC_MSG_WARN([Detected gccfss being used to compile PMIx.]) + AC_MSG_WARN([Because of several issues PMIx does not support]) AC_MSG_WARN([the gccfss compiler. Please use a different compiler.]) AC_MSG_WARN([If you didn't think you used gccfss you may want to]) AC_MSG_WARN([check to see if the compiler you think you used is]) diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_ensure_contains_optflags.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_ensure_contains_optflags.m4 index 9e228c3980..68bf36090b 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_ensure_contains_optflags.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_ensure_contains_optflags.m4 @@ -1,12 +1,5 @@ dnl -*- shell-script -*- dnl -dnl PMIx copyrights: -dnl Copyright (c) 2013 Intel, Inc. All rights reserved -dnl -dnl######################## -dnl This code has been adapted from pmix_ensure_contains_optflags.m4 in the Open MPI -dnl code base - per the Open MPI license, all copyrights are retained below. -dnl dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana dnl University Research and Technology dnl Corporation. All rights reserved. @@ -19,7 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. -dnl######################## +dnl Copyright (c) 2013 Intel, Inc. All rights reserved dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_functions.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_functions.m4 index 3ed6d7e4e1..5fb6d7a58c 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_functions.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_functions.m4 @@ -1,12 +1,5 @@ dnl -*- shell-script -*- dnl -dnl PMIx copyrights: -dnl Copyright (c) 2013 Intel, Inc. All rights reserved -dnl -dnl######################## -dnl This code has been adapted from pmix_get_version.m4sh in the Open MPI -dnl code base - per the Open MPI license, all copyrights are retained below. -dnl dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana dnl University Research and Technology dnl Corporation. All rights reserved. @@ -20,7 +13,7 @@ dnl All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. -dnl######################## +dnl Copyright (c) 2013 Intel, Inc. All rights reserved dnl dnl $COPYRIGHT$ dnl @@ -185,7 +178,7 @@ if expr "$program_transform_name" : 's.^..$' >/dev/null || \ program_transform_name="s,x,x," fi if test "$program_prefix$program_suffix$program_transform_name" != "NONENONEs,x,x," ; then - AC_MSG_WARN([*** The Open MPI configure script does not support --program-prefix, --program-suffix or --program-transform-name. Users are recommended to instead use --prefix with a unique directory and make symbolic links as desired for renaming.]) + AC_MSG_WARN([*** The PMIx configure script does not support --program-prefix, --program-suffix or --program-transform-name. Users are recommended to instead use --prefix with a unique directory and make symbolic links as desired for renaming.]) AC_MSG_ERROR([*** Cannot continue]) fi @@ -211,7 +204,7 @@ dnl ####################################################################### AC_DEFUN([PMIX_LOG_FILE],[ # 1 is the filename -if test -n "$1" -a -f "$1"; then +if test -n "$1" && test -f "$1"; then cat $1 >&5 fi])dnl @@ -254,7 +247,7 @@ for val in ${$1}; do # Loop over every token we've seen so far pmix_done="`expr $pmix_i \> $pmix_count`" - while test "$pmix_found" = "0" -a "$pmix_done" = "0"; do + while test "$pmix_found" = "0" && test "$pmix_done" = "0"; do # Have we seen this token already? Prefix the comparison with # "x" so that "-Lfoo" values won't be cause an error. @@ -459,11 +452,11 @@ AC_DEFUN([PMIX_WITH_OPTION_MIN_MAX_VALUE], [ AC_ARG_WITH([max-]m4_translit($1, [_], [-]), AC_HELP_STRING([--with-max-]m4_translit($1, [_], [-])[=VALUE], [maximum length of ]m4_translit($1, [_], [ ])[s. VALUE argument has to be specified (default: [$2]).])) - if test ! -z "$with_max_[$1]" -a "$with_max_[$1]" != "no" ; then + if test ! -z "$with_max_[$1]" && test "$with_max_[$1]" != "no" ; then # Ensure it's a number (hopefully an integer!), and >0 expr $with_max_[$1] + 1 > /dev/null 2> /dev/null AS_IF([test "$?" != "0"], [happy=0], - [AS_IF([test $with_max_[$1] -ge $3 -a $with_max_[$1] -le $4], + [AS_IF([test $with_max_[$1] -ge $3 && test $with_max_[$1] -le $4], [happy=1], [happy=0])]) # If badness in the above tests, bail diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_hwloc.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_hwloc.m4 index 7cdbe7f323..a599fc1677 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_hwloc.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_hwloc.m4 @@ -61,7 +61,7 @@ AC_DEFUN([_PMIX_HWLOC_EXTERNAL],[ pmix_hwloc_support=0 if test "$with_hwloc" != "no"; then AC_MSG_CHECKING([for hwloc in]) - if test ! -z "$with_hwloc" -a "$with_hwloc" != "yes"; then + if test ! -z "$with_hwloc" && test "$with_hwloc" != "yes"; then pmix_hwloc_dir=$with_hwloc if test -d $with_hwloc/lib; then pmix_hwloc_libdir=$with_hwloc/lib diff --git a/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_libevent.m4 b/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_libevent.m4 index f12b3798e8..c08560e9dc 100644 --- a/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_libevent.m4 +++ b/opal/mca/pmix/pmix1xx/pmix/config/pmix_setup_libevent.m4 @@ -64,7 +64,7 @@ AC_DEFUN([_PMIX_LIBEVENT_EXTERNAL],[ [Search for libevent libraries in DIR ])]) AC_MSG_CHECKING([for libevent in]) - if test ! -z "$with_libevent" -a "$with_libevent" != "yes"; then + if test ! -z "$with_libevent" && test "$with_libevent" != "yes"; then pmix_event_dir=$with_libevent if test -d $with_libevent/lib; then pmix_event_libdir=$with_libevent/lib diff --git a/opal/mca/pmix/pmix1xx/pmix/configure.ac b/opal/mca/pmix/pmix1xx/pmix/configure.ac index 47fc74a0ff..dc86d4d8ca 100644 --- a/opal/mca/pmix/pmix1xx/pmix/configure.ac +++ b/opal/mca/pmix/pmix1xx/pmix/configure.ac @@ -1,8 +1,5 @@ # -*- shell-script -*- # -# This code has been adapted from opal_get_version.m4sh in the Open MPI -# code base - per the Open MPI license, all copyrights are retained below. -# # Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana # University Research and Technology # Corporation. All rights reserved. @@ -77,13 +74,6 @@ PMIX_VAR_SCOPE_POP #################################################################### AH_TOP([/* -*- c -*- - * - * PMIx copyrights: - * Copyright (c) 2013-2015 Intel, Inc. All rights reserved - * - *######################### - * This code has been adapted from opal_config.h in the Open MPI - * code base - per the Open MPI license, all copyrights are retained below. * * Copyright (c) 2004-2005 The Trustees of Indiana University. * All rights reserved. @@ -93,7 +83,7 @@ AH_TOP([/* -*- c -*- * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - *######################### + * Copyright (c) 2013-2015 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_bottom.h b/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_bottom.h index 9c7d589ee2..28183f86c6 100644 --- a/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_bottom.h +++ b/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_bottom.h @@ -1,14 +1,11 @@ /* - * This code has been adapted from pmix_config_bottom.h in the Open MPI - * code base - per the Open MPI license, all copyrights are retained below. - * * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. * Copyright (c) 2004-2005 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2004-2010 High Performance Computing Center Stuttgart, + * Copyright (c) 2004-2010 High Performance Computing Center Stuttgart, * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. @@ -18,14 +15,14 @@ * All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved * $COPYRIGHT$ - * + * * Additional copyrights may follow - * + * * $HEADER$ * */ -#ifndef PMIX_CONFIG_BOTTOM_H +#ifndef PMIX_CONFIG_BOTTOM_H #define PMIX_CONFIG_BOTTOM_H /* @@ -217,7 +214,7 @@ # define PMIX_MODULE_DECLSPEC # endif #endif - + /* * Do we have ? */ @@ -236,8 +233,8 @@ /*********************************************************************** * - * Code that is only for when building Open MPI or utilities that are - * using the internals of Open MPI. It should not be included when + * Code that is only for when building PMIx or utilities that are + * using the internals of PMIx. It should not be included when * building MPI applications * **********************************************************************/ @@ -269,7 +266,7 @@ typedef PMIX_PTRDIFF_TYPE ptrdiff_t; #define PMIX_ENV_SEP ':' /* - * printf functions for portability (only when building Open MPI) + * printf functions for portability (only when building PMIx) */ #if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF) #include @@ -414,7 +411,7 @@ typedef PMIX_PTRDIFF_TYPE ptrdiff_t; want to protect others from the autoconf/automake-generated PACKAGE_ macros in pmix_config.h. We can't put these undef's directly in pmix_config.h because they'll be turned into #defines' - via autoconf. + via autoconf. So put them here in case any one else includes PMIX's config.h files. */ diff --git a/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_top.h b/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_top.h index 991d8faecd..1e509527e4 100644 --- a/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_top.h +++ b/opal/mca/pmix/pmix1xx/pmix/include/pmix/autogen/pmix_config_top.h @@ -2,21 +2,21 @@ * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2013-2015 Intel, Inc. All rights reserved * $COPYRIGHT$ - * + * * Additional copyrights may follow - * + * * $HEADER$ * * This file is included at the top of pmix_config.h, and is * therefore a) before all the #define's that were output from - * configure, and b) included in most/all files in Open MPI. + * configure, and b) included in most/all files in PMIx. * * Since this file is *only* ever included by pmix_config.h, and * pmix_config.h already has #ifndef/#endif protection, there is no * need to #ifndef/#endif protection here. */ -#ifndef PMIX_CONFIG_H +#ifndef PMIX_CONFIG_H #error "pmix_config_top.h should only be included from pmix_config.h" #endif @@ -25,7 +25,7 @@ you include a .h file from another project that defines these macros (e.g., gmp.h) and then include PMIX's config.h, you'll get a preprocessor conflict. So put these undef's here to - protect us from other package's PACKAGE_ macros. + protect us from other package's PACKAGE_ macros. Note that we can't put them directly in pmix_config.h (e.g., via AH_TOP) because they will be turned into #define's by autoconf. */ diff --git a/opal/mca/pmix/pmix1xx/pmix/src/buffer_ops/open_close.c b/opal/mca/pmix/pmix1xx/pmix/src/buffer_ops/open_close.c index b9897ccc5f..43f062e9ce 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/buffer_ops/open_close.c +++ b/opal/mca/pmix/pmix1xx/pmix/src/buffer_ops/open_close.c @@ -12,6 +12,8 @@ * All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,10 +46,10 @@ const char pmix_version_string[] = PMIX_VERSION; * globals */ bool pmix_bfrop_initialized = false; -int pmix_bfrop_initial_size; -int pmix_bfrop_threshold_size; -pmix_pointer_array_t pmix_bfrop_types; -pmix_data_type_t pmix_bfrop_num_reg_types; +int pmix_bfrop_initial_size = 0; +int pmix_bfrop_threshold_size = 0; +pmix_pointer_array_t pmix_bfrop_types = {{0}}; +pmix_data_type_t pmix_bfrop_num_reg_types = {0}; pmix_bfrop_buffer_type_t default_buf_type = PMIX_BFROP_BUFFER_NON_DESC; pmix_bfrop_t pmix_bfrop = { diff --git a/opal/mca/pmix/pmix1xx/pmix/src/class/pmix_list.h b/opal/mca/pmix/pmix1xx/pmix/src/class/pmix_list.h index 7c122d2bec..a78fcb3ea4 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/class/pmix_list.h +++ b/opal/mca/pmix/pmix1xx/pmix/src/class/pmix_list.h @@ -24,7 +24,7 @@ * @file * * The pmix_list_t interface is used to provide a generic - * doubly-linked list container for Open MPI. It was inspired by (but + * doubly-linked list container for PMIx. It was inspired by (but * is slightly different than) the Standard Template Library (STL) * std::list class. One notable difference from std::list is that * when an pmix_list_t is destroyed, all of the pmix_list_item_t @@ -100,7 +100,7 @@ PMIX_DECLSPEC PMIX_CLASS_DECLARATION(pmix_list_item_t); struct pmix_list_item_t { pmix_object_t super; - /**< Generic parent class for all Open MPI objects */ + /**< Generic parent class for all PMIx objects */ volatile struct pmix_list_item_t *pmix_list_next; /**< Pointer to next list item */ volatile struct pmix_list_item_t *pmix_list_prev; @@ -149,7 +149,7 @@ typedef struct pmix_list_item_t pmix_list_item_t; struct pmix_list_t { pmix_object_t super; - /**< Generic parent class for all Open MPI objects */ + /**< Generic parent class for all PMIx objects */ pmix_list_item_t pmix_list_sentinel; /**< Head and tail item of the list */ volatile size_t pmix_list_length; @@ -461,7 +461,7 @@ static inline size_t pmix_list_get_size(pmix_list_t* list) * caller -- they are responsible for PMIX_RELEASE()'ing it. * * If debugging is enabled (specifically, if --enable-debug was used - * to configure Open MPI), this is an O(N) operation because it checks + * to configure PMIx), this is an O(N) operation because it checks * to see if the item is actually in the list first. * * This is an inlined function in compilers that support inlining, so diff --git a/opal/mca/pmix/pmix1xx/pmix/src/client/pmix_client.c b/opal/mca/pmix/pmix1xx/pmix/src/client/pmix_client.c index aaab500405..c817b0ce09 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/client/pmix_client.c +++ b/opal/mca/pmix/pmix1xx/pmix/src/client/pmix_client.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . * All rights reserved. @@ -134,7 +134,7 @@ static void pmix_client_notify_recv(struct pmix_peer_t *peer, pmix_usock_hdr_t * } -pmix_client_globals_t pmix_client_globals; +pmix_client_globals_t pmix_client_globals = {{{0}}}; /* callback for wait completion */ static void wait_cbfunc(struct pmix_peer_t *pr, pmix_usock_hdr_t *hdr, diff --git a/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server.c b/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server.c index 2705952247..da13808464 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server.c +++ b/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Artem Y. Polyakov . * All rights reserved. @@ -55,7 +55,7 @@ #include "pmix_server_ops.h" // global variables -pmix_server_globals_t pmix_server_globals; +pmix_server_globals_t pmix_server_globals = {{{0}}}; // local variables static char *myuri = NULL; diff --git a/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server_ops.c b/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server_ops.c index 83b26155a3..e2504b55b6 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server_ops.c +++ b/opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server_ops.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Artem Y. Polyakov . * All rights reserved. @@ -54,7 +54,7 @@ #include "pmix_server_ops.h" -pmix_server_module_t pmix_host_server; +pmix_server_module_t pmix_host_server = {0}; static void dmdx_cbfunc(pmix_status_t status, const char *data, size_t ndata, void *cbdata, diff --git a/opal/mca/pmix/pmix1xx/pmix/src/usock/usock.c b/opal/mca/pmix/pmix1xx/pmix/src/usock/usock.c index fbcab73835..f24ebffc7c 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/usock/usock.c +++ b/opal/mca/pmix/pmix1xx/pmix/src/usock/usock.c @@ -2,6 +2,8 @@ * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . * All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -43,7 +45,7 @@ #include "usock.h" /* instance usock globals */ -pmix_usock_globals_t pmix_usock_globals; +pmix_usock_globals_t pmix_usock_globals = {{{0}}}; void pmix_usock_init(pmix_usock_cbfunc_t cbfunc) { diff --git a/opal/mca/pmix/pmix1xx/pmix/src/util/Makefile.am b/opal/mca/pmix/pmix1xx/pmix/src/util/Makefile.am index e06156df50..b4333a9fa4 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/util/Makefile.am +++ b/opal/mca/pmix/pmix1xx/pmix/src/util/Makefile.am @@ -22,8 +22,6 @@ # Source code files -dist_pmixdata_DATA += src/util/help-pmix-util.txt - headers += \ src/util/argv.h \ src/util/error.h \ diff --git a/opal/mca/pmix/pmix1xx/pmix/src/util/help-pmix-util.txt b/opal/mca/pmix/pmix1xx/pmix/src/util/help-pmix-util.txt deleted file mode 100644 index b84c180949..0000000000 --- a/opal/mca/pmix/pmix1xx/pmix/src/util/help-pmix-util.txt +++ /dev/null @@ -1,95 +0,0 @@ -# -*- text -*- -# -# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# This is the US/English general help file for Open MPI. -# -[stacktrace signal override] -Open MPI was inserting a signal handler for signal %d but noticed -that there is already a non-default handler installed. Open MPI's -handler was therefore not installed; your job will continue. This -warning message will only be displayed once, even if Open MPI -encounters this situation again. - -To avoid displaying this warning message, you can either not install -the error handler for signal %d or you can have Open MPI not try to -install its own signal handler for this signal by setting the -"pmix_signals" MCA parameter. - - Signal: %d - Current pmix_signal value: %s -# -[stacktrace bad signal] -Open MPI was inserting a signal handler but was given an invalid -signal number: - - Signal string: %s - Bad value: %s - -The given value must be an integer within the signal number -range. Please correct the value and try again. -# -[malformed net_private_ipv4] -Open MPI has detected at least one malformed IP address or netmask in -the value of the pmix_net_private_ipv4 MCA parameter. The -pmix_net_private_ipv4 MCA parameter accepts a semicolon-delimited list -of Classless Inter-Domain Routing (CIDR) notation specifications, each -of the form /. For example: - - 10.0.0.0/8;172.16.0.0/12;192.168.0.0/16;169.254.0.0/16 - -The first detected malformed entry was %s. -# -[invalid-net-mask] -Open MPI has detected a malformed IPv4 address or netmask: - - Value provided: %s - -Accepted values follow the Classless Inter-Domain -Routing (CIDR) notation specifications. For example: - - 10.0.0.0/8 - 172.16/12 - 192.168 - 169.254.0.0/16 -# -[malformed-uri] -Open MPI has detected a malformed URI: - - URI: %s - -Accepted values follow IETF RFC3986, e.g. file://192.168.1.1/over/there -# -[relative-path] -When creating a URI, all files must be specified in absolute paths: - - Value provided: %s - -Please update your application to provide the full path to the file. -# -[sys-limit-failed] -Per request, Open MPI attempted to set a system resource -limit to a given value: - - Resource: %s - Limit: %s - -The system has refused to allow this operation. This is likely -due to a permission limitation, or specifying an unsupported -value. Please check the system or remove the request and try -again. -# -[sys-limit-unrecognized] -Open MPI received a request to set a system resource limit. -Sadly, OMPI does not recognize or currently support the specified -resource: - - Resource: %s - Limit: %s - -Please correct the request and try again. diff --git a/opal/mca/pmix/pmix1xx/pmix/src/util/output.c b/opal/mca/pmix/pmix1xx/pmix/src/util/output.c index e3c068bd95..593c835222 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/util/output.c +++ b/opal/mca/pmix/pmix1xx/pmix/src/util/output.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -99,7 +101,7 @@ static int output(int output_id, const char *format, va_list arglist); /* global state */ bool pmix_output_redirected_to_syslog = false; -int pmix_output_redirected_syslog_pri; +int pmix_output_redirected_syslog_pri = 0; /* * Local state @@ -935,7 +937,7 @@ static int output(int output_id, const char *format, va_list arglist) char *out = buffer; memset(buffer, 0, BUFSIZ); snprintf(buffer, BUFSIZ - 1, - "[WARNING: %d lines lost because the Open MPI process session directory did\n not exist when pmix_output() was invoked]\n", + "[WARNING: %d lines lost because the PMIx process session directory did\n not exist when pmix_output() was invoked]\n", ldi->ldi_file_num_lines_lost); write(ldi->ldi_fd, buffer, (int)strlen(buffer)); ldi->ldi_file_num_lines_lost = 0; diff --git a/opal/mca/pmix/pmix1xx/pmix/src/util/output.h b/opal/mca/pmix/pmix1xx/pmix/src/util/output.h index 717e09728f..5adfa64d44 100644 --- a/opal/mca/pmix/pmix1xx/pmix/src/util/output.h +++ b/opal/mca/pmix/pmix1xx/pmix/src/util/output.h @@ -42,8 +42,8 @@ * WARNING: When using "file" as an output destination, be aware that * the file may not exist until the session directory for the process * exists. This is at least part of the way through MPI_INIT (for - * example). Most MCA components and internals of Open MPI won't be - * affected by this, but some RTE / startup aspects of Open MPI will + * example). Most MCA components and internals of PMIx won't be + * affected by this, but some RTE / startup aspects of PMIx will * not be able to write to a file for output. See pmix_output() for * details on what happens in these cases. *