rename set_random_master_port (#10104)

Co-authored-by: tchaton <[email protected]>

Author: awaelchli

tests/accelerators/test_common.py

@@ -32,7 +32,7 @@
     ),
 )
 def test_evaluate(tmpdir, trainer_kwargs):
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
     seed_everything(1)
     dm = ClassifDataModule()
     model = CustomClassificationModelDP()

tests/accelerators/test_ddp_spawn.py

@@ -24,7 +24,7 @@
 
 @RunIf(min_gpus=2)
 def test_multi_gpu_early_stop_ddp_spawn(tmpdir):
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     trainer_options = dict(
         default_root_dir=tmpdir,
@@ -43,7 +43,7 @@ def test_multi_gpu_early_stop_ddp_spawn(tmpdir):
 
 @RunIf(min_gpus=2)
 def test_multi_gpu_model_ddp_spawn(tmpdir):
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     trainer_options = dict(
         default_root_dir=tmpdir,
@@ -66,7 +66,7 @@ def test_multi_gpu_model_ddp_spawn(tmpdir):
 @RunIf(min_gpus=2)
 def test_ddp_all_dataloaders_passed_to_fit(tmpdir):
     """Make sure DDP works with dataloaders passed to fit()"""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     model = BoringModel()
     fit_options = dict(train_dataloader=model.train_dataloader(), val_dataloaders=model.val_dataloader())

tests/accelerators/test_dp.py

@@ -59,7 +59,7 @@ def test_multi_gpu_early_stop_dp(tmpdir):
 
     with early stopping
     """
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     dm = ClassifDataModule()
     model = CustomClassificationModelDP()
@@ -79,7 +79,7 @@ def test_multi_gpu_early_stop_dp(tmpdir):
 
 @RunIf(min_gpus=2)
 def test_multi_gpu_model_dp(tmpdir):
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     trainer_options = dict(
         default_root_dir=tmpdir,

tests/core/test_metric_result_integration.py

@@ -103,7 +103,7 @@ def _ddp_test_fn(rank, worldsize):
 @RunIf(skip_windows=True, min_gpus=2)
 def test_result_reduce_ddp():
     """Make sure result logging works with DDP."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     worldsize = 2
     mp.spawn(_ddp_test_fn, args=(worldsize,), nprocs=worldsize)

tests/core/test_results.py

@@ -41,6 +41,6 @@ def _ddp_test_fn(rank, worldsize):
 @RunIf(skip_windows=True)
 def test_result_reduce_ddp():
     """Make sure result logging works with DDP."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
     worldsize = 2
     mp.spawn(_ddp_test_fn, args=(worldsize,), nprocs=worldsize)

tests/helpers/utils.py

@@ -73,7 +73,7 @@ def reset_seed(seed=0):
     seed_everything(seed)
 
 
-def set_random_master_port():
+def set_random_main_port():
     reset_seed()
     port = RANDOM_PORTS.pop()
     os.environ["MASTER_PORT"] = str(port)

tests/models/data/horovod/train_default_model.py

@@ -37,7 +37,7 @@
     print("You requested to import Horovod which is missing or not supported for your OS.")
 
 from tests.helpers import BoringModel  # noqa: E402
-from tests.helpers.utils import reset_seed, set_random_master_port  # noqa: E402
+from tests.helpers.utils import reset_seed, set_random_main_port  # noqa: E402
 
 parser = argparse.ArgumentParser()
 parser.add_argument("--trainer-options", required=True)
@@ -46,7 +46,7 @@
 
 def run_test_from_config(trainer_options, on_gpu, check_size=True):
     """Trains the default model with the given config."""
-    set_random_master_port()
+    set_random_main_port()
     reset_seed()
 
     ckpt_path = trainer_options["weights_save_path"]

tests/models/test_amp.py

@@ -129,7 +129,7 @@ def test_amp_gpus(tmpdir, strategy, precision, gpus):
 def test_amp_gpu_ddp_slurm_managed(tmpdir):
     """Make sure DDP + AMP work."""
     # simulate setting slurm flags
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     model = AMPTestModel()
 

tests/models/test_cpu.py

@@ -125,7 +125,7 @@ def validation_step(self, *args, **kwargs):
 @RunIf(skip_windows=True)
 def test_multi_cpu_model_ddp(tmpdir):
     """Make sure DDP works."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     trainer_options = dict(
         default_root_dir=tmpdir,

tests/models/test_gpu.py

@@ -40,7 +40,7 @@
 @RunIf(min_gpus=2)
 def test_multi_gpu_none_backend(tmpdir):
     """Make sure when using multiple GPUs the user can't use `accelerator = None`."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
     trainer_options = dict(
         default_root_dir=tmpdir,
         enable_progress_bar=False,

tests/models/test_horovod.py

@@ -273,7 +273,7 @@ def test_result_reduce_horovod(tmpdir):
     This test mirrors tests/core/test_results.py::_ddp_test_fn
     """
     tutils.reset_seed()
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     def hvd_test_fn():
         path_here = os.path.abspath(os.path.dirname(__file__))

tests/models/test_onnx.py

@@ -88,7 +88,7 @@ def test_model_saves_with_example_input_array(tmpdir, modelclass, input_sample):
 @RunIf(min_gpus=2)
 def test_model_saves_on_multi_gpu(tmpdir):
     """Test that ONNX model saves on a distributed backend."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     trainer_options = dict(
         default_root_dir=tmpdir,

tests/models/test_restore.py

@@ -304,7 +304,7 @@ def test_callbacks_references_resume_from_checkpoint(tmpdir):
 def test_running_test_pretrained_model_distrib_dp(tmpdir):
     """Verify `test()` on pretrained model."""
 
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
 
     dm = ClassifDataModule()
     model = CustomClassificationModelDP(lr=0.1)
@@ -351,7 +351,7 @@ def test_running_test_pretrained_model_distrib_dp(tmpdir):
 @RunIf(min_gpus=2)
 def test_running_test_pretrained_model_distrib_ddp_spawn(tmpdir):
     """Verify `test()` on pretrained model."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
     dm = ClassifDataModule()
     model = ClassificationModel()
 

tests/models/test_sync_batchnorm.py

@@ -22,7 +22,7 @@
 from pytorch_lightning.utilities import FLOAT16_EPSILON
 from tests.helpers.datamodules import MNISTDataModule
 from tests.helpers.runif import RunIf
-from tests.helpers.utils import set_random_master_port
+from tests.helpers.utils import set_random_main_port
 
 
 class SyncBNModule(LightningModule):
@@ -70,7 +70,7 @@ def configure_optimizers(self):
 @RunIf(min_gpus=2, special=True)
 def test_sync_batchnorm_ddp(tmpdir):
     seed_everything(234)
-    set_random_master_port()
+    set_random_main_port()
 
     # define datamodule and dataloader
     dm = MNISTDataModule()

tests/trainer/test_trainer.py

@@ -1834,7 +1834,7 @@ def validation_epoch_end(self, outputs) -> None:
 @RunIf(skip_windows=True)
 def test_fit_test_synchronization(tmpdir):
     """Test that the trainer synchronizes processes before returning control back to the caller."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
     model = TestDummyModelForCheckpoint()
     checkpoint = ModelCheckpoint(dirpath=tmpdir, monitor="x", mode="min", save_top_k=1)
     trainer = Trainer(

tests/utilities/test_auto_restart.py

@@ -358,7 +358,7 @@ def _test_fast_forward_sampler_with_distributed_sampler(rank, worldsize):
 @RunIf(skip_windows=True)
 def test_fast_forward_sampler_with_distributed_sampler():
     """Make sure result logging works with DDP."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
     worldsize = 2
     mp.spawn(_test_fast_forward_sampler_with_distributed_sampler, args=(worldsize,), nprocs=worldsize)
 
@@ -632,7 +632,7 @@ def test_fast_forward_sampler_iterative_dataset():
 @RunIf(skip_windows=True)
 def test_fast_forward_sampler_with_distributed_sampler_and_iterative_dataset():
     """Make sure result logging works with DDP."""
-    tutils.set_random_master_port()
+    tutils.set_random_main_port()
     worldsize = 2
     mp.spawn(
         _test_fast_forward_sampler_with_distributed_sampler_and_iterative_dataset, args=(worldsize,), nprocs=worldsize