master -> main for branches (#626)

ssheorey · web-flow · commit c7511921ce81 · 2023-12-11T09:04:13.000-08:00
master -&gt; primary elsewhere
diff --git a/.github/ISSUE_TEMPLATE/0-build-issue-report.yml b/.github/ISSUE_TEMPLATE/0-build-issue-report.yml
@@ -13,7 +13,7 @@ body:
         required: true
       - label: "I have tested with the [latest development wheel](http://www.open3d.org/docs/latest/getting_started.html#development-version-pip)."
         required: true
-      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `master` branch)."
+      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `main` branch)."
         required: true
 
 - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml
@@ -13,7 +13,7 @@ body:
         required: true
       - label: "I have tested with the [latest development wheel](http://www.open3d.org/docs/latest/getting_started.html#development-version-pip)."
         required: true
-      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `master` branch)."
+      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `main` branch)."
         required: true
 
 - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/2-questions.yml b/.github/ISSUE_TEMPLATE/2-questions.yml
@@ -13,7 +13,7 @@ body:
         required: true
       - label: "I have tested with the [latest development wheel](http://www.open3d.org/docs/latest/getting_started.html#development-version-pip)."
         required: true
-      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `master` branch)."
+      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `main` branch)."
         required: true
 
 - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/3-feature-request.yml b/.github/ISSUE_TEMPLATE/3-feature-request.yml
@@ -13,7 +13,7 @@ body:
         required: true
       - label: "I have tested with the [latest development wheel](http://www.open3d.org/docs/latest/getting_started.html#development-version-pip)."
         required: true
-      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `master` branch)."
+      - label: "I have checked the [release documentation](http://www.open3d.org/docs/release/) and the [latest documentation](http://www.open3d.org/docs/latest/) (for `main` branch)."
         required: true
 
 - type: textarea
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -3,7 +3,7 @@ name: Style check
 on:
   workflow_dispatch:
   push:
-    branches: [master, dev]
+    branches: [main, dev]
   pull_request:
     types: [opened, reopened, synchronize]
 
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -3,7 +3,7 @@ name: Ubuntu CI
 on:
   workflow_dispatch:
   push:
-    branches: [master, dev]
+    branches: [main, dev]
   pull_request:
     types: [opened, reopened, synchronize]
 
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-<img src="https://raw.githubusercontent.com/isl-org/Open3D/master/docs/_static/open3d_logo_horizontal.png" width="320" />
+<img src="https://raw.githubusercontent.com/isl-org/Open3D/main/docs/_static/open3d_logo_horizontal.png" width="320" />
 <span style="font-size: 220%"><b>ML</b></span>
 </p>
 
