Merge pull request #10160 from jsquyres/pr/master-to-main-rename

Rename relevant "master" references

Author: jsquyres

.ci/mellanox/azure-pipelines.yml

@@ -1,6 +1,6 @@
 trigger: none
 pr:
-  - master
+  - main
   - v*.*.x
 
 pool:

README.md

@@ -28,4 +28,4 @@ Developers who clone the Open MPI Git repository will not have the
 HTML documentation and man pages by default; it must be built.
 Instructions for how to build the Open MPI documentation can be found
 here:
-https://docs.open-mpi.org/en/master/developers/prerequisites.html#sphinx.
+https://docs.open-mpi.org/en/main/developers/prerequisites.html#sphinx.

contrib/annual-maintenance/convert-to-git.txt

@@ -3,7 +3,7 @@ From Dave:
 For fun, here's the Git version of the "AUTHORS with commits in the past year" part of your script:
 
 ----8<----
-savbu-usnic-a ~/g/ompi-svn-mirror git:master ❮❮❮ git log --all --since='1 year ago' --pretty=tformat:'%ae' | sort | uniq -c
+savbu-usnic-a ~/g/ompi-svn-mirror git:main ❮❮❮ git log --all --since='1 year ago' --pretty=tformat:'%ae' | sort | uniq -c
     39 adrian@open-mpi-git-mirror.example.com
      3 alex@open-mpi-git-mirror.example.com
      5 alinas@open-mpi-git-mirror.example.com
@@ -40,7 +40,7 @@ savbu-usnic-a ~/g/ompi-svn-mirror git:master ❮❮❮ git log --all --since='1
 
 And the "NO commits":
 ----8<----
-savbu-usnic-a ~/g/ompi-svn-mirror git:master ❯❯❯ git log --all --since='1 year ago' --pretty=tformat:'%ae' | sort | uniq > /tmp/active ; git log --pretty=tformat:'%ae' --all | sort | uniq > /tmp/all ; diff -u
+savbu-usnic-a ~/g/ompi-svn-mirror git:main ❯❯❯ git log --all --since='1 year ago' --pretty=tformat:'%ae' | sort | uniq > /tmp/active ; git log --pretty=tformat:'%ae' --all | sort | uniq > /tmp/all ; diff -u
 /tmp/all /tmp/active | grep '^-[^-]'
 -abbyz@open-mpi-git-mirror.example.com
 -adi@open-mpi-git-mirror.example.com

