While waiting for a lengthy compile, I noticed a bunch of old remnants

from the "LAM/MPI" -> "Open MPI" name change that didn't convert
properly.  So this commit fixes all instances of "OMPI/MPI" to "Open
MPI".

This commit was SVN r1924.

HACKING

@@ -13,7 +13,7 @@ This procedure is *ONLY* necessary if you are building from a
 developer's tree.  If you have an Open MPI distribution tarball, this
 procedure is unnecessary -- you can even skip reading this section.
 
-If you are building OMPI/MPI from a developer's tree, you must first
+If you are building Open MPI from a developer's tree, you must first
 install fairly recent versions of the GNU tools Autoconf, Automake,
 and Libtool.  As of this writing, you need at least Autoconf v2.58,
 Automake v1.8.5 (or better), and Libtool v1.5.  You can check what

acinclude.m4

@@ -5,7 +5,7 @@ dnl
 
 
 #
-# OMPI/MPI-specific tests
+# Open MPI-specific tests
 #
 
 sinclude(config/c_get_alignment.m4)

autogen.sh

@@ -2,7 +2,7 @@
 #
 # $HEADER$
 #
-# This script is run on developer copies of OMPI/MPI -- *not*
+# This script is run on developer copies of Open MPI -- *not*
 # distribution tarballs.
 
 
@@ -693,7 +693,7 @@ echo "[Checking] prerequisites"
 if test ! -d .svn ; then
     cat <<EOF
 
-This doesn't look like a developer copy of OMPI/MPI.  You probably do not
+This doesn't look like a developer copy of Open MPI.  You probably do not
 want to run autogen.sh - it is normally not needed for a release source
 tree.  Giving you 5 seconds to reconsider and kill me.
 

config/distscript.csh

@@ -18,7 +18,7 @@ endif
 set start=`date`
 cat <<EOF
  
-Creating OMPI/MPI distribution
+Creating Open MPI distribution
 In directory: `pwd`
 Started: $start
  
@@ -171,7 +171,7 @@ end
 #
 
 cat <<EOF
-*** OMPI/MPI version $ver distribution created
+*** Open MPI version $ver distribution created
  
 Started: $start
 Ended:   `date`

config/mca_make_configure.pl

@@ -19,7 +19,7 @@ my %config_values;
 my %config_params;
 
 my $initial_cwd = cwd();
-my $announce_str = "OMPI/MPI MCA component configure generator";
+my $announce_str = "Open MPI MCA component configure generator";
 my %config_param_names = (PIFILE => "PARAM_INIT_FILE",
                           PCFGAUXDIR => "PARAM_CONFIG_AUX_DIR",
                           PC => "PARAM_WANT_C",

config/ompi_case_sensitive_fs_setup.m4

@@ -72,8 +72,9 @@ if test "$OMPI_WANT_CS_FS" = "0"; then
 NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
 *******************************************************************************
 
-Because OMPI/MPI is being installed on a non-case sensitive file system, the
+Because Open MPI is being installed on a non-case sensitive file
-C++ wrapper compiler will be named mpic++ instead of the traditional mpiCC.
+system, the C++ wrapper compiler will be named mpic++ instead of the
+traditional mpiCC.
 
 Please update any makefiles appropriately.
 

config/ompi_config_threads.m4

@@ -143,14 +143,14 @@ else
 
 ************************************************************************
 
-OMPI/MPI was unable to find threading support on your system.  In the
+Open MPI was unable to find threading support on your system.  In the
 near future, the OMPI development team is considering requiring
 threading support for proper OMPI execution.  This is in part because
 we are not aware of any users that do not have thread support - so we
 need you to e-mail us at ompi@ompi-mpi.org and let us know about this
 problem.
 
-To build this version of OMPI/MPI without thread support, re-run
+To build this version of Open MPI without thread support, re-run
 configure with the '--without-threads' option.
 
 ************************************************************************

include/mpi.h

@@ -147,13 +147,13 @@ enum {
   IMPI_HOST_COLOR,
 
   /*
-   * Predefined attribute keyvals, but OMPI-specific
+   * Predefined attribute keyvals, but Open MPI-specific
    */
   OMPI_UNIVERSE_NCPUS,
   OMPI_UNIVERSE_NNODES,
 
   /*
-   * Predefined attribute keyvals, but OMPI/MPI-specific
+   * Predefined attribute keyvals, but Open MPI-specific
    */
   OMPI_MPI_SSI_COLL,
   OMPI_MPI_SSI_COLL_CROSSOVER,

include/mpif.h.in

@@ -24,10 +24,10 @@
 !      shell$ mpif77 foo.f -o foo
 !
 ! You should not copy this file to your local directory because it is
-! possible that this file will be changed between versions of OMPI/MPI.
+! possible that this file will be changed between versions of Open MPI.
 ! Indeed, this mpif.h is incompatible with the mpif.f of other 
 ! implementations of MPI.  Using this mpif.h with other implementations 
-! of MPI, or with other versions of OMPI/MPI will result in undefined
+! of MPI, or with other versions of Open MPI will result in undefined
 ! behavior (to include incorrect results, segmentation faults, 
 ! unexplainable "hanging" in your application, etc.).  Always use the
 ! -I command line option instead (or let mpif77 do it for you).

include/ompi_config_bottom.h

@@ -3,7 +3,7 @@
  *
  * This file is included at the bottom of ompi_config.h, and is
  * therefore a) after all the #define's that were output from
- * configure, and b) included in most/all files in OMPI/MPI.
+ * configure, and b) included in most/all files in Open MPI.
  *
  * Since this file is *only* ever included by ompi_config.h, and
  * ompi_config.h already has #ifndef/#endif protection, there is no

