Cleanup 'orte' ompi dir.

Signed-off-by: Austen Lauria <awlauria@us.ibm.com>

Author: awlauria

ompi/debuggers/ompi_debuggers.c

@@ -26,8 +26,6 @@
  * MPI portion of debugger support: initially based on the
  * TotalView/Etnus API for debuggers to attach to MPI jobs.
  *
- * There is a lengthy explanation of how OMPI handles parallel
- * debuggers attaching to MPI jobs in orte/tools/orterun/debuggers.c.
  */
 
 #include "ompi_config.h"

ompi/dpm/dpm.c

@@ -1148,7 +1148,7 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
 #endif
 
             /* check for 'ompi_prefix' (OMPI-specific -- to effect the same
-             * behavior as --prefix option to orterun)
+             * behavior as --prefix option to prun)
              *
              * This is a job-level key
              */
@@ -1472,7 +1472,7 @@ int ompi_dpm_spawn(int count, const char *array_of_commands[],
             }
 #endif
 
-            /* see if this is a non-mpi job - if so, then set the flag so ORTE
+            /* see if this is a non-mpi job - if so, then set the flag so PRTE
              * knows what to do - job-level key
              */
             ompi_info_get_bool(array_of_info[i], "ompi_non_mpi", &non_mpi, &flag);
@@ -2057,7 +2057,7 @@ static int start_dvm(char **hostfiles, char **dash_host)
          will) reset them.  If we don't do this, the event
          library may have left some set that, at least on some
          OS's, don't get reset via fork() or exec().  Hence, the
-         orted could be unkillable (for example). */
+         prted could be unkillable (for example). */
         set_handler_default(SIGTERM);
         set_handler_default(SIGINT);
         set_handler_default(SIGHUP);
@@ -2067,9 +2067,9 @@ static int start_dvm(char **hostfiles, char **dash_host)
         /* Unblock all signals, for many of the same reasons that
          we set the default handlers, above.  This is noticable
          on Linux where the event library blocks SIGTERM, but we
-         don't want that blocked by the orted (or, more
+         don't want that blocked by the prted (or, more
          specifically, we don't want it to be blocked by the
-         orted and then inherited by the ORTE processes that it
+         prted and then inherited by the PRTE processes that it
          forks, making them unkillable by SIGTERM). */
         sigprocmask(0, 0, &sigs);
         sigprocmask(SIG_UNBLOCK, &sigs, 0);

ompi/include/ompi/constants.h

@@ -27,7 +27,7 @@
 
 /* error codes */
 enum {
-    /* Error codes inherited from ORTE/OPAL.  Still enum values so
+    /* Error codes inherited from OPAL.  Still enum values so
        that we might get nice debugger help */
     OMPI_SUCCESS                    = OPAL_SUCCESS,
     OMPI_ERROR                      = OPAL_ERROR,

ompi/mca/coll/sm/coll_sm_module.c

@@ -507,7 +507,7 @@ static int bootstrap_comm(ompi_communicator_t *comm,
     /* Make the rendezvous filename for this communicators shmem data
        segment.  The CID is not guaranteed to be unique among all
        procs on this node, so also pair it with the PID of the proc
-       with the lowest ORTE name to form a unique filename. */
+       with the lowest PMIx name to form a unique filename. */
     proc = ompi_group_peer_lookup(comm->c_local_group, 0);
     lowest_name = OMPI_CAST_RTE_NAME(&proc->super.proc_name);
     for (int i = 1; i < comm_size; ++i) {

ompi/mca/mca.h

@@ -22,7 +22,7 @@
 /**
  * @file
  *
- * Top-level interface for \em all orte MCA components.
+ * Top-level interface for all MCA components.
  */
 
 #ifndef OMPI_MCA_H

ompi/proc/proc.h

@@ -286,8 +286,8 @@ OMPI_DECLSPEC ompi_proc_t * ompi_proc_find_and_add(const ompi_process_name_t * n
  * Pack proc list into portable buffer
  *
  * This function takes a list of ompi_proc_t pointers (e.g. as given
- * in groups) and returns a orte buffer containing all information
- * needed to add the proc to a remote list.  This includes the ORTE
+ * in groups) and returns a pmix buffer containing all information
+ * needed to add the proc to a remote list.  This includes the
  * process name, the architecture, and the hostname.  Ordering is
  * maintained.  The buffer is packed to be sent to a remote node with
  * different architecture (endian or word size).

ompi/runtime/ompi_mpi_abort.c

@@ -189,8 +189,7 @@ ompi_mpi_abort(struct ompi_communicator_t* comm,
     /* We can fall through to here in a few cases:
 
        1. The attempt to kill just a subset of peers via
-          try_kill_peers() failed (e.g., as of July 2014, ORTE does
-          returns NOT_IMPLENTED from orte_rte_abort_peers()).
+          try_kill_peers() failed.
        2. MPI wasn't initialized, was already finalized, or we got a
           NULL communicator.
 

ompi/runtime/ompi_mpi_finalize.c

@@ -205,7 +205,7 @@ int ompi_mpi_finalize(void)
     opal_progress_set_event_flag(OPAL_EVLOOP_ONCE | OPAL_EVLOOP_NONBLOCK);
 #endif
 
-    /* Redo ORTE calling opal_progress_event_users_increment() during
+    /* Redo PRTE calling opal_progress_event_users_increment() during
        MPI lifetime, to get better latency when not using TCP */
     opal_progress_event_users_increment();
 

ompi/runtime/ompi_rte.h

@@ -23,8 +23,8 @@
  * to define when it should be built.
  *
  * Each component must provide a number of types and functions that mimic
- * those provided by ORTE. These include (where flexibility exists, the
- * ORTE data type is shown, but any compatible type is allowed. For example,
+ * those provided by PRTE. These include (where flexibility exists, the
+ * pmix data type is shown, but any compatible type is allowed. For example,
  * the jobid field in ompi_process_name_t could be any type of integer, but
  * cannot be a string):
  *
@@ -69,7 +69,7 @@
  *     1. ompi_rte_collective_t - an OPAL object used during RTE collective operations
  *        such as modex and barrier. It must be an opal_list_item_t and contain the
  *        following fields:
- *           a. id (ORTE type: int32_t)
+ *           a. id (pmix type: int32_t)
  *           b. bool active
  *              flag that user can poll on to know when collective
  *              has completed - set to false just prior to

ompi/tools/wrappers/ompi_wrapper_script.in

@@ -62,7 +62,7 @@ my $comp_flags = "";
 my $comp_flags_prefix = "";
 my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags;
 # Note that per https://svn.open-mpi.org/trac/ompi/ticket/3422, we
-# intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
+# intentionally only link in the MPI libraries (OPAL, etc. are
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
 my $libs = "-l".$ompi_libmpi_name." " . $extra_libs;