contrib/check-owner.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015-2022 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2015 Los Alamos National Security, LLC.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -55,7 +55,7 @@ sub DebugDump {
 sub isTopDir {
     my ($d) = @_;
 
-    # master
+    # main
     if (-f "$d/Makefile.ompi-rules") {
         return 1;
     }

contrib/clang-format-ompi.sh

@@ -2,7 +2,7 @@
 
 echo "Running clang-format on code base..."
 
-files=($(git ls-tree -r master --name-only | grep -v -E '3rd-party/|contrib/' | grep -e '.*\.[ch]$' | xargs grep -E -L -- "-*- fortran -*-|-*- f90 -*-"))
+files=($(git ls-tree -r main --name-only | grep -v -E '3rd-party/|contrib/' | grep -e '.*\.[ch]$' | xargs grep -E -L -- "-*- fortran -*-|-*- f90 -*-"))
 
 for file in "${files[@]}" ; do
     if test "$1" = "-d" ; then

contrib/ompi-time.sh

@@ -2,6 +2,7 @@
 #
 # Copyright (c) 2015      Mellanox Technologies, Inc.
 #                         All rights reserved.
+# Copyright (c) 2022      Cisco Systems, Inc.  All rights reserved
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -201,11 +202,11 @@ function do_checksync_mpisync() {
   if [ ! -e ${tooldir} ]; then
     mkdir -p ${tooldir}
     cd ${tooldir}
-    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/master/ompi/tools/mpisync/mpigclock.c >> $logfile 2>&1
-    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/master/ompi/tools/mpisync/mpigclock.h >> $logfile 2>&1
-    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/master/ompi/tools/mpisync/hpctimer.c >> $logfile 2>&1
-    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/master/ompi/tools/mpisync/hpctimer.h >> $logfile 2>&1
-    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/master/ompi/tools/mpisync/sync.c >> $logfile 2>&1
+    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/main/ompi/tools/mpisync/mpigclock.c >> $logfile 2>&1
+    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/main/ompi/tools/mpisync/mpigclock.h >> $logfile 2>&1
+    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/main/ompi/tools/mpisync/hpctimer.c >> $logfile 2>&1
+    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/main/ompi/tools/mpisync/hpctimer.h >> $logfile 2>&1
+    wget --no-check-certificate https://github.com/open-mpi/ompi/raw/main/ompi/tools/mpisync/sync.c >> $logfile 2>&1
     mpicc hpctimer.c mpigclock.c sync.c -o mpisync >> $logfile 2>&1
   fi
   if [ ! -e "$tooldir" ] || [ ! -f "$tooldir/mpisync" ]; then

docs/developers/gnu-autotools.rst

@@ -186,7 +186,7 @@ to at least the versions listed below.
      - 2.4.6
      - 2.5.35
      - 4.2.0
-   * - Git master
+   * - Git main
      - 1.4.17
      - 2.69
      - 1.15

docs/features/ulfm.rst

@@ -370,9 +370,9 @@ ULFM Standalone Release 2.1
 
 This release is a bugfix and upstream parity upgrade. It improves
 stability, performance and is based on the most current Open MPI
-master (November 2018).
+main (November 2018).
 
-* ULFM is now based upon Open MPI master branch (#37954b5f).
+* ULFM is now based upon Open MPI main branch (#37954b5f).
 * ULFM tuning MCA parameters are exposed by ``ompi_info``.
 * Fortran 90 bindings have been updated
 * Bugfixes:
@@ -389,10 +389,10 @@ master (November 2018).
 ULFM Standalone Release 2.0
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Focus has been toward integration with current Open MPI master
+Focus has been toward integration with current Open MPI main
 (November 2017), performance, and stability.
 
-* ULFM is now based upon Open MPI master branch (#689f1be9). It will
+* ULFM is now based upon Open MPI main branch (#689f1be9). It will
   be regularly updated until it will eventually be merged.
 * Fault Tolerance is enabled by default and is controlled with MCA variables.
 * Added support for multithreaded modes (MPI_THREAD_MULTIPLE, etc.)
@@ -495,7 +495,7 @@ Binary Compatibility
 ^^^^^^^^^^^^^^^^^^^^
 
 ULFM Open MPI is binary compatible with any version of Open MPI
-compatible with the underlying Open MPI master branch or release (see
+compatible with the underlying Open MPI main branch or release (see
 the binary compatibility and version number section in the upstream
 Open MPI README). That is, applications compiled with a compatible
 Open MPI can run with the ULFM Open MPI ``mpirun`` and MPI

docs/man-openmpi/man3/MPI_Comm_rank.3.rst

@@ -64,7 +64,7 @@ communicator's group. It is equivalent to accessing the communicator's
 group with :ref:`MPI_Comm_group`, computing the rank using :ref:`MPI_Group_rank`, and
 then freeing the temporary group via :ref:`MPI_Group_free`.
 
-Many programs will be written with the master-slave model, where one
+Many programs will be written with the manager-worker model, where one
 process (such as the rank-zero process) will play a supervisory role,
 and the other processes will serve as compute nodes. In this framework,
 :ref:`MPI_Comm_size` and :ref:`MPI_Comm_rank` are useful for determining the roles of

docs/networking/cuda.rst

@@ -28,7 +28,7 @@ Open MPI offers two flavors of CUDA support:
       # configured with: --build=powerpc64le-redhat-linux-gnu --host=powerpc64le-redhat-linux-gnu --program-prefix= --disable-dependency-tracking --prefix=/usr --exec-prefix=/usr --bindir=/usr/bin --sbindir=/usr/sbin --sysconfdir=/etc --datadir=/usr/share --includedir=/usr/include --libdir=/usr/lib64 --libexecdir=/usr/libexec --localstatedir=/var --sharedstatedir=/var/lib --mandir=/usr/share/man --infodir=/usr/share/info --disable-optimizations --disable-logging --disable-debug --disable-assertions --enable-mt --disable-params-check --enable-cma --without-cuda --without-gdrcopy --with-verbs --with-cm --with-knem --with-rdmacm --without-rocm --without-xpmem --without-ugni --without-java
 
    If you need to build ucx yourself to include CUDA support, please
-   see the UCX documentation for `building ucx with Open MPI: <https://openucx.readthedocs.io/en/master/running.html#openmpi-with-ucx>`_
+   see the UCX documentation for `building ucx with Open MPI: <https://openucx.readthedocs.io/en/main/running.html#openmpi-with-ucx>`_
 
    It should look something like: