From 7acef4833e87c59dd011e3f724ee5ea833e4e0a5 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 8 Feb 2017 13:23:27 +0900 Subject: [PATCH] pmix2x: Update to latest PMIx master pmix/master@6ed27be839e3f17a2b93885321e15fb26d802e93 Signed-off-by: Gilles Gouaillardet --- opal/mca/pmix/pmix2x/pmix/INSTALL | 3 +- opal/mca/pmix/pmix2x/pmix/LICENSE | 2 +- opal/mca/pmix/pmix2x/pmix/Makefile.am | 3 +- opal/mca/pmix/pmix2x/pmix/README | 2 +- opal/mca/pmix/pmix2x/pmix/VERSION | 4 +- opal/mca/pmix/pmix2x/pmix/config/Makefile.am | 2 +- .../pmix2x/pmix/config/c_get_alignment.m4 | 2 +- .../mca/pmix/pmix2x/pmix/config/distscript.sh | 1 - .../pmix/config/pmix_check_attributes.m4 | 2 +- .../pmix/config/pmix_check_broken_qsort.m4 | 2 +- .../config/pmix_check_compiler_version.m4 | 2 +- .../pmix/pmix2x/pmix/config/pmix_check_icc.m4 | 2 +- .../pmix2x/pmix/config/pmix_check_ident.m4 | 2 +- .../pmix2x/pmix/config/pmix_check_lock.m4 | 4 +- .../pmix2x/pmix/config/pmix_check_package.m4 | 2 +- .../pmix2x/pmix/config/pmix_check_psm2.m4 | 2 +- .../pmix2x/pmix/config/pmix_check_vendor.m4 | 2 +- .../pmix/config/pmix_check_visibility.m4 | 1 - .../pmix2x/pmix/config/pmix_check_withdir.m4 | 2 +- .../pmix2x/pmix/config/pmix_config_subdir.m4 | 2 +- .../config/pmix_ensure_contains_optflags.m4 | 2 +- .../pmix2x/pmix/config/pmix_get_version.sh | 2 +- .../pmix2x/pmix/config/pmix_load_platform.m4 | 2 +- .../pmix/config/pmix_mca_priority_sort.pl | 1 - .../pmix2x/pmix/config/pmix_search_libs.m4 | 2 +- opal/mca/pmix/pmix2x/pmix/contrib/buildrpm.sh | 24 ++-- .../pmix2x/pmix/contrib/make_dist_tarball | 2 +- .../pmix/pmix2x/pmix/contrib/perf_tools/pmi.h | 1 - .../pmix2x/pmix/contrib/perf_tools/pmi2.c | 1 - .../pmix/pmix2x/pmix/contrib/pmix-release.sh | 10 +- .../pmix2x/pmix/contrib/pmix-valgrind.supp | 4 +- opal/mca/pmix/pmix2x/pmix/contrib/pmix.spec | 7 +- .../pmix/pmix2x/pmix/contrib/pmix_jenkins.sh | 1 + .../pmix2x/pmix/contrib/whitespace-purge.sh | 2 +- .../mca/pmix/pmix2x/pmix/examples/Makefile.am | 2 +- .../pmix/pmix2x/pmix/include/pmix_common.h | 3 +- .../pmix/pmix2x/pmix/include/pmix_server.h | 2 +- .../pmix2x/pmix/include/pmix_version.h.in | 1 - .../pmix/pmix2x/pmix/src/buffer_ops/types.h | 2 +- .../pmix/pmix2x/pmix/src/buffer_ops/unpack.c | 2 +- .../pmix2x/pmix/src/class/pmix_hash_table.c | 2 +- .../pmix/pmix2x/pmix/src/class/pmix_list.c | 2 +- .../pmix/pmix2x/pmix/src/class/pmix_list.h | 2 +- .../pmix/pmix2x/pmix/src/class/pmix_object.c | 3 +- .../pmix2x/pmix/src/class/pmix_value_array.c | 3 +- .../pmix2x/pmix/src/client/Makefile.include | 2 +- opal/mca/pmix/pmix2x/pmix/src/client/pmi1.c | 28 +++++ opal/mca/pmix/pmix2x/pmix/src/client/pmi2.c | 28 +++++ .../pmix/src/client/pmix_client_fence.c | 3 +- .../pmix2x/pmix/src/client/pmix_client_get.c | 38 ++---- .../pmix2x/pmix/src/common/Makefile.include | 2 +- .../pmix/pmix2x/pmix/src/common/pmix_query.c | 2 +- .../pmix2x/pmix/src/dstore/Makefile.include | 1 - .../pmix/pmix2x/pmix/src/dstore/pmix_dstore.c | 1 - .../pmix/pmix2x/pmix/src/dstore/pmix_esh.c | 114 ++++++++++-------- .../pmix/pmix2x/pmix/src/dstore/pmix_esh.h | 4 +- .../pmix/src/event/pmix_event_notification.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/include/align.h | 1 - .../pmix2x/pmix/src/include/hash_string.h | 1 - .../pmix2x/pmix/src/include/pmix_config_top.h | 2 +- .../pmix2x/pmix/src/include/pmix_jobdata.h | 1 - .../pmix/src/include/pmix_socket_errno.h | 2 +- .../pmix/pmix2x/pmix/src/include/prefetch.h | 2 +- .../pmix/pmix2x/pmix/src/mca/base/Makefile.am | 1 - .../pmix/src/mca/base/help-mca-base.txt | 1 - .../pmix2x/pmix/src/mca/base/help-mca-var.txt | 1 - .../base/pmix_mca_base_component_compare.c | 3 +- .../pmix/pmix2x/pmix/src/mca/pdl/Makefile.am | 1 - .../pmix2x/pmix/src/mca/pdl/base/Makefile.am | 1 - .../pmix/src/mca/pdl/base/pdl_base_select.c | 1 - opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h | 1 - .../pmix/src/mca/pdl/pdlopen/Makefile.am | 1 - .../pmix/src/mca/pdl/pdlopen/configure.m4 | 1 - .../mca/pdl/pdlopen/pdl_pdlopen_component.c | 1 - .../pmix/pmix2x/pmix/src/mca/pif/Makefile.am | 1 - .../pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c | 1 - .../src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c | 1 - .../src/mca/pif/linux_ipv6/pif_linux_ipv6.c | 1 - .../pmix/src/mca/pif/posix_ipv4/pif_posix.c | 2 +- .../src/mca/pinstalldirs/base/Makefile.am | 1 - .../src/mca/pinstalldirs/config/configure.m4 | 3 +- .../pmix/src/mca/pinstalldirs/env/Makefile.am | 1 - .../src/mca/pinstalldirs/env/configure.m4 | 3 +- .../pmix/pmix2x/pmix/src/mca/pnet/Makefile.am | 2 +- .../pmix/src/mca/pnet/base/Makefile.include | 2 +- .../pmix/pmix2x/pmix/src/mca/pnet/base/base.h | 2 +- .../pmix/src/mca/pnet/base/pnet_base_fns.c | 2 +- .../pmix/src/mca/pnet/base/pnet_base_frame.c | 2 +- .../pmix/src/mca/pnet/base/pnet_base_select.c | 2 +- .../pmix2x/pmix/src/mca/pnet/opa/Makefile.am | 2 +- .../pmix2x/pmix/src/mca/pnet/opa/configure.m4 | 2 +- .../pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h | 2 +- .../src/mca/pnet/opa/pnet_opa_component.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h | 2 +- .../pmix/pmix2x/pmix/src/mca/psec/base/base.h | 2 +- .../pmix/src/runtime/help-pmix-runtime.txt | 1 - .../pmix2x/pmix/src/runtime/pmix_finalize.c | 2 +- .../pmix/pmix2x/pmix/src/runtime/pmix_init.c | 2 +- .../pmix/pmix2x/pmix/src/server/pmix_server.c | 15 ++- .../pmix2x/pmix/src/server/pmix_server_ops.c | 4 +- .../pmix2x/pmix/src/server/pmix_server_ops.h | 2 +- .../pmix/pmix2x/pmix/src/sm/Makefile.include | 1 - opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.c | 1 - opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.h | 1 - opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.c | 1 - opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.h | 1 - .../pmix2x/pmix/src/util/Makefile.include | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/alfg.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/basename.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/basename.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/compress.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/getid.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/getid.h | 3 +- opal/mca/pmix/pmix2x/pmix/src/util/hash.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/hash.h | 2 +- .../pmix2x/pmix/src/util/keyval/keyval_lex.l | 1 - opal/mca/pmix/pmix2x/pmix/src/util/net.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/output.h | 3 +- .../pmix/pmix2x/pmix/src/util/pmix_environ.c | 3 +- .../pmix/pmix2x/pmix/src/util/pmix_environ.h | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/printf.c | 2 +- opal/mca/pmix/pmix2x/pmix/src/util/printf.h | 3 +- opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h | 3 +- opal/mca/pmix/pmix2x/pmix/src/util/timings.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/Makefile.am | 2 +- opal/mca/pmix/pmix2x/pmix/test/cli_stages.c | 3 +- opal/mca/pmix/pmix2x/pmix/test/cli_stages.h | 4 +- opal/mca/pmix/pmix2x/pmix/test/pmix_client.c | 2 +- opal/mca/pmix/pmix2x/pmix/test/pmix_regex.c | 3 +- opal/mca/pmix/pmix2x/pmix/test/pmix_test.c | 3 +- .../pmix/pmix2x/pmix/test/simple/test_pmix.c | 102 ++++++++-------- opal/mca/pmix/pmix2x/pmix/test/test_cd.c | 3 +- opal/mca/pmix/pmix2x/pmix/test/test_cd.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/test_common.c | 3 +- opal/mca/pmix/pmix2x/pmix/test/test_common.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/test_error.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/test_fence.c | 3 +- .../mca/pmix/pmix2x/pmix/test/test_internal.c | 1 - .../mca/pmix/pmix2x/pmix/test/test_internal.h | 1 - opal/mca/pmix/pmix2x/pmix/test/test_publish.c | 3 +- opal/mca/pmix/pmix2x/pmix/test/test_publish.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/test_replace.c | 1 - opal/mca/pmix/pmix2x/pmix/test/test_replace.h | 1 - .../pmix2x/pmix/test/test_resolve_peers.c | 2 +- .../pmix2x/pmix/test/test_resolve_peers.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/test_spawn.c | 3 +- opal/mca/pmix/pmix2x/pmix/test/test_spawn.h | 2 +- opal/mca/pmix/pmix2x/pmix/test/utils.c | 2 +- opal/mca/pmix/pmix2x/pmix/test/utils.h | 2 +- 149 files changed, 346 insertions(+), 295 deletions(-) diff --git a/opal/mca/pmix/pmix2x/pmix/INSTALL b/opal/mca/pmix/pmix2x/pmix/INSTALL index 59aef39d92..005301463f 100644 --- a/opal/mca/pmix/pmix2x/pmix/INSTALL +++ b/opal/mca/pmix/pmix2x/pmix/INSTALL @@ -9,7 +9,7 @@ Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, Copyright (c) 2004-2005 The Regents of the University of California. All rights reserved. Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. -Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +Copyright (c) 2013-2015 Intel, Inc. All rights reserved. $COPYRIGHT$ Additional copyrights may follow @@ -85,3 +85,4 @@ shell$ make install Parallel make is generally only helpful in the build phase; the installation process is mostly serial and does not benefit much from parallel make. + diff --git a/opal/mca/pmix/pmix2x/pmix/LICENSE b/opal/mca/pmix/pmix2x/pmix/LICENSE index 77e74696d4..f9e6f04791 100644 --- a/opal/mca/pmix/pmix2x/pmix/LICENSE +++ b/opal/mca/pmix/pmix2x/pmix/LICENSE @@ -45,7 +45,7 @@ Copyright (c) 2010 ARM ltd. All rights reserved. Copyright (c) 2010-2011 Alex Brick . All rights reserved. Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights reserved. -Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +Copyright (c) 2013-2014 Intel, Inc. All rights reserved. Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved. $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/Makefile.am b/opal/mca/pmix/pmix2x/pmix/Makefile.am index 68f59c81fa..3c74e4af9f 100644 --- a/opal/mca/pmix/pmix2x/pmix/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/Makefile.am @@ -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-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # $COPYRIGHT$ # # Additional copyrights may follow @@ -61,3 +61,4 @@ nroff: dist-hook: env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)" + diff --git a/opal/mca/pmix/pmix2x/pmix/README b/opal/mca/pmix/pmix2x/pmix/README index bacf8a42ac..55b7c61f5e 100644 --- a/opal/mca/pmix/pmix2x/pmix/README +++ b/opal/mca/pmix/pmix2x/pmix/README @@ -15,7 +15,7 @@ Copyright (c) 2007 Myricom, Inc. All rights reserved. Copyright (c) 2008 IBM Corporation. All rights reserved. Copyright (c) 2010 Oak Ridge National Labs. All rights reserved. Copyright (c) 2011 University of Houston. All rights reserved. -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +Copyright (c) 2013-2015 Intel, Inc. All rights reserved $COPYRIGHT$ Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/VERSION b/opal/mca/pmix/pmix2x/pmix/VERSION index f9413cd265..18046b9b8d 100644 --- a/opal/mca/pmix/pmix2x/pmix/VERSION +++ b/opal/mca/pmix/pmix2x/pmix/VERSION @@ -30,7 +30,7 @@ greek=a1 # command, or with the date (if "git describe" fails) in the form of # "date". -repo_rev=git972f79a +repo_rev=git6ed27be # 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="Jan 31, 2017" +date="Feb 08, 2017" # 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/pmix2x/pmix/config/Makefile.am b/opal/mca/pmix/pmix2x/pmix/config/Makefile.am index 4edc92afef..3793162404 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/config/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/config/c_get_alignment.m4 b/opal/mca/pmix/pmix2x/pmix/config/c_get_alignment.m4 index 7e93c68f27..db37910099 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/c_get_alignment.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/c_get_alignment.m4 @@ -11,7 +11,7 @@ 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) 2009 Sun Microsystems, Inc. All rights reserved. -dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/config/distscript.sh b/opal/mca/pmix/pmix2x/pmix/config/distscript.sh index 3a4e0bc973..fbb37a7871 100755 --- a/opal/mca/pmix/pmix2x/pmix/config/distscript.sh +++ b/opal/mca/pmix/pmix2x/pmix/config/distscript.sh @@ -15,7 +15,6 @@ # and Technology (RIST). All rights reserved. # Copyright (c) 2015 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_attributes.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_attributes.m4 index e9dd659a61..bbafcc2b8b 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_attributes.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_attributes.m4 @@ -1,6 +1,6 @@ # -*- shell-script -*- # PMIx copyrights: -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013 Intel, Inc. All rights reserved # ######################### # diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_broken_qsort.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_broken_qsort.m4 index ae62a8bd89..da4d14047e 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_broken_qsort.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_broken_qsort.m4 @@ -11,7 +11,7 @@ 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-2017 Intel, 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 diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 index 7dfa315e87..b0a347e27b 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_compiler_version.m4 @@ -1,7 +1,7 @@ dnl -*- shell-script -*- dnl dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. -dnl Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2013 Intel, Inc. All rights reserved dnl dnl $COPYRIGHT$ dnl diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_icc.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_icc.m4 index bbf8f707cc..e8a06b2514 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_icc.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_icc.m4 @@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 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) 2014-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl Copyright (c) 2016 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_ident.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_ident.m4 index ba4aba03d9..de2fa573bc 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_ident.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_ident.m4 @@ -1,7 +1,7 @@ dnl -*- shell-script -*- dnl dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. -dnl Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2015 Intel, Inc. All rights reserved dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_lock.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_lock.m4 index 097e286e2f..2d5c1ba864 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_lock.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_lock.m4 @@ -2,7 +2,7 @@ dnl -*- shell-script -*- dnl dnl Copyright (c) 2017 Mellanox Technologies, Inc. dnl All rights reserved. -dnl Copyright (c) 2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2017 IBM Corporation. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -24,7 +24,7 @@ AC_DEFUN([PMIX_CHECK_DSTOR_LOCK],[ _x_ac_fcntl_lock_found="1" ], [], [#include ]) - if test "$ESH_PTHREAD_LOCK" == "1"; then + if test "$DSTORE_PTHREAD_LOCK" == "1"; then AC_CHECK_FUNC([pthread_rwlockattr_setkind_np], [AC_EGREP_HEADER([PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP], [pthread.h],[ diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 index 2c7b7295b5..f4833c3b0a 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_package.m4 @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2012-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2014 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 index baac3b085a..d1304e98fc 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_psm2.m4 @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2006 QLogic Corp. All rights reserved. # Copyright (c) 2009-2016 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel Corporation. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2016 Los Alamos National Security, LLC. All rights diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_vendor.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_vendor.m4 index 343a021e69..cf96c46256 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_vendor.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_vendor.m4 @@ -11,7 +11,7 @@ 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 Copyright (c) 2013-2017 Intel, 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 (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_visibility.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_visibility.m4 index aafbdca564..1a4c45cc44 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_visibility.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_visibility.m4 @@ -12,7 +12,6 @@ # All rights reserved. # Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2009-2011 Oracle and/or its affiliates. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_withdir.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_withdir.m4 index ff1b3d4176..3fdaefb3c0 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_check_withdir.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_check_withdir.m4 @@ -8,7 +8,7 @@ dnl reserved. dnl Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. -dnl Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2016 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_config_subdir.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_config_subdir.m4 index 248aebda35..ff60f311b0 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_config_subdir.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_config_subdir.m4 @@ -11,7 +11,7 @@ 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-2016 Cisco Systems, Inc. All rights reserved. -dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_ensure_contains_optflags.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_ensure_contains_optflags.m4 index df6dcf2767..68bf36090b 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_ensure_contains_optflags.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_ensure_contains_optflags.m4 @@ -12,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 Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2013 Intel, Inc. All rights reserved dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_get_version.sh b/opal/mca/pmix/pmix2x/pmix/config/pmix_get_version.sh index da2548e863..6106af60c3 100755 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_get_version.sh +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_get_version.sh @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_load_platform.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_load_platform.m4 index 330c7e6799..53d4afbf7d 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_load_platform.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_load_platform.m4 @@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 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) 2014-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_mca_priority_sort.pl b/opal/mca/pmix/pmix2x/pmix/config/pmix_mca_priority_sort.pl index 839f7fe287..4026e990ed 100755 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_mca_priority_sort.pl +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_mca_priority_sort.pl @@ -2,7 +2,6 @@ # # Copyright (c) 2010 Sandia National Laboratories. All rights reserved. # -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/config/pmix_search_libs.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix_search_libs.m4 index 97f052128c..9d7a8af9a7 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix_search_libs.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix_search_libs.m4 @@ -1,7 +1,7 @@ dnl -*- shell-script -*- dnl dnl Copyright (c) 2013-2014 Cisco Systems, Inc. All rights reserved. -dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/buildrpm.sh b/opal/mca/pmix/pmix2x/pmix/contrib/buildrpm.sh index 77ad94d09b..9b65ceefed 100755 --- a/opal/mca/pmix/pmix2x/pmix/contrib/buildrpm.sh +++ b/opal/mca/pmix/pmix2x/pmix/contrib/buildrpm.sh @@ -96,19 +96,19 @@ echo "--> Found specfile: $specfile" rpmtopdir=${rpmtopdir:-"`grep %_topdir $HOME/.rpmmacros | awk '{ print $2 }'`"} if test "$rpmtopdir" != ""; then - rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'" + rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'" if test ! -d "$rpmtopdir"; then - mkdir -p "$rpmtopdir" - mkdir -p "$rpmtopdir/BUILD" - mkdir -p "$rpmtopdir/RPMS" - mkdir -p "$rpmtopdir/RPMS/i386" - mkdir -p "$rpmtopdir/RPMS/i586" - mkdir -p "$rpmtopdir/RPMS/i686" - mkdir -p "$rpmtopdir/RPMS/noarch" - mkdir -p "$rpmtopdir/RPMS/athlon" - mkdir -p "$rpmtopdir/SOURCES" - mkdir -p "$rpmtopdir/SPECS" - mkdir -p "$rpmtopdir/SRPMS" + mkdir -p "$rpmtopdir" + mkdir -p "$rpmtopdir/BUILD" + mkdir -p "$rpmtopdir/RPMS" + mkdir -p "$rpmtopdir/RPMS/i386" + mkdir -p "$rpmtopdir/RPMS/i586" + mkdir -p "$rpmtopdir/RPMS/i686" + mkdir -p "$rpmtopdir/RPMS/noarch" + mkdir -p "$rpmtopdir/RPMS/athlon" + mkdir -p "$rpmtopdir/SOURCES" + mkdir -p "$rpmtopdir/SPECS" + mkdir -p "$rpmtopdir/SRPMS" fi need_root=0 elif test -d /usr/src/RPM; then diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/make_dist_tarball b/opal/mca/pmix/pmix2x/pmix/contrib/make_dist_tarball index 33d0289a1b..c9a6d19c64 100755 --- a/opal/mca/pmix/pmix2x/pmix/contrib/make_dist_tarball +++ b/opal/mca/pmix/pmix2x/pmix/contrib/make_dist_tarball @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi.h b/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi.h index 54613455cc..4782a1903c 100644 --- a/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi.h +++ b/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi.h @@ -1,7 +1,6 @@ /* * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi2.c b/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi2.c index f5247f090e..b6b3412263 100644 --- a/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi2.c +++ b/opal/mca/pmix/pmix2x/pmix/contrib/perf_tools/pmi2.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/pmix-release.sh b/opal/mca/pmix/pmix2x/pmix/contrib/pmix-release.sh index 7ff1e2918d..ec64d5522f 100755 --- a/opal/mca/pmix/pmix2x/pmix/contrib/pmix-release.sh +++ b/opal/mca/pmix/pmix2x/pmix/contrib/pmix-release.sh @@ -36,16 +36,16 @@ for branch in $branches; do module load libevent/pmix-$branch ./$script $@ >dist.out 2>&1 - if test "$?" != "0"; then - cat < - Specfile auto-generated by Mezzanine + diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/pmix_jenkins.sh b/opal/mca/pmix/pmix2x/pmix/contrib/pmix_jenkins.sh index d8445463a0..870b22dac4 100755 --- a/opal/mca/pmix/pmix2x/pmix/contrib/pmix_jenkins.sh +++ b/opal/mca/pmix/pmix2x/pmix/contrib/pmix_jenkins.sh @@ -395,3 +395,4 @@ if [ -n "$JENKINS_RUN_TESTS" -a "$JENKINS_RUN_TESTS" -ne "0" ]; then set -e fi fi + diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/whitespace-purge.sh b/opal/mca/pmix/pmix2x/pmix/contrib/whitespace-purge.sh index d760d53a90..9c9d8fe909 100755 --- a/opal/mca/pmix/pmix2x/pmix/contrib/whitespace-purge.sh +++ b/opal/mca/pmix/pmix2x/pmix/contrib/whitespace-purge.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved. # Copyright (c) 2015 Los Alamos National Security, LLC. All rights # reserved # Copyright (c) 2015 Cisco Systems, Inc. diff --git a/opal/mca/pmix/pmix2x/pmix/examples/Makefile.am b/opal/mca/pmix/pmix2x/pmix/examples/Makefile.am index 8b5c6e8d23..38d47aea8c 100644 --- a/opal/mca/pmix/pmix2x/pmix/examples/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/examples/Makefile.am @@ -11,7 +11,7 @@ # All rights reserved. # Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h b/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h index 10ea9dc143..c30feb0ff9 100644 --- a/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h +++ b/opal/mca/pmix/pmix2x/pmix/include/pmix_common.h @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. - * Copyright (c) 2016 Research Organization for Information Science + * Copyright (c) 2016-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2016 Mellanox Technologies, Inc. @@ -759,6 +759,7 @@ typedef struct pmix_value { if (NULL != (m)->data.darray->array) { \ free((m)->data.darray->array); \ } \ + free((m)->data.darray); \ /**** DEPRECATED ****/ \ } else if (PMIX_INFO_ARRAY == (m)->type) { \ pmix_info_t *_p = (pmix_info_t*)((m)->data.array->array); \ diff --git a/opal/mca/pmix/pmix2x/pmix/include/pmix_server.h b/opal/mca/pmix/pmix2x/pmix/include/pmix_server.h index d2145db743..30f584a004 100644 --- a/opal/mca/pmix/pmix2x/pmix/include/pmix_server.h +++ b/opal/mca/pmix/pmix2x/pmix/include/pmix_server.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved * Copyright (c) 2015 Artem Y. Polyakov . * All rights reserved. * Copyright (c) 2015 Research Organization for Information Science diff --git a/opal/mca/pmix/pmix2x/pmix/include/pmix_version.h.in b/opal/mca/pmix/pmix2x/pmix/include/pmix_version.h.in index aeb51a9e83..096b895582 100644 --- a/opal/mca/pmix/pmix2x/pmix/include/pmix_version.h.in +++ b/opal/mca/pmix/pmix2x/pmix/include/pmix_version.h.in @@ -1,7 +1,6 @@ /* * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/types.h b/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/types.h index 073ac0ddad..c48a30b8b5 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/types.h +++ b/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/types.h @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/unpack.c b/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/unpack.c index 661b7bed2b..d7b16a1a62 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/unpack.c +++ b/opal/mca/pmix/pmix2x/pmix/src/buffer_ops/unpack.c @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016 Mellanox Technologies, Inc. diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c index 46ecdd762c..ead33aecfa 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_hash_table.c @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c index 169f7a989e..933c5bcd5a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.c @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Voltaire All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2015 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.h b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.h index 448d43d5e1..4d8a195bb3 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.h +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_list.h @@ -13,7 +13,7 @@ * Copyright (c) 2007 Voltaire All rights reserved. * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2015 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c index 8c0352075a..ba911e578f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_object.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ @@ -224,3 +224,4 @@ static void expand_array(void) classes[i] = NULL; } } + diff --git a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c index 0eeb0812af..f46e494c38 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c +++ b/opal/mca/pmix/pmix2x/pmix/src/class/pmix_value_array.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -64,3 +64,4 @@ int pmix_value_array_set_size(pmix_value_array_t* array, size_t size) array->array_size = size; return PMIX_SUCCESS; } + diff --git a/opal/mca/pmix/pmix2x/pmix/src/client/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/client/Makefile.include index c6b4e88ef5..2f4fd6eeb1 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/client/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/client/Makefile.include @@ -1,6 +1,6 @@ # -*- makefile -*- # -# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2014-2015 Intel, Inc. All rights reserved. # Copyright (c) 2014 Artem Y. Polyakov . # All rights reserved. # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/client/pmi1.c b/opal/mca/pmix/pmix2x/pmix/src/client/pmi1.c index 404e91c82b..9a4e1acd0a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/client/pmi1.c +++ b/opal/mca/pmix/pmix2x/pmix/src/client/pmi1.c @@ -202,6 +202,30 @@ PMIX_EXPORT int PMI_KVS_Get( const char kvsname[], const char key[], char value[ pmix_output_verbose(2, pmix_globals.debug_output, "PMI_KVS_Get: KVS=%s, key=%s value=%s", kvsname, key, value); + /* PMI-1 expects resource manager to set + * process mapping in ANL notation. */ + if (!strcmp(key, ANL_MAPPING)) { + /* we are looking in the job-data. If there is nothing there + * we don't want to look in rank's data, thus set rank to widcard */ + proc = myproc; + proc.rank = PMIX_RANK_WILDCARD; + if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_ANL_MAP, NULL, 0, &val) && + (NULL != val) && (PMIX_STRING == val->type)) { + strncpy(value, val->data.string, length); + PMIX_VALUE_FREE(val, 1); + return PMI_SUCCESS; + } else { + /* artpol: + * Some RM's (i.e. SLURM) already have ANL precomputed. The export it + * through PMIX_ANL_MAP variable. + * If we haven't found it we want to have our own packing functionality + * since it's common. + * Somebody else has to write it since I've already done that for + * GPL'ed SLURM :) */ + return PMI_FAIL; + } + } + /* retrieve the data from PMIx - since we don't have a rank, * we indicate that by passing the UNDEF value */ (void)strncpy(proc.nspace, kvsname, PMIX_MAX_NSLEN); @@ -344,6 +368,10 @@ PMIX_EXPORT int PMI_Get_appnum(int *appnum) if (PMIX_SUCCESS == rc) { rc = convert_int(appnum, val); PMIX_VALUE_RELEASE(val); + } else if( PMIX_ERR_NOT_FOUND == rc ){ + /* this is optional value, set to 0 */ + *appnum = 0; + rc = PMIX_SUCCESS; } PMIX_INFO_DESTRUCT(&info[0]); diff --git a/opal/mca/pmix/pmix2x/pmix/src/client/pmi2.c b/opal/mca/pmix/pmix2x/pmix/src/client/pmi2.c index ef46b48b1b..97d1939c0f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/client/pmi2.c +++ b/opal/mca/pmix/pmix2x/pmix/src/client/pmi2.c @@ -36,6 +36,7 @@ #include "src/util/output.h" #include "src/include/pmix_globals.h" +#define ANL_MAPPING "PMI_process_mapping" #define PMI2_CHECK() \ do { \ @@ -505,6 +506,33 @@ PMIX_EXPORT int PMI2_Info_GetJobAttr(const char name[], char value[], int valuel PMIX_INFO_CONSTRUCT(&info[0]); PMIX_INFO_LOAD(&info[0], PMIX_OPTIONAL, &val_optinal, PMIX_BOOL); + /* PMI-2 expects resource manager to set + * process mapping in ANL notation. */ + if (!strcmp(name, ANL_MAPPING)) { + /* we are looking in the job-data. If there is nothing there + * we don't want to look in rank's data, thus set rank to widcard */ + proc = myproc; + proc.rank = PMIX_RANK_WILDCARD; + if (PMIX_SUCCESS == PMIx_Get(&proc, PMIX_ANL_MAP, NULL, 0, &val) && + (NULL != val) && (PMIX_STRING == val->type)) { + strncpy(value, val->data.string, valuelen); + PMIX_VALUE_FREE(val, 1); + *found = 1; + return PMI2_SUCCESS; + } else { + /* artpol: + * Some RM's (i.e. SLURM) already have ANL precomputed. The export it + * through PMIX_ANL_MAP variable. + * If we haven't found it we want to have our own packing functionality + * since it's common. + * Somebody else has to write it since I've already done that for + * GPL'ed SLURM :) */ + *found = 1; + return PMI2_FAIL; + } + } + + *found = 0; rc = PMIx_Get(&proc, name, info, 1, &val); if (PMIX_SUCCESS == rc && NULL != val) { diff --git a/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c b/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c index 5b7ff86b27..d22c1223d1 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c +++ b/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_fence.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014 Artem Y. Polyakov . @@ -254,3 +254,4 @@ static void op_cbfunc(pmix_status_t status, void *cbdata) cb->status = status; cb->active = false; } + diff --git a/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_get.c b/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_get.c index 5ad6c6014f..70aef41583 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_get.c +++ b/opal/mca/pmix/pmix2x/pmix/src/client/pmix_client_get.c @@ -596,8 +596,16 @@ static void _getnbfn(int fd, short flags, void *cbdata) return; } + /* should be in the internal hash table. */ #if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1) + rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val); + if (PMIX_SUCCESS != rc) { + rc = pmix_dstore_fetch(cb->nspace, cb->rank, cb->key, &val); + } + if (PMIX_SUCCESS == rc) { +#else if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val))) { +#endif /* if this is a compressed string, then uncompress it */ if (PMIX_COMPRESSED_STRING == val->type) { pmix_util_uncompress_string(&tmp, (uint8_t*)val->data.bo.bytes, val->data.bo.size); @@ -621,40 +629,10 @@ static void _getnbfn(int fd, short flags, void *cbdata) PMIX_RELEASE(cb); return; } -#endif /* if the key is in the PMIx namespace, then they are looking for data * that was provided at startup */ if (0 == strncmp(cb->key, "pmix", 4)) { - /* should be in the internal hash table. */ -#if defined(PMIX_ENABLE_DSTORE) && (PMIX_ENABLE_DSTORE == 1) - if (PMIX_SUCCESS == (rc = pmix_dstore_fetch(cb->nspace, cb->rank, cb->key, &val))) { -#else - if (PMIX_SUCCESS == (rc = pmix_hash_fetch(&nptr->internal, cb->rank, cb->key, &val))) { -#endif - /* if this is a compressed string, then uncompress it */ - if (PMIX_COMPRESSED_STRING == val->type) { - pmix_util_uncompress_string(&tmp, (uint8_t*)val->data.bo.bytes, val->data.bo.size); - if (NULL == tmp) { - PMIX_ERROR_LOG(PMIX_ERR_NOMEM); - rc = PMIX_ERR_NOMEM; - PMIX_VALUE_RELEASE(val); - val = NULL; - } else { - PMIX_VALUE_DESTRUCT(val); - PMIX_VAL_ASSIGN(val, string, tmp); - } - } - /* found it - we are in an event, so we can - * just execute the callback */ - cb->value_cbfunc(rc, val, cb->cbdata); - /* cleanup */ - if (NULL != val) { - PMIX_VALUE_RELEASE(val); - } - PMIX_RELEASE(cb); - return; - } /* if we don't have it, go request it */ goto request; } diff --git a/opal/mca/pmix/pmix2x/pmix/src/common/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/common/Makefile.include index cb63de841b..4f29509b0f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/common/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/common/Makefile.include @@ -1,6 +1,6 @@ # -*- makefile -*- # -# Copyright (c) 2015-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2015 Intel, Inc. All rights reserved. # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/common/pmix_query.c b/opal/mca/pmix/pmix2x/pmix/src/common/pmix_query.c index 2dc7bc11da..77f86755b8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/common/pmix_query.c +++ b/opal/mca/pmix/pmix2x/pmix/src/common/pmix_query.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/dstore/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/dstore/Makefile.include index a86441154c..a317230d07 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/dstore/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/dstore/Makefile.include @@ -1,6 +1,5 @@ # Copyright (c) 2015-2016 Mellanox Technologies, Inc. # All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_dstore.c b/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_dstore.c index 414ca3bfdc..1c0af9c947 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_dstore.c +++ b/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_dstore.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.c b/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.c index 151fb58150..04ee21965a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.c +++ b/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2015-2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2016 Research Organization for Information Science + * Copyright (c) 2016-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ @@ -225,7 +225,7 @@ static void _update_initial_segment_info(const ns_map_data_t *ns_map); static void _set_constants_from_env(void); static void _delete_sm_desc(seg_desc_t *desc); static int _pmix_getpagesize(void); -static inline uint32_t _get_univ_size(const char *nspace); +static inline ssize_t _get_univ_size(const char *nspace); static inline ns_map_data_t * _esh_session_map_search_server(const char *nspace); static inline ns_map_data_t * _esh_session_map_search_client(const char *nspace); @@ -289,12 +289,14 @@ static void ncon(ns_track_elem_t *p) { p->data_seg = NULL; p->num_meta_seg = 0; p->num_data_seg = 0; + p->in_use = true; } static void ndes(ns_track_elem_t *p) { _delete_sm_desc(p->meta_seg); _delete_sm_desc(p->data_seg); memset(&p->ns_map, 0, sizeof(p->ns_map)); + p->in_use = false; } PMIX_CLASS_INSTANCE(ns_track_elem_t, @@ -588,10 +590,23 @@ static inline void _esh_sessions_cleanup(void) static inline void _esh_ns_track_cleanup(void) { + int size; + ns_track_elem_t *ns_trk; + if (NULL == _ns_track_array) { return; } + size = pmix_value_array_get_size(_ns_track_array); + ns_trk = PMIX_VALUE_ARRAY_GET_BASE(_ns_track_array, ns_track_elem_t); + + for (int i = 0; i < size; i++) { + ns_track_elem_t *trk = ns_trk + i; + if (trk->in_use) { + PMIX_DESTRUCT(trk); + } + } + PMIX_RELEASE(_ns_track_array); _ns_track_array = NULL; } @@ -1086,8 +1101,6 @@ int _esh_store(const char *nspace, pmix_rank_t rank, pmix_kval_t *kv) rc = _store_data_for_rank(elem, rank, &xfer); - xfer.base_ptr = NULL; - xfer.bytes_used = 0; PMIX_DESTRUCT(&xfer); if (PMIX_SUCCESS != rc) { @@ -1156,8 +1169,13 @@ int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value } if (PMIX_RANK_UNDEF == rank) { - nprocs = _get_univ_size(ns_map->name); - cur_rank = PMIX_RANK_UNDEF; + ssize_t _nprocs = _get_univ_size(ns_map->name); + if( 0 > _nprocs ){ + PMIX_ERROR_LOG(rc); + return rc; + } + nprocs = (size_t) _nprocs; + cur_rank = 0; } else { nprocs = 1; cur_rank = rank; @@ -1219,9 +1237,6 @@ int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value data_seg = elem->data_seg; while (nprocs--) { - if (PMIX_RANK_UNDEF == rank) { - cur_rank++; - } /* Get the rank meta info in the shared meta segment. */ rinfo = _get_rank_meta_info(cur_rank, meta_seg); if (NULL == rinfo) { @@ -1319,6 +1334,10 @@ int _esh_fetch(const char *nspace, pmix_rank_t rank, const char *key, pmix_value kval_cnt--; } } + + if (PMIX_RANK_UNDEF == rank) { + cur_rank++; + } } done: @@ -2171,7 +2190,7 @@ static size_t put_data_to_the_end(ns_track_elem_t *ns_info, seg_desc_t *dataseg, static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t *kval, rank_meta_info **rinfo, int data_exist) { size_t offset, size, kval_cnt; - pmix_buffer_t *buffer; + pmix_buffer_t buffer; pmix_status_t rc; seg_desc_t *datadesc; uint8_t *addr; @@ -2182,24 +2201,23 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t datadesc = ns_info->data_seg; /* pack value to the buffer */ - buffer = PMIX_NEW(pmix_buffer_t); - if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(buffer, kval->value, 1, PMIX_VALUE))) { - PMIX_RELEASE(buffer); + PMIX_CONSTRUCT(&buffer, pmix_buffer_t); + if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(&buffer, kval->value, 1, PMIX_VALUE))) { PMIX_ERROR_LOG(rc); - return rc; + goto exit; } - size = buffer->bytes_used; + size = buffer.bytes_used; if (0 == data_exist) { /* there is no data blob for this rank yet, so add it. */ size_t free_offset; free_offset = get_free_offset(datadesc); - offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer->base_ptr, size); + offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer.base_ptr, size); if (0 == offset) { /* this is an error */ - PMIX_RELEASE(buffer); - PMIX_ERROR_LOG(PMIX_ERROR); - return PMIX_ERROR; + rc = PMIX_ERROR; + PMIX_ERROR_LOG(rc); + goto exit; } /* if it's the first time when we put data for this rank, then *rinfo == NULL, * and even if segment was extended, and data was put into the next segment, @@ -2225,9 +2243,9 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t /* there is data blob for this rank */ addr = _get_data_region_by_offset(datadesc, (*rinfo)->offset); if (NULL == addr) { - PMIX_RELEASE(buffer); - PMIX_ERROR_LOG(PMIX_ERROR); - return rc; + rc = PMIX_ERROR; + PMIX_ERROR_LOG(rc); + goto exit; } /* go through previous data region and find key matches. * If one is found, then mark this kval as invalidated. @@ -2254,9 +2272,9 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t /* go to next item, updating address */ addr = _get_data_region_by_offset(datadesc, offset); if (NULL == addr) { - PMIX_RELEASE(buffer); - PMIX_ERROR_LOG(PMIX_ERROR); - return rc; + rc = PMIX_ERROR; + PMIX_ERROR_LOG(rc); + goto exit; } } else { /* should not be, we should be out of cycle when this happens */ @@ -2284,7 +2302,7 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t __FILE__, __LINE__, __func__, rank, data_exist, kval->key, kval->value->type)); /* replace old data with new one. */ memset(ESH_DATA_PTR(addr), 0, ESH_DATA_SIZE(addr, ESH_DATA_PTR(addr))); - memcpy(ESH_DATA_PTR(addr), buffer->base_ptr, size); + memcpy(ESH_DATA_PTR(addr), buffer.base_ptr, size); addr += ESH_KV_SIZE(addr); add_to_the_end = 0; break; @@ -2310,11 +2328,11 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t (*rinfo)->count++; free_offset = get_free_offset(datadesc); /* add to the end */ - offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer->base_ptr, size); + offset = put_data_to_the_end(ns_info, datadesc, kval->key, buffer.base_ptr, size); if (0 == offset) { - PMIX_RELEASE(buffer); - PMIX_ERROR_LOG(PMIX_ERROR); - return PMIX_ERROR; + rc = PMIX_ERROR; + PMIX_ERROR_LOG(rc); + goto exit; } /* we just reached the end of data for the target rank, and there can be two cases: * (1) - we are in the middle of data segment; data for this rank is separated from @@ -2343,9 +2361,8 @@ static int pmix_sm_store(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix_kval_t __FILE__, __LINE__, __func__, rank, data_exist, kval->key)); } } - buffer->base_ptr = NULL; - buffer->bytes_used = 0; - PMIX_RELEASE(buffer); +exit: + PMIX_DESTRUCT(&buffer); return rc; } @@ -2446,26 +2463,23 @@ static int _store_data_for_rank(ns_track_elem_t *ns_info, pmix_rank_t rank, pmix return rc; } -static inline uint32_t _get_univ_size(const char *nspace) +static inline ssize_t _get_univ_size(const char *nspace) { - pmix_value_t *val = NULL; - uint32_t nprocs = 0; - pmix_nspace_t *ns, *nptr; + ssize_t nprocs = 0; + pmix_value_t *val; + int rc; - nptr = NULL; - PMIX_LIST_FOREACH(ns, &pmix_globals.nspaces, pmix_nspace_t) { - if (0 == strcmp(nspace, ns->nspace)) { - nptr = ns; - break; - } + rc = _esh_fetch(nspace, PMIX_RANK_WILDCARD, PMIX_UNIV_SIZE, &val); + if( PMIX_SUCCESS != rc ) { + PMIX_ERROR_LOG(rc); + return rc; } - - if (nptr && (PMIX_SUCCESS == pmix_hash_fetch(&nptr->internal, PMIX_RANK_WILDCARD, PMIX_UNIV_SIZE, &val))) { - if (val->type == PMIX_UINT32) { - nprocs = val->data.uint32; - } - PMIX_VALUE_RELEASE(val); + if( val->type != PMIX_UINT32 ){ + rc = PMIX_ERR_BAD_PARAM; + PMIX_ERROR_LOG(rc); + return rc; } - + nprocs = (ssize_t)val->data.uint32; + PMIX_VALUE_RELEASE(val); return nprocs; } diff --git a/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.h b/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.h index 3e533817fc..dd588d64db 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.h +++ b/opal/mca/pmix/pmix2x/pmix/src/dstore/pmix_esh.h @@ -1,7 +1,8 @@ /* * Copyright (c) 2015-2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. + * Copyright (c) 2017 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -114,6 +115,7 @@ typedef struct { size_t num_data_seg; seg_desc_t *meta_seg; seg_desc_t *data_seg; + bool in_use; } ns_track_elem_t; extern pmix_dstore_base_module_t pmix_dstore_esh_module; diff --git a/opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_notification.c b/opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_notification.c index bf39c43dea..9e1062be61 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_notification.c +++ b/opal/mca/pmix/pmix2x/pmix/src/event/pmix_event_notification.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/align.h b/opal/mca/pmix/pmix2x/pmix/src/include/align.h index d5cbbfeffe..e55c303603 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/align.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/align.h @@ -12,7 +12,6 @@ * Copyright (c) 2006 Voltaire All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h b/opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h index 27273c48d8..a079f793ca 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/hash_string.h @@ -2,7 +2,6 @@ * Copyright (c) 2004-2007 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h index 5e4ff40964..725a6c7c36 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_config_top.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2015 Intel, Inc. All rights reserved * Copyright (c) 2016 IBM Corporation. All rights reserved. * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_jobdata.h b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_jobdata.h index b8318f9c46..f8a61a656f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_jobdata.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_jobdata.h @@ -1,7 +1,6 @@ /* * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h index 788f6e50d1..2b7ecb506c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/pmix_socket_errno.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/include/prefetch.h b/opal/mca/pmix/pmix2x/pmix/src/include/prefetch.h index 725c3687dd..78fc3f49ae 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/include/prefetch.h +++ b/opal/mca/pmix/pmix2x/pmix/src/include/prefetch.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am index da006f7788..948d687eed 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/Makefile.am @@ -10,7 +10,6 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2010-2016 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt b/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt index 2f90456c09..c0b8251076 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-base.txt @@ -11,7 +11,6 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt b/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt index 23ed149b02..b306c31ff9 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/help-mca-var.txt @@ -13,7 +13,6 @@ # Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c index cc8dfc497e..e4c9507069 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/base/pmix_mca_base_component_compare.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -149,3 +149,4 @@ char * pmix_mca_base_component_to_string(const pmix_mca_base_component_t *a) { } return str; } + diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am index 735036e567..fdd56a8e2e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/Makefile.am @@ -3,7 +3,6 @@ # University Research and Technology # Corporation. All rights reserved. # Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am index ffa50be601..efc770a274 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/Makefile.am @@ -1,6 +1,5 @@ # # Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c index 3d8a24a817..e42db673be 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/base/pdl_base_select.c @@ -4,7 +4,6 @@ * All rights reserved. * * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h index b5fa1136a9..e34ac5bd6b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdl.h @@ -3,7 +3,6 @@ * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am index 0e8bd27766..c2811eecd8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/Makefile.am @@ -2,7 +2,6 @@ # Copyright (c) 2004-2010 The Trustees of Indiana University. # All rights reserved. # Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/configure.m4 index 3eea7d5615..2a046e93d8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/configure.m4 @@ -4,7 +4,6 @@ # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c index 6cccfaeffe..8e061d5ca9 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pdl/pdlopen/pdl_pdlopen_component.c @@ -3,7 +3,6 @@ * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am index 64b212e0f9..f444a5ca9b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/Makefile.am @@ -1,6 +1,5 @@ # # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c index e7f2a1e734..9157d54661 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv4/pif_bsdx.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c index 1b3699d9cd..2dac2550d3 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/bsdx_ipv6/pif_bsdx_ipv6.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c index 911a09070f..2f240f9d8a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/linux_ipv6/pif_linux_ipv6.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c index f6ea0b38a4..3c2e4603a6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pif/posix_ipv4/pif_posix.c @@ -4,7 +4,7 @@ * Copyright (c) 2013 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am index 29055b0284..1617f5688c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/base/Makefile.am @@ -1,7 +1,6 @@ # # Copyright (c) 2006 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4 index 562ad7f4f7..2f652e9c66 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/configure.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2006 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ @@ -29,3 +29,4 @@ AC_DEFUN([MCA_pmix_pinstalldirs_config_CONFIG],[ AC_CONFIG_FILES([src/mca/pinstalldirs/config/Makefile src/mca/pinstalldirs/config/pinstall_dirs.h]) ]) + diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am index 0e03ed2e0a..61471d1392 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/Makefile.am @@ -3,7 +3,6 @@ # reserved. # Copyright (c) 2009 High Performance Computing Center Stuttgart, # University of Stuttgart. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 index 600897a0a4..3fa7fa7674 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/env/configure.m4 @@ -3,7 +3,7 @@ # Copyright (c) 2006 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2016-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2016 Intel, Inc. All rights reserved # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ @@ -27,3 +27,4 @@ AC_DEFUN([MCA_pmix_pinstalldirs_env_COMPILE_MODE], [ AC_DEFUN([MCA_pmix_pinstalldirs_env_CONFIG], [ AC_CONFIG_FILES([src/mca/pinstalldirs/env/Makefile]) ]) + diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am index e7e0e8d35f..9a078f0244 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include index 20f030174d..a45c86fd0b 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/Makefile.include @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/base.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/base.h index 082b4bf9a0..7ed16e4787 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/base.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/base.h @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.c index 4ce0f0b93f..3572fdf8e8 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_fns.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. * diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c index b0890ff6b3..0dd5410dae 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_frame.c @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c index 83149ea0ef..f751146948 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/base/pnet_base_select.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am index 637a93ef00..1f663e8711 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/Makefile.am @@ -11,7 +11,7 @@ # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 index a1864a9a17..4d6d109a9d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/configure.m4 @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013 Sandia National Laboratories. All rights reserved. -# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2014-2016 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h index 5e714169f4..278c894863 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c index 8098d89cdb..7d07c400f6 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/opa/pnet_opa_component.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h index f3d02bccc7..dedb1eb63f 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/pnet/pnet.h @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/base.h b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/base.h index df720e48d4..fde87baf78 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/base.h +++ b/opal/mca/pmix/pmix2x/pmix/src/mca/psec/base/base.h @@ -11,7 +11,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/runtime/help-pmix-runtime.txt b/opal/mca/pmix/pmix2x/pmix/src/runtime/help-pmix-runtime.txt index 53021d855e..01b5a84227 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/runtime/help-pmix-runtime.txt +++ b/opal/mca/pmix/pmix2x/pmix/src/runtime/help-pmix-runtime.txt @@ -12,7 +12,6 @@ # All rights reserved. # Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. # Copyright (c) 2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_finalize.c b/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_finalize.c index 7af883a8b0..12843a02f5 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_finalize.c +++ b/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_finalize.c @@ -12,7 +12,7 @@ * Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010-2015 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_init.c b/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_init.c index 4060d8a02b..d46ddf337d 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_init.c +++ b/opal/mca/pmix/pmix2x/pmix/src/runtime/pmix_init.c @@ -15,7 +15,7 @@ * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2010-2015 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server.c b/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server.c index e7383ad917..6d3eee90a4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server.c +++ b/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2016 Research Organization for Information Science + * Copyright (c) 2014-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Artem Y. Polyakov . * All rights reserved. @@ -242,6 +242,8 @@ static void cleanup_server_state(void) PMIX_LIST_DESTRUCT(&pmix_server_globals.remote_pnd); PMIX_LIST_DESTRUCT(&pmix_server_globals.local_reqs); PMIX_DESTRUCT(&pmix_server_globals.gdata); + PMIX_DESTRUCT(&pmix_server_globals.notifications); + PMIX_LIST_DESTRUCT(&pmix_server_globals.events); if (NULL != security_mode) { free(security_mode); @@ -271,6 +273,10 @@ PMIX_EXPORT pmix_status_t PMIx_server_finalize(void) cleanup_server_state(); pmix_output_verbose(2, pmix_globals.debug_output, "pmix:server finalize complete"); + + /* finalize the class/object system */ + pmix_class_finalize(); + return PMIX_SUCCESS; } @@ -1702,7 +1708,7 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata) { pmix_shift_caddy_t *scd = (pmix_shift_caddy_t*)cbdata; pmix_server_trkr_t *tracker = scd->tracker; - pmix_buffer_t xfer, *bptr, *databuf, *bpscope, *reply; + pmix_buffer_t xfer, *bptr, *databuf=NULL, *bpscope, *reply; pmix_nspace_t *nptr, *ns; pmix_server_caddy_t *cd; char *nspace; @@ -1775,6 +1781,7 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata) */ pmix_output_verbose(8, pmix_globals.debug_output, "modex_cbfunc: unknown nspace %s, Fence ", nspace); + free(nspace); /* * TODO: if some namespaces are OK and the bad one is not the first * the server is in inconsistent state. Should we rely on the client to abort @@ -1783,6 +1790,7 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata) rc = PMIX_ERR_INVALID_NAMESPACE; goto finish_collective; } + free(nspace); /* unpack the rank */ cnt = 1; @@ -1841,6 +1849,9 @@ static void _mdxcbfunc(int sd, short argc, void *cbdata) } finish_collective: + if(NULL != databuf) { + PMIX_RELEASE(databuf); + } /* setup the reply, starting with the returned status */ reply = PMIX_NEW(pmix_buffer_t); if (PMIX_SUCCESS != (rc = pmix_bfrop.pack(reply, &rc, 1, PMIX_STATUS))) { diff --git a/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.c b/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.c index 23bb4cd89c..cb30a13a3c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.c +++ b/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.c @@ -1,7 +1,7 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2016 Research Organization for Information Science + * Copyright (c) 2014-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2015 Artem Y. Polyakov . * All rights reserved. @@ -555,7 +555,6 @@ pmix_status_t pmix_server_fence(pmix_server_caddy_t *cd, /* add this contributor to the tracker so they get * notified when we are done */ - PMIX_RETAIN(cd); pmix_list_append(&trk->local_cbs, &cd->super); /* if all local contributions have been received, * let the local host's server know that we are at the @@ -991,6 +990,7 @@ pmix_status_t pmix_server_connect(pmix_server_caddy_t *cd, cleanup: PMIX_PROC_FREE(procs, nprocs); PMIX_INFO_FREE(info, ninfo); + PMIX_RELEASE(cd); return rc; } diff --git a/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.h b/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.h index d81bbfed6b..f8547c779c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.h +++ b/opal/mca/pmix/pmix2x/pmix/src/server/pmix_server_ops.h @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved * Copyright (c) 2015 Artem Y. Polyakov . * All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. diff --git a/opal/mca/pmix/pmix2x/pmix/src/sm/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/sm/Makefile.include index 5f0734d1d3..9ce63027d2 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/sm/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/sm/Makefile.include @@ -1,7 +1,6 @@ # # Copyright (c) 2016 Mellanox Technologies, Inc. # All rights reserved. -# Copyright (c) 2017 Intel, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.c b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.c index bc5ec511c6..3c9499ab6c 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.c +++ b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.c @@ -3,7 +3,6 @@ * All rights reserved. * Copyright (c) 2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.h b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.h index 1070ce6822..349fb10c01 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.h +++ b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_mmap.h @@ -1,7 +1,6 @@ /* * Copyright (c) 2015-2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.c b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.c index 027600998e..26769267d0 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.c +++ b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2015-2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.h b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.h index b3713d3fd2..4e2495950a 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.h +++ b/opal/mca/pmix/pmix2x/pmix/src/sm/pmix_sm.h @@ -1,7 +1,6 @@ /* * Copyright (c) 2015-2016 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include b/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include index 0e8a6fc10f..1a4065dd32 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include +++ b/opal/mca/pmix/pmix2x/pmix/src/util/Makefile.include @@ -12,7 +12,7 @@ # All rights reserved. # Copyright (c) 2007-2016 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2013 NVIDIA Corporation. All rights reserved. -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c b/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c index 74aab4fbfc..87e0e85172 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/alfg.c @@ -3,7 +3,7 @@ * All rights reserved. * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/basename.c b/opal/mca/pmix/pmix2x/pmix/src/util/basename.c index aa876644b1..64e5c27e7e 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/basename.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/basename.c @@ -12,7 +12,7 @@ * Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2014 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/basename.h b/opal/mca/pmix/pmix2x/pmix/src/util/basename.h index 580a820a90..55d29413b4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/basename.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/basename.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/compress.c b/opal/mca/pmix/pmix2x/pmix/src/util/compress.c index f845c681e3..867a3d5e57 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/compress.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/compress.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2016 Intel, Inc. All rights reserved. - * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/getid.c b/opal/mca/pmix/pmix2x/pmix/src/util/getid.c index 15b688889c..f3ad8a9dd4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/getid.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/getid.c @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/getid.h b/opal/mca/pmix/pmix2x/pmix/src/util/getid.h index c951a3acc0..871eb6a259 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/getid.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/getid.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,3 +28,4 @@ pmix_status_t pmix_util_getid(int sd, uid_t *uid, gid_t *gid); END_C_DECLS #endif /* PMIX_PRINTF_H */ + diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/hash.c b/opal/mca/pmix/pmix2x/pmix/src/util/hash.c index 9aa767eb39..ba479ab335 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/hash.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/hash.c @@ -6,7 +6,7 @@ * reserved. * Copyright (c) 2011-2014 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014-2017 Intel, 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 (c) 2016 Mellanox Technologies, Inc. diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/hash.h b/opal/mca/pmix/pmix2x/pmix/src/util/hash.h index 8cd219a94a..6b385b2710 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/hash.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/hash.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2012 Los Alamos National Security, Inc. All rights reserved. - * Copyright (c) 2014-2017 Intel, 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$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l index 49a49fc09f..9b9d0d6d14 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l +++ b/opal/mca/pmix/pmix2x/pmix/src/util/keyval/keyval_lex.l @@ -16,7 +16,6 @@ * All rights reserved. * Copyright (c) 2012 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/net.c b/opal/mca/pmix/pmix2x/pmix/src/util/net.c index 0bbc846f54..b074a14dfa 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/net.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/net.c @@ -12,7 +12,7 @@ * Copyright (c) 2007 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/output.h b/opal/mca/pmix/pmix2x/pmix/src/util/output.h index 8e6a24081c..52a452a175 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/output.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/output.h @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ @@ -567,3 +567,4 @@ PMIX_CLASS_DECLARATION(pmix_output_stream_t); END_C_DECLS #endif /* PMIX_OUTPUT_H_ */ + diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c b/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c index ce706b70da..9587a464d2 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.c @@ -12,7 +12,7 @@ * Copyright (c) 2006 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2016 Intel, Inc. All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved. * $COPYRIGHT$ * @@ -237,3 +237,4 @@ const char* pmix_home_directory( void ) return home; } + diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.h b/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.h index 5f2c5208b2..f6ec9c95b2 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/pmix_environ.h @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2007-2013 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved. diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/printf.c b/opal/mca/pmix/pmix2x/pmix/src/util/printf.c index 805d600828..410c952154 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/printf.c +++ b/opal/mca/pmix/pmix2x/pmix/src/util/printf.c @@ -10,7 +10,7 @@ * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/printf.h b/opal/mca/pmix/pmix2x/pmix/src/util/printf.h index 8724a218c7..f4ab098596 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/printf.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/printf.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -129,3 +129,4 @@ int pmix_vasprintf(char **ptr, const char *fmt, va_list ap) __pmix_attribute_fo END_C_DECLS #endif /* PMIX_PRINTF_H */ + diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h b/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h index 9c4f39fea3..d09cc1c5c4 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/strnlen.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,3 +35,4 @@ #endif #endif /* PMIX_STRNLEN_H */ + diff --git a/opal/mca/pmix/pmix2x/pmix/src/util/timings.h b/opal/mca/pmix/pmix2x/pmix/src/util/timings.h index 1e732c8a7b..06dc993c05 100644 --- a/opal/mca/pmix/pmix2x/pmix/src/util/timings.h +++ b/opal/mca/pmix/pmix2x/pmix/src/util/timings.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2014 Artem Polyakov - * Copyright (c) 2014-2017 Intel, 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$ diff --git a/opal/mca/pmix/pmix2x/pmix/test/Makefile.am b/opal/mca/pmix/pmix2x/pmix/test/Makefile.am index 651d3cfd4e..71da45a1e1 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/Makefile.am +++ b/opal/mca/pmix/pmix2x/pmix/test/Makefile.am @@ -11,7 +11,7 @@ # All rights reserved. # Copyright (c) 2006-2010 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. -# Copyright (c) 2013-2017 Intel, Inc. All rights reserved. +# Copyright (c) 2013-2016 Intel, Inc. All rights reserved # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/cli_stages.c b/opal/mca/pmix/pmix2x/pmix/test/cli_stages.c index 65286291c7..c69aecbf3e 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/cli_stages.c +++ b/opal/mca/pmix/pmix2x/pmix/test/cli_stages.c @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ @@ -274,3 +274,4 @@ void errhandler_reg_callbk (pmix_status_t status, TEST_VERBOSE(("ERRHANDLER REGISTRATION CALLBACK CALLED WITH STATUS %d, ref=%lu", status, (unsigned long)errhandler_ref)); } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/cli_stages.h b/opal/mca/pmix/pmix2x/pmix/test/cli_stages.h index 3b3dfffae8..484b09c8be 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/cli_stages.h +++ b/opal/mca/pmix/pmix2x/pmix/test/cli_stages.h @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * $COPYRIGHT$ @@ -75,3 +75,5 @@ void op_callbk(pmix_status_t status, void errhandler_reg_callbk (pmix_status_t status, size_t errhandler_ref, void *cbdata); + + diff --git a/opal/mca/pmix/pmix2x/pmix/test/pmix_client.c b/opal/mca/pmix/pmix2x/pmix/test/pmix_client.c index 87e13c2678..53c7117263 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/pmix_client.c +++ b/opal/mca/pmix/pmix2x/pmix/test/pmix_client.c @@ -13,7 +13,7 @@ * All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015-2017 Mellanox Technologies, Inc. All rights reserved. * $COPYRIGHT$ * diff --git a/opal/mca/pmix/pmix2x/pmix/test/pmix_regex.c b/opal/mca/pmix/pmix2x/pmix/test/pmix_regex.c index d1fa14bb31..027f6fc5a3 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/pmix_regex.c +++ b/opal/mca/pmix/pmix2x/pmix/test/pmix_regex.c @@ -13,7 +13,7 @@ * All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -87,3 +87,4 @@ int main(int argc, char **argv) return 0; } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/pmix_test.c b/opal/mca/pmix/pmix2x/pmix/test/pmix_test.c index 036f70aa63..6969c55f5d 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/pmix_test.c +++ b/opal/mca/pmix/pmix2x/pmix/test/pmix_test.c @@ -13,7 +13,7 @@ * All rights reserved. * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. @@ -203,3 +203,4 @@ int main(int argc, char **argv) return test_fail; } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/simple/test_pmix.c b/opal/mca/pmix/pmix2x/pmix/test/simple/test_pmix.c index 6bfa3d793d..8ecf6c1f6b 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/simple/test_pmix.c +++ b/opal/mca/pmix/pmix2x/pmix/test/simple/test_pmix.c @@ -5,63 +5,63 @@ int main(int argc, char **argv) { - pmix_proc_t myproc; - pmix_status_t rc; + pmix_proc_t myproc; + pmix_status_t rc; - int rank; - rc = PMIx_Init(&myproc, NULL, 0); - assert(PMIX_SUCCESS == rc); + int rank; + rc = PMIx_Init(&myproc, NULL, 0); + assert(PMIX_SUCCESS == rc); - { - pmix_value_t *value; - rc = PMIx_Get(&myproc, PMIX_RANK, NULL, 0, &value); - assert(PMIX_SUCCESS == rc); - printf("%d\n", value->type); - assert(value->type == PMIX_INT); - rank = value->data.uint32; - PMIX_VALUE_RELEASE(value); - } + { + pmix_value_t *value; + rc = PMIx_Get(&myproc, PMIX_RANK, NULL, 0, &value); + assert(PMIX_SUCCESS == rc); + printf("%d\n", value->type); + assert(value->type == PMIX_INT); + rank = value->data.uint32; + PMIX_VALUE_RELEASE(value); + } - if (rank == 0 ) { - pmix_info_t *info; - PMIX_INFO_CREATE(info, 1); - snprintf(info[0].key, PMIX_MAX_KEYLEN, "magic-found"); - info[0].value.type = PMIX_STRING; - info[0].value.data.string = "yes"; - rc = PMIx_Publish(info, 1); - assert(PMIX_SUCCESS == rc); - } + if (rank == 0 ) { + pmix_info_t *info; + PMIX_INFO_CREATE(info, 1); + snprintf(info[0].key, PMIX_MAX_KEYLEN, "magic-found"); + info[0].value.type = PMIX_STRING; + info[0].value.data.string = "yes"; + rc = PMIx_Publish(info, 1); + assert(PMIX_SUCCESS == rc); + } - printf("I am rank %d\n", rank); + printf("I am rank %d\n", rank); - { - bool flag; - pmix_info_t *info; - PMIX_INFO_CREATE(info, 1); - flag = true; - PMIX_INFO_LOAD(info, PMIX_COLLECT_DATA, &flag, PMIX_BOOL); - rc = PMIx_Fence(&myproc, 1, info, 1); - assert(PMIX_SUCCESS == rc); - PMIX_INFO_FREE(info, 1); - } + { + bool flag; + pmix_info_t *info; + PMIX_INFO_CREATE(info, 1); + flag = true; + PMIX_INFO_LOAD(info, PMIX_COLLECT_DATA, &flag, PMIX_BOOL); + rc = PMIx_Fence(&myproc, 1, info, 1); + assert(PMIX_SUCCESS == rc); + PMIX_INFO_FREE(info, 1); + } - if (rank == 1) { - int i; - pmix_pdata_t *pdata; - PMIX_PDATA_CREATE(pdata, 2); - snprintf(pdata[0].key, PMIX_MAX_KEYLEN, "magic-found"); - snprintf(pdata[1].key, PMIX_MAX_KEYLEN, "magic-not-found"); - rc = PMIx_Lookup(&pdata[0], 2, NULL, 0); - assert((PMIX_SUCCESS == rc) || (PMIX_ERR_NOT_FOUND == rc)); - for ( i = 0 ; i < 2 ; i++ ) - if (pdata[i].value.type == PMIX_STRING) - printf("Found[%d] %d %s\n", i, pdata[i].value.type, pdata[i].value.data.string); - else - printf("Found[%d] %d\n", i, pdata[i].value.type); - PMIX_PDATA_FREE(pdata, 1); - } + if (rank == 1) { + int i; + pmix_pdata_t *pdata; + PMIX_PDATA_CREATE(pdata, 2); + snprintf(pdata[0].key, PMIX_MAX_KEYLEN, "magic-found"); + snprintf(pdata[1].key, PMIX_MAX_KEYLEN, "magic-not-found"); + rc = PMIx_Lookup(&pdata[0], 2, NULL, 0); + assert((PMIX_SUCCESS == rc) || (PMIX_ERR_NOT_FOUND == rc)); + for ( i = 0 ; i < 2 ; i++ ) + if (pdata[i].value.type == PMIX_STRING) + printf("Found[%d] %d %s\n", i, pdata[i].value.type, pdata[i].value.data.string); + else + printf("Found[%d] %d\n", i, pdata[i].value.type); + PMIX_PDATA_FREE(pdata, 1); + } - rc = PMIx_Finalize(NULL, 0); - assert(PMIX_SUCCESS == rc); + rc = PMIx_Finalize(NULL, 0); + assert(PMIX_SUCCESS == rc); } diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_cd.c b/opal/mca/pmix/pmix2x/pmix/test/test_cd.c index 52b69ba031..9bd409a557 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_cd.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_cd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -92,3 +92,4 @@ int test_connect_disconnect(char *my_nspace, int my_rank) TEST_VERBOSE(("%s:%d: Disconnect non-blocking test succeded.", my_nspace, my_rank)); return PMIX_SUCCESS; } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_cd.h b/opal/mca/pmix/pmix2x/pmix/test/test_cd.h index c35b509f47..d4e789102f 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_cd.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_cd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_common.c b/opal/mca/pmix/pmix2x/pmix/test/test_common.c index e3de6bde18..f5463d500a 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_common.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Artem Y. Polyakov . * All rights reserved. * Copyright (c) 2015-2017 Mellanox Technologies, Inc. @@ -631,3 +631,4 @@ int get_all_ranks_from_namespace(test_params params, char *nspace, pmix_proc_t * } return PMIX_SUCCESS; } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_common.h b/opal/mca/pmix/pmix2x/pmix/test/test_common.h index 3593eca781..9873c1b4d0 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_common.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2013-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Artem Y. Polyakov . * All rights reserved. * Copyright (c) 2015 Research Organization for Information Science diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_error.h b/opal/mca/pmix/pmix2x/pmix/test/test_error.h index 5085378339..ed17831a08 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_error.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_error.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_fence.c b/opal/mca/pmix/pmix2x/pmix/test/test_fence.c index e7c0a086be..a738e40cac 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_fence.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_fence.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2016 Intel, Inc. All rights reserved. * Copyright (c) 2015-2017 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ @@ -434,3 +434,4 @@ int test_job_fence(test_params params, char *my_nspace, pmix_rank_t my_rank) } return PMIX_SUCCESS; } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_internal.c b/opal/mca/pmix/pmix2x/pmix/test/test_internal.c index f9e2238dd2..3f76f3cfaf 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_internal.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_internal.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2017 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_internal.h b/opal/mca/pmix/pmix2x/pmix/test/test_internal.h index 3ed71db5d8..6d6095254c 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_internal.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_internal.h @@ -1,7 +1,6 @@ /* * Copyright (c) 2017 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_publish.c b/opal/mca/pmix/pmix2x/pmix/test/test_publish.c index bf00cdc508..86f799bdea 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_publish.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_publish.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ @@ -193,3 +193,4 @@ int test_publish_lookup(char *my_nspace, int my_rank) } return PMIX_SUCCESS; } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_publish.h b/opal/mca/pmix/pmix2x/pmix/test/test_publish.h index 98ac242bc1..bd436b8a3c 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_publish.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_publish.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_replace.c b/opal/mca/pmix/pmix2x/pmix/test/test_replace.c index 523c96445d..4bcd5d2ca0 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_replace.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_replace.c @@ -1,7 +1,6 @@ /* * Copyright (c) 2017 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_replace.h b/opal/mca/pmix/pmix2x/pmix/test/test_replace.h index e91f13ca61..0d9ddef577 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_replace.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_replace.h @@ -1,7 +1,6 @@ /* * Copyright (c) 2017 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.c b/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.c index 727f5d9b22..e9582cb0df 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.h b/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.h index 185285e71a..d92883610e 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_resolve_peers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c b/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c index 2d7dfc4c17..4168319ca7 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c +++ b/opal/mca/pmix/pmix2x/pmix/test/test_spawn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015-2016 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ @@ -84,3 +84,4 @@ int test_spawn(char *my_nspace, int my_rank) TEST_VERBOSE(("%s:%d: Spawn non-blocking test succeded.", my_nspace, my_rank)); return PMIX_SUCCESS; } + diff --git a/opal/mca/pmix/pmix2x/pmix/test/test_spawn.h b/opal/mca/pmix/pmix2x/pmix/test/test_spawn.h index c7828e543b..d074be2a3b 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/test_spawn.h +++ b/opal/mca/pmix/pmix2x/pmix/test/test_spawn.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$ diff --git a/opal/mca/pmix/pmix2x/pmix/test/utils.c b/opal/mca/pmix/pmix2x/pmix/test/utils.c index 895025e6e3..dfcd285aa5 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/utils.c +++ b/opal/mca/pmix/pmix2x/pmix/test/utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015-2017 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2016 Research Organization for Information Science diff --git a/opal/mca/pmix/pmix2x/pmix/test/utils.h b/opal/mca/pmix/pmix2x/pmix/test/utils.h index f607cf95c2..bbeebaa2f7 100644 --- a/opal/mca/pmix/pmix2x/pmix/test/utils.h +++ b/opal/mca/pmix/pmix2x/pmix/test/utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. * $COPYRIGHT$