diff --git a/opal/mca/pmix/pmix2x/pmix/README b/opal/mca/pmix/pmix2x/pmix/README index 3b435f1d66..60df07dc77 100644 --- a/opal/mca/pmix/pmix2x/pmix/README +++ b/opal/mca/pmix/pmix2x/pmix/README @@ -269,7 +269,7 @@ PMIx provides forward ABI compatibility in all versions of a given feature release series and its corresponding super stable series. For example, on a single platform, an pmix application linked against PMIx v1.3.2 shared libraries can be -updated to point to the shared libraries in any successive v1.2.x or +updated to point to the shared libraries in any successive v1.3.x or v1.4 release and still work properly (e.g., via the LD_LIBRARY_PATH environment variable or other operating system mechanism). diff --git a/opal/mca/pmix/pmix2x/pmix/VERSION b/opal/mca/pmix/pmix2x/pmix/VERSION index 8b3aadd77a..9602917ea8 100644 --- a/opal/mca/pmix/pmix2x/pmix/VERSION +++ b/opal/mca/pmix/pmix2x/pmix/VERSION @@ -30,7 +30,7 @@ greek= # command, or with the date (if "git describe" fails) in the form of # "date". -repo_rev=git211a0ef +repo_rev=gitc8f26f9 # 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="Dec 01, 2016" +date="Dec 02, 2016" # 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/pmix.m4 b/opal/mca/pmix/pmix2x/pmix/config/pmix.m4 index 8013167e2d..2b4b4a2a81 100644 --- a/opal/mca/pmix/pmix2x/pmix/config/pmix.m4 +++ b/opal/mca/pmix/pmix2x/pmix/config/pmix.m4 @@ -278,7 +278,7 @@ AC_DEFUN([PMIX_SETUP_CORE],[ # fails # - checks for __inline__, which then emits no error, and works # - # This also works nicely for gcc 2.x because "inline" will work on + # This also works nicely for gcc 3.x because "inline" will work on # the first check, and all is fine. :-) PMIX_CFLAGS_save=$CFLAGS diff --git a/opal/mca/pmix/pmix2x/pmix/include/pmix_rename.h b/opal/mca/pmix/pmix2x/pmix/include/pmix_rename.h deleted file mode 100644 index c3e3e40419..0000000000 --- a/opal/mca/pmix/pmix2x/pmix/include/pmix_rename.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2016 Intel, Inc. All rights reserved - * Copyright (c) 2016 Research Organization for Information Science - * and Technology (RIST). All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#ifndef PMIX_RENAME_H -#define PMIX_RENAME_H - -#define PMIx_Init OPAL_MCA_PMIX3X_PMIx_Init -#define PMIx_Initialized OPAL_MCA_PMIX3X_PMIx_Initialized -#define PMIx_Finalize OPAL_MCA_PMIX3X_PMIx_Finalize -#define PMIx_Abort OPAL_MCA_PMIX3X_PMIx_Abort -#define PMIx_Put OPAL_MCA_PMIX3X_PMIx_Put -#define PMIx_Commit OPAL_MCA_PMIX3X_PMIx_Commit -#define PMIx_Fence OPAL_MCA_PMIX3X_PMIx_Fence -#define PMIx_Fence_nb OPAL_MCA_PMIX3X_PMIx_Fence_nb -#define PMIx_Get OPAL_MCA_PMIX3X_PMIx_Get -#define PMIx_Get_nb OPAL_MCA_PMIX3X_PMIx_Get_nb -#define PMIx_Publish OPAL_MCA_PMIX3X_PMIx_Publish -#define PMIx_Publish_nb OPAL_MCA_PMIX3X_PMIx_Publish_nb -#define PMIx_Lookup OPAL_MCA_PMIX3X_PMIx_Lookup -#define PMIx_Lookup_nb OPAL_MCA_PMIX3X_PMIx_Lookup_nb -#define PMIx_Unpublish OPAL_MCA_PMIX3X_PMIx_Unpublish -#define PMIx_Unpublish_nb OPAL_MCA_PMIX3X_PMIx_Unpublish_nb -#define PMIx_Spawn OPAL_MCA_PMIX3X_PMIx_Spawn -#define PMIx_Spawn_nb OPAL_MCA_PMIX3X_PMIx_Spawn_nb -#define PMIx_Connect OPAL_MCA_PMIX3X_PMIx_Connect -#define PMIx_Connect_nb OPAL_MCA_PMIX3X_PMIx_Connect_nb -#define PMIx_Disconnect OPAL_MCA_PMIX3X_PMIx_Disconnect -#define PMIx_Disconnect_nb OPAL_MCA_PMIX3X_PMIx_Disconnect_nb -#define PMIx_Resolve_peers OPAL_MCA_PMIX3X_PMIx_Resolve_peers -#define PMIx_Resolve_nodes OPAL_MCA_PMIX3X_PMIx_Resolve_nodes -#define PMIx_Query_info_nb OPAL_MCA_PMIX3X_PMIx_Query_info_nb -#define PMIx_Log_nb OPAL_MCA_PMIX3X_PMIx_Log_nb - -#define PMIx_server_init OPAL_MCA_PMIX3X_PMIx_server_init -#define PMIx_server_finalize OPAL_MCA_PMIX3X_PMIx_server_finalize -#define PMIx_generate_regex OPAL_MCA_PMIX3X_PMIx_generate_regex -#define PMIx_generate_ppn OPAL_MCA_PMIX3X_PMIx_generate_ppn -#define PMIx_server_register_nspace OPAL_MCA_PMIX3X_PMIx_server_register_nspace -#define PMIx_server_deregister_nspace OPAL_MCA_PMIX3X_PMIx_server_deregister_nspace -#define PMIx_server_register_client OPAL_MCA_PMIX3X_PMIx_server_register_client -#define PMIx_server_deregister_client OPAL_MCA_PMIX3X_PMIx_server_deregister_client -#define PMIx_server_setup_fork OPAL_MCA_PMIX3X_PMIx_server_setup_fork -#define PMIx_server_dmodex_request OPAL_MCA_PMIX3X_PMIx_server_dmodex_request - -#define PMIx_tool_init OPAL_MCA_PMIX3X_PMIx_tool_init -#define PMIx_tool_finalize OPAL_MCA_PMIX3X_PMIx_tool_finalize - -#define PMIx_Register_event_handler OPAL_MCA_PMIX3X_PMIx_Register_event_handler -#define PMIx_Deregister_event_handler OPAL_MCA_PMIX3X_PMIx_Deregister_event_handler -#define PMIx_Notify_event OPAL_MCA_PMIX3X_PMIx_Notify_event -#define PMIx_Error_string OPAL_MCA_PMIX3X_PMIx_Error_string -#define PMIx_Proc_state_string OPAL_MCA_PMIX3X_PMIx_Proc_state_string -#define PMIx_Persistence_string OPAL_MCA_PMIX3X_PMIx_Persistence_string -#define PMIx_Data_range_string OPAL_MCA_PMIX3X_PMIx_Data_range_string -#define PMIx_Info_directives_string OPAL_MCA_PMIX3X_PMIx_Info_directives_string -#define PMIx_Data_type_string OPAL_MCA_PMIX3X_PMIx_Data_type_string -#define PMIx_Get_version OPAL_MCA_PMIX3X_PMIx_Get_version -#define PMIx_Store_internal OPAL_MCA_PMIX3X_PMIx_Store_internal - -#define pmix_value_load OPAL_MCA_PMIX3X_pmix_value_load -#define pmix_value_xfer OPAL_MCA_PMIX3X_pmix_value_xfer -#define pmix_globals OPAL_MCA_PMIX3X_pmix_globals -#define pmix_output OPAL_MCA_PMIX3X_pmix_output -#define pmix_output_verbose OPAL_MCA_PMIX3X_pmix_output_verbose - -#endif diff --git a/opal/mca/pmix/pmix2x/pmix/include/pmix_version.h b/opal/mca/pmix/pmix2x/pmix/include/pmix_version.h deleted file mode 100644 index bb8bf7c6fb..0000000000 --- a/opal/mca/pmix/pmix2x/pmix/include/pmix_version.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2016 Mellanox Technologies, Inc. - * All rights reserved. - * Copyright (c) 2016 Intel, Inc. All rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - - -#ifndef PMIx_VERSION_H -#define PMIx_VERSION_H - -/* define PMIx version */ -#define PMIX_VERSION_MAJOR 2L -#define PMIX_VERSION_MINOR 0L - -#endif diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h b/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h deleted file mode 100644 index d97fa68eae..0000000000 --- a/opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana - * University Research and Technology - * Corporation. All rights reserved. - * Copyright (c) 2004-2005 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, - * University of Stuttgart. All rights reserved. - * Copyright (c) 2004-2005 The Regents of the University of California. - * All rights reserved. - * Copyright (c) 2007 Los Alamos National Security, LLC. - * All rights reserved. - * Copyright (c) 2016 Intel, Inc. All rights reserved - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - * - * This file should be included by any file that needs the - * installation directories hard-coded into the object file. This - * should be avoided if at all possible, but there are some places - * (like the wrapper compilers) where it is infinitely easier to have - * the paths stored. - * - * If you have questions about which directory to use, we try as best - * we can to follow the GNU coding standards on this issue. The - * description of each directory can be found at the following URL: - * - * http://www.gnu.org/prep/standards/html_node/Directory-Variables.html - * - * The line below is to shut AC 2.60 up about datarootdir. Don't remove. - * datarootdir=foo - */ - -#ifndef PMIX_INST_DIRS_H -#define PMIX_INST_DIRS_H - -#define PMIX_INSTALL_PREFIX "/home/common/openmpi/build/foobar" -#define PMIX_EXEC_PREFIX "${prefix}" - -/* The directory for installing executable programs that users can - run. */ -#define PMIX_BINDIR "${exec_prefix}/bin" - -/* The directory for installing executable programs that can be run - from the shell, but are only generally useful to system - administrators. */ -#define PMIX_SBINDIR "${exec_prefix}/sbin" - -/* The directory for installing executable programs to be run by other - programs rather than by users. - - The definition of ‘libexecdir’ is the same for all packages, so - you should install your data in a subdirectory thereof. Most - packages install their data under $(libexecdir)/package-name/, - possibly within additional subdirectories thereof, such as - $(libexecdir)/package-name/machine/version. */ -#define PMIX_LIBEXECDIR "${exec_prefix}/libexec" - -/* The root of the directory tree for read-only - architecture-independent data files. - - See not about PMIX_DATADIR. And you probably want that one, not - this one. This is one of those "building block" paths, that is - really only used for defining other paths. */ -#define PMIX_DATAROOTDIR "${prefix}/share" - -/* The directory for installing idiosyncratic read-only - architecture-independent data files for this program. - - The definition of ‘datadir’ is the same for all packages, so you - should install your data in a subdirectory thereof. Most packages - install their data under $(datadir)/package-name/. */ -#define PMIX_DATADIR "${datarootdir}" - -/* $(datadir)/package-name/. You probably want to use this instead of - PMIX_DATADIR */ -#define PMIX_PKGDATADIR "${datadir}/pmix" - -/* The directory for installing read-only data files that pertain to a - single machine–that is to say, files for configuring a host. Mailer - and network configuration files, /etc/passwd, and so forth belong - here. All the files in this directory should be ordinary ASCII text - files. - - Do not install executables here in this directory (they probably - belong in $(libexecdir) or $(sbindir)). Also do not install files - that are modified in the normal course of their use (programs whose - purpose is to change the configuration of the system - excluded). Those probably belong in $(localstatedir). */ -#define PMIX_SYSCONFDIR "${prefix}/etc" - -/* The directory for installing architecture-independent data files - which the programs modify while they run. */ -#define PMIX_SHAREDSTATEDIR "${prefix}/com" - -/* The directory for installing data files which the programs modify - while they run, and that pertain to one specific machine. Users - should never need to modify files in this directory to configure - the package's operation; put such configuration information in - separate files that go in $(datadir) or - $(sysconfdir). */ -#define PMIX_LOCALSTATEDIR "${prefix}/var" - -/* The directory for object files and libraries of object code. Do not - install executables here, they probably ought to go in - $(libexecdir) instead. */ -#define PMIX_LIBDIR "${exec_prefix}/lib" - -/* $(libdir)/package-name/. This is where components should go */ -#define PMIX_PKGLIBDIR "${libdir}/pmix" - -/* The directory for installing header files to be included by user - programs with the C ‘#include’ preprocessor directive. */ -#define PMIX_INCLUDEDIR "${prefix}/include" - -/* $(includedir)/package-name/. The devel headers go in here */ -#define PMIX_PKGINCLUDEDIR "${includedir}/pmix" - -/* The directory for installing the Info files for this package. */ -#define PMIX_INFODIR "${datarootdir}/info" - -/* The top-level directory for installing the man pages (if any) for - this package. */ -#define PMIX_MANDIR "${datarootdir}/man" - -#endif