Merge pull request open-mpi#299 from rhc54/topic/cli

Revamp the CLI system

configure.ac

@@ -19,7 +19,7 @@
 # Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
-# Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2014-2019 Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2016-2017 IBM Corporation.  All rights reserved.
@@ -51,7 +51,7 @@ AC_LANG([C])
 
 AC_INIT([project_name_long],
         [m4_normalize(esyscmd([config/prrte_get_version.sh VERSION --tarball]))],
-        [https://github.com/pmix/prrte/], [project_name_short])
+        [https://github.com/openpmix/prrte/], [project_name_short])
 
 AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR(config)

src/Doxyfile

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2019      Intel, Inc.  All rights reserved.
+# Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -35,7 +35,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = OpenRTE
+PROJECT_NAME           = PRRTE
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or

src/class/prrte_list.h

@@ -14,7 +14,7 @@
  *                         reserved.
  * Copyright (c) 2016      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
- * Copyright (c) 2019      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -25,7 +25,7 @@
  * @file
  *
  * The prrte_list_t interface is used to provide a generic
- * doubly-linked list container for Open MPI.  It was inspired by (but
+ * doubly-linked list container for PRRTE.  It was inspired by (but
  * is slightly different than) the Stantard Template Library (STL)
  * std::list class.  One notable difference from std::list is that
  * when an prrte_list_t is destroyed, all of the prrte_list_item_t
@@ -103,7 +103,7 @@ PRRTE_EXPORT PRRTE_CLASS_DECLARATION(prrte_list_item_t);
 struct prrte_list_item_t
 {
     prrte_object_t super;
-    /**< Generic parent class for all Open MPI objects */
+    /**< Generic parent class for all PRRTE objects */
     volatile struct prrte_list_item_t * volatile prrte_list_next;
     /**< Pointer to next list item */
     volatile struct prrte_list_item_t * volatile prrte_list_prev;
@@ -152,7 +152,7 @@ typedef struct prrte_list_item_t prrte_list_item_t;
 struct prrte_list_t
 {
     prrte_object_t       super;
-    /**< Generic parent class for all Open MPI objects */
+    /**< Generic parent class for all PRRTE objects */
     prrte_list_item_t    prrte_list_sentinel;
     /**< Head and tail item of the list */
     volatile size_t     prrte_list_length;
@@ -468,7 +468,7 @@ static inline size_t prrte_list_get_size(prrte_list_t* list)
  * caller -- they are responsible for PRRTE_RELEASE()'ing it.
  *
  * If debugging is enabled (specifically, if --enable-debug was used
- * to configure Open MPI), this is an O(N) operation because it checks
+ * to configure PRRTE), this is an O(N) operation because it checks
  * to see if the item is actually in the list first.
  *
  * This is an inlined function in compilers that support inlining, so

src/class/prrte_tree.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2011      Oracle and/or its affiliates.  All rights reserved.
  * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
  *
- * Copyright (c) 2019      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -13,7 +13,7 @@
  * @file
  *
  * The prrte_tree_t interface is used to provide a generic
- * tree list container for Open MPI.  It was inspired by the prrte_list_t
+ * tree list container for PRRTE.  It was inspired by the prrte_list_t
  * interface but instead of organizing items in a doubly-linked list
  * fashion, we order them in a finite tree structure.
  *
@@ -93,7 +93,7 @@ PRRTE_EXPORT PRRTE_CLASS_DECLARATION(prrte_tree_item_t);
  */
 typedef struct prrte_tree_item_t
 {
-    /** Generic parent class for all Open MPI objects */
+    /** Generic parent class for all PRRTE objects */
     prrte_object_t super;
     /** Pointer to the tree this item belongs to */
     struct prrte_tree_t *prrte_tree_container;
@@ -183,7 +183,7 @@ typedef void *(*prrte_tree_get_key_fn_t)(prrte_tree_item_t *item);
  */
 typedef struct prrte_tree_t
 {
-    /** Generic parent class for all Open MPI objects */
+    /** Generic parent class for all PRRTE objects */
     prrte_object_t       super;
     /** Guard item of the tree that child points to root */
     prrte_tree_item_t    prrte_tree_sentinel;

src/dss/dss_open_close.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-2019 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015-2018 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
@@ -284,7 +284,7 @@ int prrte_dss_register_vars (void)
     }
 
     ret = prrte_mca_base_var_register ("prrte", "dss", NULL, "buffer_type",
-                                 "Set the default mode for OpenRTE buffers (0=non-described, 1=described)",
+                                 "Set the default mode for PRRTE buffers (0=non-described, 1=described)",
                                  PRRTE_MCA_BASE_VAR_TYPE_INT, new_enum, 0, PRRTE_MCA_BASE_VAR_FLAG_SETTABLE,
                                  PRRTE_INFO_LVL_8, PRRTE_MCA_BASE_VAR_SCOPE_ALL_EQ,
                                  &default_buf_type);

src/dss/dss_print.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-2019 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
@@ -842,10 +842,10 @@ int prrte_dss_print_name(char **output, char *prefix, prrte_process_name_t *name
     *output = NULL;
 
     if (NULL == name) {
-        prrte_asprintf(output, "%sData type: ORTE_PROCESS_NAME\tData Value: NULL",
+        prrte_asprintf(output, "%sData type: PRRTE_PROCESS_NAME\tData Value: NULL",
                  (NULL == prefix ? " " : prefix));
     } else {
-        prrte_asprintf(output, "%sData type: ORTE_PROCESS_NAME\tData Value: [%d,%d]",
+        prrte_asprintf(output, "%sData type: PRRTE_PROCESS_NAME\tData Value: [%d,%d]",
                  (NULL == prefix ? " " : prefix), name->jobid, name->vpid);
     }
 

src/dss/dss_types.h

@@ -15,7 +15,7 @@
  *                         reserved.
  * Copyright (c) 2014-2018 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -118,7 +118,7 @@ typedef struct {
 #define    PRRTE_ENVAR               (prrte_data_type_t)   39 /**< corresponds to PMIx envar type */
 #define    PRRTE_LIST                (prrte_data_type_t)   40 /**< an prrte list */
 
-/* General ORTE types - support handled within DSS */
+/* General PRRTE types - support handled within DSS */
 #define    PRRTE_STD_CNTR            (prrte_data_type_t)   41 /**< standard counter type */
     /* State-related types */
 #define    PRRTE_NODE_STATE          (prrte_data_type_t)   42 /**< node status flag */

src/etc/openmpi-default-hostfile

@@ -9,14 +9,14 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2019      Intel, Inc.  All rights reserved.
+# Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
-# This is the default hostfile for Open MPI.  Notice that it does not
+# This is the default hostfile for PRRTE.  Notice that it does not
 # contain any hosts (not even localhost).  This file should only
 # contain hosts if a system administrator wants users to always have
 # the same set of default hosts, and is not using a batch scheduler
@@ -26,7 +26,7 @@
 # environments (e.g., running in a job under a job scheduler, such as
 # SLURM or PBS / Torque).
 #
-# If you are primarily interested in running Open MPI on one node, you
+# If you are primarily interested in running PRRTE on one node, you
 # should *not* simply list "localhost" in here (contrary to prior MPI
 # implementations, such as LAM/MPI).  A localhost-only node list is
 # created by the RAS component named "localhost" if no other RAS

src/hwloc/help-prrte-hwloc-base.txt

@@ -1,17 +1,17 @@
 # -*- text -*-
 #
 # Copyright (c) 2011-2014 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
+# Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
-# This is the US/English help file for Open MPI's hwloc base support
+# This is the US/English help file for PRRTE's hwloc base support
 #
 [mbind failure]
-Open MPI failed to bind internal memory to a specific NUMA node.  This
+PRRTE failed to bind internal memory to a specific NUMA node.  This
 message will only be reported at most once per process.
 
   Local host: %s
@@ -49,11 +49,11 @@ been deprecated and replaced as follows:
     Deprecated:  %s
     Replacement: %s
 
-The deprecated forms *will* disappear in a future version of Open MPI.
+The deprecated forms *will* disappear in a future version of PRRTE.
 Please update to the new syntax.
 #
 [obj-idx-failed]
-Open MPI failed to find a cache of a specified type.  This is a highly
+PRRTE failed to find a cache of a specified type.  This is a highly
 unusual error; it may indicate a system configuration error.  This
 additional information may be of help:
 

src/hwloc/hwloc.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011-2018 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2013-2019 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2016-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
@@ -104,7 +104,7 @@ int prrte_hwloc_base_register(void)
     prrte_hwloc_base_mbfa = PRRTE_HWLOC_BASE_MBFA_WARN;
     prrte_mca_base_var_enum_create("hwloc memory bind failure action", hwloc_failure_action, &new_enum);
     ret = prrte_mca_base_var_register("prrte", "hwloc", "base", "mem_bind_failure_action",
-                                "What Open MPI will do if it explicitly tries to bind memory to a specific NUMA location, and fails.  Note that this is a different case than the general allocation policy described by hwloc_base_alloc_policy.  A value of \"silent\" means that Open MPI will proceed without comment. A value of \"warn\" means that Open MPI will warn the first time this happens, but allow the job to continue (possibly with degraded performance).  A value of \"error\" means that Open MPI will abort the job if this happens.",
+                                "What PRRTE will do if it explicitly tries to bind memory to a specific NUMA location, and fails.  Note that this is a different case than the general allocation policy described by hwloc_base_alloc_policy.  A value of \"silent\" means that PRRTE will proceed without comment. A value of \"warn\" means that PRRTE will warn the first time this happens, but allow the job to continue (possibly with degraded performance).  A value of \"error\" means that PRRTE will abort the job if this happens.",
                                 PRRTE_MCA_BASE_VAR_TYPE_INT, new_enum, 0, 0, PRRTE_INFO_LVL_9,
                                 PRRTE_MCA_BASE_VAR_SCOPE_READONLY, &prrte_hwloc_base_mbfa);
     PRRTE_RELEASE(new_enum);

src/hwloc/hwloc_base_util.c

@@ -1284,7 +1284,7 @@ char* prrte_hwloc_base_find_coprocessors(hwloc_topology_t topo)
                          (NULL == cpstring) ? "NONE" : cpstring));
 #else
     PRRTE_OUTPUT_VERBOSE((5, prrte_hwloc_base_output,
-                         "hwloc:base:find_coprocessors: the version of hwloc that Open MPI was built against (v%d.%d.%d) does not support detecting coprocessors",
+                         "hwloc:base:find_coprocessors: the version of hwloc that PRRTE was built against (v%d.%d.%d) does not support detecting coprocessors",
                          (HWLOC_API_VERSION>>16)&&0xFF, (HWLOC_API_VERSION>>8)&0xFF, HWLOC_API_VERSION&&0xFF));
 #endif
     return cpstring;

src/include/prrte_config_bottom.h

@@ -15,7 +15,7 @@
  *                         All rights reserved.
  * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
- * Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2015-2020 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -24,7 +24,7 @@
  *
  * This file is included at the bottom of prrte_config.h, and is
  * therefore a) after all the #define's that were output from
- * configure, and b) included in most/all files in Open MPI.
+ * configure, and b) included in most/all files in PRRTE.
  *
  * Since this file is *only* ever included by prrte_config.h, and
  * prrte_config.h already has #ifndef/#endif protection, there is no
@@ -40,7 +40,7 @@
  * case of a shared library _USERDLL get defined.
  *
  * OMPI_BUILDING and _LIB define how prrte_config.h
- * handles configuring all of Open MPI's "compatibility" code.  Both
+ * handles configuring all of PRRTE's "compatibility" code.  Both
  * constants will always be defined by the end of prrte_config.h.
  *
  * OMPI_BUILDING affects how much compatibility code is included by
@@ -265,8 +265,8 @@
 
 /***********************************************************************
  *
- * Code that is only for when building Open MPI or utilities that are
- * using the internals of Open MPI.  It should not be included when
+ * Code that is only for when building PRRTE or utilities that are
+ * using the internals of PRRTE.  It should not be included when
  * building MPI applications
  *
  **********************************************************************/
@@ -305,7 +305,7 @@
 #define PRRTE_DEBUG_ZERO(obj)
 
 /*
- * printf functions for portability (only when building Open MPI)
+ * printf functions for portability (only when building PRRTE)
  */
 #if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF)
 #include <stdarg.h>
@@ -474,7 +474,7 @@ static inline uint16_t ntohs(uint16_t netvar) { return netvar; }
    directly in prrte_config.h because they'll be turned into #defines'
    via autoconf.
 
-   So put them here in case any only else includes OMPI/PRRTE/PRRTE's
+   So put them here in case any only else includes OMPI/PRRTE's
    config.h files. */
 
 #undef PACKAGE_BUGREPORT

src/include/prrte_config_top.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2011 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2019      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -9,7 +9,7 @@
  *
  * This file is included at the top of prrte_config.h, and is
  * therefore a) before all the #define's that were output from
- * configure, and b) included in most/all files in Open MPI.
+ * configure, and b) included in most/all files in PRRTE.
  *
  * Since this file is *only* ever included by prrte_config.h, and
  * prrte_config.h already has #ifndef/#endif protection, there is no
@@ -23,7 +23,7 @@
 /* The only purpose of this file is to undef the PACKAGE_<foo> macros
    that are put in by autoconf/automake projects.  Specifically, if
    you include a .h file from another project that defines these
-   macros (e.g., gmp.h) and then include OMPI/PRRTE/PRRTE's config.h,
+   macros (e.g., gmp.h) and then include OMPI/PRRTE's config.h,
    you'll get a preprocessor conflict.  So put these undef's here to
    protect us from other package's PACKAGE_<foo> macros.
 

src/mca/base/Makefile.am

@@ -10,7 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2010 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2019      Intel, Inc.  All rights reserved.
+# Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -44,7 +44,6 @@ headers = \
 libprrte_mca_base_la_SOURCES = \
         $(headers) \
         prrte_mca_base_close.c \
-        prrte_mca_base_cmd_line.c \
         prrte_mca_base_component_compare.c \
         prrte_mca_base_component_find.c \
         prrte_mca_base_component_repository.c \

src/mca/base/base.h

@@ -18,7 +18,7 @@
  * Copyright (c) 2017 IBM Corporation.  All rights reserved.
  * Copyright (c) 2018      Triad National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2019      Intel, Inc.  All rights reserved.
+ * Copyright (c) 2019-2020 Intel, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -95,7 +95,7 @@ enum {
     /** also emit relevant tracing information (e.g., which functions were invoked /
      * call stack entry/exit info) */
     PRRTE_MCA_BASE_VERBOSE_TRACE = 60,
-    /** also emit Open MPI-developer-level (i.e,. highly detailed) information */
+    /** also emit PRRTE-developer-level (i.e,. highly detailed) information */
     PRRTE_MCA_BASE_VERBOSE_DEBUG = 80,
     /** also output anything else that might be useful */
     PRRTE_MCA_BASE_VERBOSE_MAX   = 100,
@@ -158,14 +158,6 @@ PRRTE_EXPORT int prrte_mca_base_is_component_required(prrte_list_t *components_a
                                                  bool exclusive,
                                                  bool *is_required);
 
-/* mca_base_cmd_line.c */
-
-PRRTE_EXPORT int prrte_mca_base_cmd_line_setup(prrte_cmd_line_t *cmd);
-PRRTE_EXPORT int prrte_mca_base_cmd_line_process_args(prrte_cmd_line_t *cmd,
-                                                 char ***app_env,
-                                                 char ***global_env);
-PRRTE_EXPORT void prrte_mca_base_cmd_line_wrap_args(char **args);
-
 /* prrte_mca_base_component_compare.c */
 
 PRRTE_EXPORT int prrte_mca_base_component_compare_priority(prrte_mca_base_component_priority_list_item_t *a,