Cleanup 'orte' opal dir.

awlauria · awlauria · commit 0ea72890be7e · 2021-05-19T12:28:56.000-04:00
Signed-off-by: Austen Lauria &lt;awlauria@us.ibm.com&gt;
diff --git a/opal/include/opal_config_bottom.h b/opal/include/opal_config_bottom.h
@@ -551,7 +551,7 @@ typedef struct {
    directly in opal_config.h because they'll be turned into #defines'
    via autoconf.
 
-   So put them here in case any only else includes OMPI/ORTE/OPAL's
+   So put them here in case any only else includes OMPI/OPAL's
    config.h files. */
 
 #    undef PACKAGE_BUGREPORT
diff --git a/opal/include/opal_config_top.h b/opal/include/opal_config_top.h
@@ -22,7 +22,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/ORTE/OPAL's config.h,
+   macros (e.g., gmp.h) and then include OMPI/OPAL'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.
 
diff --git a/opal/mca/btl/usnic/README.test b/opal/mca/btl/usnic/README.test
@@ -23,7 +23,7 @@ Goals
 Anti-Goals
 ----------
 * Testing the low level networking API (e.g., libfabric).
-* Testing inter-process interaction, such as ORTE-related functionality.
+* Testing inter-process interaction, such as PRTE-related functionality.
 
 Constraints
 -----------
diff --git a/opal/mca/btl/usnic/btl_usnic_recv.h b/opal/mca/btl/usnic/btl_usnic_recv.h
@@ -60,9 +60,9 @@ static inline opal_btl_usnic_endpoint_t *lookup_sender(opal_btl_usnic_module_t *
     int ret;
     opal_btl_usnic_endpoint_t *sender;
 
-    /* Use the hashed ORTE process name in the BTL header to uniquely
+    /* Use the hashed PRTE process name in the BTL header to uniquely
        identify the sending process (using the MAC/hardware address
-       only identifies the sending server -- not the sending ORTE
+       only identifies the sending server -- not the sending PRTE
        process). */
     /* JMS We've experimented with using a handshake before sending
        any data so that instead of looking up a hash on the
diff --git a/opal/mca/hwloc/base/hwloc_base_maffinity.c b/opal/mca/hwloc/base/hwloc_base_maffinity.c
@@ -18,9 +18,7 @@
 /*
  * Don't use show_help() here (or print any error message at all).
  * Let the upper layer output a relevant message, because doing so may
- * be complicated (e.g., this might be called from the ORTE ODLS,
- * which has to do some extra steps to get error messages to be
- * displayed).
+ * be complicated.
  */
 int opal_hwloc_base_set_process_membind_policy(void)
 {
diff --git a/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c b/opal/mca/hwloc/base/hwloc_base_proc_mempolicy.c
@@ -17,9 +17,7 @@
 /*
  * Don't use show_help() here (or print any error message at all).
  * Let the upper layer output a relevant message, because doing so may
- * be complicated (e.g., this might be called from the ORTE ODLS,
- * which has to do some extra steps to get error messages to be
- * displayed).
+ * be complicated.
  */
 int opal_hwloc_base_set_process_membind_policy(void)
 {
diff --git a/opal/mca/hwloc/hwloc-internal.h b/opal/mca/hwloc/hwloc-internal.h
@@ -203,8 +203,8 @@ typedef uint16_t opal_binding_policy_t;
  * cpu list based on its node-local-rank */
 #define OPAL_BIND_ORDERED 0x8000
 
-/* binding policies - any changes in these
- * values must be reflected in orte/mca/rmaps/rmaps.h
+/*
+ * binding policies
  */
 #define OPAL_BIND_TO_NONE            1
 #define OPAL_BIND_TO_BOARD           2
diff --git a/opal/mca/shmem/base/base.h b/opal/mca/shmem/base/base.h
@@ -55,7 +55,7 @@ OPAL_DECLSPEC int opal_shmem_unlink(opal_shmem_ds_t *ds_buf);
  *
  * @retval name of best component.  NULL if no component is found.
  *
- * see: orte/mca/odls/base/odls_base_default_fns.c
+ * see: 3rd-party/prrte/src/mca/odls/base/odls_base_default_fns.c
  */
 OPAL_DECLSPEC char *opal_shmem_base_best_runnable_component_name(void);
 
diff --git a/opal/mca/shmem/base/shmem_base_select.c b/opal/mca/shmem/base/shmem_base_select.c
@@ -42,7 +42,7 @@ opal_shmem_base_module_t *opal_shmem_base_module = NULL;
 /*
  * Performs a run-time query across all available shmem components.
  * Similar to mca_base_select, but take into consideration environment
- * hints provided by orte.
+ * hints provided by prte.
  */
 static int opal_shmem_base_runtime_query(mca_base_module_t **best_module,
                                          mca_base_component_t **best_component)
diff --git a/opal/tools/wrappers/generic_wrapper.1in b/opal/tools/wrappers/generic_wrapper.1in
@@ -80,8 +80,8 @@ back-end compiler.
 .
 .
 .SS Background
-Open MPI is comprised of three software layers: OPAL (Open Portable
-Access Layer), ORTE (Open Run-Time Environment), and OMPI (Open MPI).
+Open MPI is comprised of two software layers:
+OPAL (Open Portable Access Layer), and OMPI (Open MPI).
 There are wrapper compilers for each layer; each layer's wrapper only
 links in the libraries relevant for that layer.  Specifically, each
 layer provides the following wrapper compilers:
@@ -91,10 +91,6 @@ OPAL
 \fIopalcc\fR and \fIopalc++\fR
 .
 .TP
-ORTE
-\fIortecc\fR and \fIortec++\fR
-.
-.TP
 OMPI
 \fImpicc\fR, \fImpic++\fR, \fImpicxx\fR, \fImpiCC\fR (only on systems with
 case-senstive file systems), and \fImpifort\fR (and its legacy/deprecated
diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c
@@ -747,15 +747,15 @@ int main(int argc, char *argv[])
                dynamically (i.e., it'll specifically -lopen-pal
                (and all their dependent libs)).  We provide
                this flag for test MPI applications that also invoke
-               ORTE and/or OPAL function calls.
+               OPAL function calls.
 
                On some systems (e.g., OS X), if the top-level
-               application calls ORTE/OPAL functions and you don't -l
-               ORTE and OPAL, then the functions won't be resolved at
+               application calls OPAL functions and you don't -l
+               OPAL, then the functions won't be resolved at
                link time (i.e., the implicit library dependencies of
                libmpi won't be pulled in at link time), and therefore
                the link will fail.  This flag will cause the wrapper
-               to explicitly list the ORTE and OPAL libs on the
+               to explicitly list the OPAL libs on the
                underlying compiler command line, so the application
                will therefore link properly. */
             flags |= COMP_WANT_LINKALL;
diff --git a/opal/util/show_help.h b/opal/util/show_help.h
@@ -163,8 +163,7 @@ OPAL_DECLSPEC char *opal_show_help_vstring(const char *filename, const char *top
  * of the show_help functionality. OMPI defines the show_help directory
  * based on where OMPI was installed. However, if the library wants to
  * use show_help to provide error output specific to itself, then it
- * nees to tell show_help how to find its own show_help files - without
- * interfering with the linked ORTE libs when they need to do show_help.
+ * nees to tell show_help how to find its own show_help files.
  */
 OPAL_DECLSPEC int opal_show_help_add_dir(const char *directory);
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ OPAL_DECLSPEC int opal_shmem_unlink(opal_shmem_ds_t *ds_buf);`
`55`	`55`	`*`
`56`	`56`	`* @retval name of best component. NULL if no component is found.`
`57`	`57`	`*`
`58`		`- * see: orte/mca/odls/base/odls_base_default_fns.c`
	`58`	`+ * see: 3rd-party/prrte/src/mca/odls/base/odls_base_default_fns.c`
`59`	`59`	`*/`
`60`	`60`	`OPAL_DECLSPEC char *opal_shmem_base_best_runnable_component_name(void);`
`61`	`61`