src/mca/coll/basic/src/coll_basic_component.c

@@ -19,7 +19,7 @@
  * Public string showing the coll ompi_basic component version number
  */
 const char *mca_coll_basic_component_version_string =
-  "OMPI/MPI basic collective MCA component version " MCA_coll_basic_FULL_VERSION;
+  "Open MPI basic collective MCA component version " MCA_coll_basic_FULL_VERSION;
 
 /*
  * Instantiate the public struct with all of our public information

src/mca/pcm/pcm.h

@@ -5,9 +5,9 @@
 /** @file **/
 
 /** 
- *  \brief OMPI/MPI Interface for Parallel Job & Process Control (pcm)
+ *  \brief Open MPI Interface for Parallel Job & Process Control (pcm)
  *
- * OMPI/MPI assumes it is running under a fully operational parallel
+ * Open MPI assumes it is running under a fully operational parallel
  * run-time environment (RTE).  This environment may be provided by
  * batch schedulers such as PBS and LSF, single system image tools
  * such as bproc, or specially designed MPI control daemons (the MPICH
@@ -23,7 +23,7 @@
  * capabilities of a particular module, please see the individual
  * module's documentation.
  *
- * A run-time environment suitable for use by OMPI/MPI must provide
+ * A run-time environment suitable for use by Open MPI must provide
  * the following capabilities:
  *
  *  - Remote process startup at job-start time with the ability to:

src/mca/topo/base/topo_base_cart_create.c

@@ -21,7 +21,7 @@
  * @param reorder ranking may be reordered (true) or not (false) (logical)
  * @param comm_cart communicator with new cartesian topology (handle)
  *
- * OMPI/MPI currently ignores the 'reorder' flag.
+ * Open MPI currently ignores the 'reorder' flag.
  *
  * @retval MPI_SUCCESS
  */                       

src/mca/topo/unity/src/topo_unity_component.c

@@ -15,7 +15,7 @@
  */
 
 const char *mca_topo_unity_component_version_string = 
-    "OMPI/MPI unity topology MCA component version" MCA_topo_unity_FULL_VERSION;
+    "Open MPI unity topology MCA component version" MCA_topo_unity_FULL_VERSION;
 
 /*
  * *******************************************************************

src/threads/mutex.h

@@ -35,7 +35,7 @@
  * - if configure determined that we do not have threads, then this
  * value will always be false.
  *
- * - if MPI_INIT is invoked, and the ompi/mpi libraries are [still]
+ * - if MPI_INIT is invoked, and the ompi libraries are [still]
  * single-threaded, this value will be false.
  *
  * - if MPI_INIT_THREAD is invoked with MPI_THREAD_MULTIPLE, we have

src/tools/ompi_info/ompi_info.cc

@@ -63,13 +63,13 @@ int main(int argc, char *argv[])
     exit(ret);
   }
   ompi_cmd_line_make_opt(cmd_line, 'v', "version", 2, 
-                        "Show version of OMPI/MPI or a component");
+                        "Show version of Open MPI or a component");
   ompi_cmd_line_make_opt(cmd_line, '\0', "param", 2, 
                         "Show MCA parameters");
   ompi_cmd_line_make_opt(cmd_line, '\0', "path", 1, 
-                        "Show paths that OMPI/MPI was configured with");
+                        "Show paths that Open MPI was configured with");
   ompi_cmd_line_make_opt(cmd_line, '\0', "arch", 0, 
-                        "Show architecture OMPI/MPI was compiled on");
+                        "Show architecture Open MPI was compiled on");
   ompi_cmd_line_make_opt(cmd_line, 'c', "config", 0, 
                         "Show configuration options");
   ompi_cmd_line_make_opt(cmd_line, 'h', "help", 0, 
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
   ompi_cmd_line_make_opt(cmd_line, '\0', "parsable", 0, 
                         "Display output in parsable format");
   ompi_cmd_line_make_opt(cmd_line, '\0', "hostname", 0, 
-                        "Show the hostname that OMPI/MPI was configured "
+                        "Show the hostname that Open MPI was configured "
                         "and built on");
   ompi_cmd_line_make_opt(cmd_line, 'a', "all", 0, 
                         "Show all configuration options and MCA parameters");

src/tools/ompi_info/version.cc

@@ -77,7 +77,7 @@ void ompi_info::do_version(bool want_all, ompi_cmd_line_t *cmd_line)
       arg1 = ompi_cmd_line_get_param(cmd_line, "version", i, 0);
       scope = ompi_cmd_line_get_param(cmd_line, "version", i, 1);
 
-      // Version of OMPI/MPI
+      // Version of Open MPI
  
       if (type_ompi == arg1) {
         show_ompi_version(scope);
@@ -103,11 +103,11 @@ void ompi_info::do_version(bool want_all, ompi_cmd_line_t *cmd_line)
 
 
 //
-// Show the version of OMPI/MPI
+// Show the version of Open MPI
 //
 void ompi_info::show_ompi_version(const string& scope)
 {
-  out("OMPI/MPI", "version:" + type_ompi, 
+  out("Open MPI", "version:" + type_ompi, 
       make_version_str(scope, 
                        OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, 
                        OMPI_RELEASE_VERSION,