Merge branch 'ddp_spawn' of github.com:daniellepintz/pytorch-lightning into ddp_spawn

Author: daniellepintz

pytorch_lightning/plugins/training_type/ddp_spawn.py

@@ -375,9 +375,8 @@ def post_training_step(self):
             self.model.require_backward_grad_sync = True
 
     def add_to_queue(self, trainer: "pl.Trainer", queue: torch.multiprocessing.SimpleQueue) -> None:
-        """
-        Appends the :attr:`trainer.callback_metrics` dictionary to the given queue.
-        To avoid issues with memory sharing, we cast the data to numpy.
+        """Appends the :attr:`trainer.callback_metrics` dictionary to the given queue. To avoid issues with memory
+        sharing, we cast the data to numpy.
 
         Args:
             queue: the instance of the queue to append the data.
@@ -388,9 +387,8 @@ def add_to_queue(self, trainer: "pl.Trainer", queue: torch.multiprocessing.Simpl
         queue.put(callback_metrics)
 
     def get_from_queue(self, trainer: "pl.Trainer", queue: torch.multiprocessing.SimpleQueue) -> None:
-        """
-        Retrieve the :attr:`trainer.callback_metrics` dictionary from the given queue.
-        To preserve consistency, we cast back the data to ``torch.Tensor``.
+        """Retrieve the :attr:`trainer.callback_metrics` dictionary from the given queue. To preserve consistency,
+        we cast back the data to ``torch.Tensor``.
 
         Args:
             queue: the instance of the queue from where to get the data.

tests/plugins/test_ddp_spawn_plugin.py

@@ -64,8 +64,8 @@ def test_ddp_cpu():
 
 @RunIf(min_gpus=2)
 def test_ddp_spawn_extra_parameters(tmpdir):
-    """Tests if device is set correctly when training for DDPSpawnPlugin
-    and tests add_to_queue/get_from_queue with Lightning Module (deprecated way)."""
+    """Tests if device is set correctly when training for DDPSpawnPlugin and tests add_to_queue/get_from_queue with
+    Lightning Module (deprecated way)."""
     trainer = Trainer(default_root_dir=tmpdir, fast_dev_run=True, gpus=2, accelerator="ddp_spawn")
 
     assert isinstance(trainer.training_type_plugin, DDPSpawnPlugin)