+
ML
-
+
ML
+
-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
index f4ae82eca..0d10a3d6c 100755
--- 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
index 829c4a3bc..482d8f000 100644
--- 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
index 91a9e409a..895f470f7 100644
--- 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
index a1cd7dadc..f135e9083 100644
--- 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