@@ -199,8 +199,8 @@ pipeline.run_train()
 
 ```
 
-For more examples see [`examples/`](https://github.com/isl-org/Open3D-ML/tree/master/examples)
-and the [`scripts/`](https://github.com/isl-org/Open3D-ML/tree/master/scripts) directories. You
+For more examples see [`examples/`](https://github.com/isl-org/Open3D-ML/tree/main/examples)
+and the [`scripts/`](https://github.com/isl-org/Open3D-ML/tree/main/scripts) directories. You
 can also enable saving training summaries in the config file and visualize ground truth and
 results with tensorboard. See this [tutorial](docs/tensorboard.md#3dml-models-training-and-inference)
 for details.
@@ -272,10 +272,10 @@ pipeline.run_train()
 
 Below is an example of visualization using KITTI. The example shows the use of bounding boxes for the KITTI dataset.
 
-<img width="640" src="https://github.com/isl-org/Open3D-ML/blob/master/docs/images/visualizer_BoundingBoxes.png?raw=true">
+<img width="640" src="https://github.com/isl-org/Open3D-ML/blob/main/docs/images/visualizer_BoundingBoxes.png?raw=true">
 
-For more examples see [`examples/`](https://github.com/isl-org/Open3D-ML/tree/master/examples)
-and the [`scripts/`](https://github.com/isl-org/Open3D-ML/tree/master/scripts) directories. You
+For more examples see [`examples/`](https://github.com/isl-org/Open3D-ML/tree/main/examples)
+and the [`scripts/`](https://github.com/isl-org/Open3D-ML/tree/main/scripts) directories. You
 can also enable saving training summaries in the config file and visualize ground truth and
 results with tensorboard. See this [tutorial](docs/tensorboard.md#3dml-models-training-and-inference)
 for details.
@@ -284,7 +284,7 @@ for details.
 
 ### Using predefined scripts
 
-[`scripts/run_pipeline.py`](https://github.com/isl-org/Open3D-ML/blob/master/scripts/run_pipeline.py)
+[`scripts/run_pipeline.py`](https://github.com/isl-org/Open3D-ML/blob/main/scripts/run_pipeline.py)
 provides an easy interface for training and evaluating a model on a dataset. It saves
 the trouble of defining specific model and passing exact configuration.
 
@@ -409,7 +409,7 @@ The following is a list of datasets for which we provide dataset reader classes.
 -   Waymo ([project-page](https://waymo.com/open/))
 -   ScanNet([project-page](http://www.scan-net.org/))
 
-For downloading these datasets visit the respective webpages and have a look at the scripts in [`scripts/download_datasets`](https://github.com/isl-org/Open3D-ML/tree/master/scripts/download_datasets).
+For downloading these datasets visit the respective webpages and have a look at the scripts in [`scripts/download_datasets`](https://github.com/isl-org/Open3D-ML/tree/main/scripts/download_datasets).
 
 ## How-tos
 
diff --git a/ci/run_ci.sh b/ci/run_ci.sh
@@ -9,8 +9,8 @@ echo 1. Prepare the Open3D-ML repo and install dependencies
 echo
 export PATH_TO_OPEN3D_ML="$PWD"
 echo "$PATH_TO_OPEN3D_ML"
-# the build system of the main repo expects a master branch. make sure master exists
-git checkout -b master || true
+# the build system of the main repo expects a main branch. make sure main exists
+git checkout -b main || true
 python -m pip install -U pip==$PIP_VER
 python -m pip install -r requirements.txt \
     -r requirements-torch.txt
@@ -21,7 +21,7 @@ python -m pip install -U Cython
 
 echo 2. clone Open3D and install dependencies
 echo
-git clone --branch master https://github.com/isl-org/Open3D.git
+git clone --branch main https://github.com/isl-org/Open3D.git
 
 ./Open3D/util/install_deps_ubuntu.sh assume-yes
 python -m pip install -r Open3D/python/requirements.txt \
diff --git a/model_zoo.md b/model_zoo.md
@@ -34,5 +34,5 @@ The following is a list of datasets for which we provide dataset reader classes.
 * S3DIS ([project-page](http://3dsemantics.stanford.edu/))
 * Paris-Lille 3D ([project-page](https://npm3d.fr/paris-lille-3d))
 
-For downloading these datasets visit the respective webpages and have a look at the scripts in [`scripts/download_datasets`](https://github.com/isl-org/Open3D-ML/tree/master/scripts/download_datasets).
+For downloading these datasets visit the respective webpages and have a look at the scripts in [`scripts/download_datasets`](https://github.com/isl-org/Open3D-ML/tree/main/scripts/download_datasets).
 
diff --git a/scripts/run_pipeline.py b/scripts/run_pipeline.py
@@ -199,8 +199,8 @@ def main():
 
 
 def setup(rank, world_size, args):
-    os.environ['MASTER_ADDR'] = args.host
-    os.environ['MASTER_PORT'] = args.port
+    os.environ['PRIMARY_ADDR'] = args.host
+    os.environ['PRIMARY_PORT'] = args.port
 
     # initialize the process group
     dist.init_process_group(args.backend, rank=rank, world_size=world_size)
diff --git a/scripts/train_scripts/pointpillars_waymo.sh b/scripts/train_scripts/pointpillars_waymo.sh
@@ -15,9 +15,9 @@ if [ "$#" -ne 2 ]; then
     exit 1
 fi
 
-# Use launch node as master, if not set
-export MASTER_ADDR=${MASTER_ADDR:-$SLURMD_NODENAME}
-export MASTER_PORT=${MASTER_PORT:-29500}
+# Use launch node as main, if not set
+export PRIMARY_ADDR=${PRIMARY_ADDR:-$SLURMD_NODENAME}
+export PRIMARY_PORT=${PRIMARY_PORT:-29500}
 # Use all available GPUs, if not set. Must be the same for ALL nodes.
 export DEVICE_IDS=${DEVICE_IDS:-$(nvidia-smi --list-gpus | cut -f2 -d' ' | tr ':\n' ' ')}
 export NODE_RANK=${NODE_RANK:-SLURM_NODEID} # Pass name of env var
@@ -32,7 +32,7 @@ srun -l python scripts/run_pipeline.py "$1" -c ml3d/configs/pointpillars_waymo.y
     --backend nccl \
     --nodes $SLURM_JOB_NUM_NODES \
     --node_rank "$NODE_RANK" \
-    --host "$MASTER_ADDR" --port "$MASTER_PORT"
+    --host "$PRIMARY_ADDR" --port "$PRIMARY_PORT"
 
 echo Completed at: $(date)
 popd
