address Adrian's comments

Author: rohitgr7

pytorch_lightning/core/lightning.py

@@ -1970,8 +1970,7 @@ def add_to_queue(self, queue: pl.strategies.launchers.spawn._FakeQueue) -> None:
             queue: the instance of the queue to append the data.
 
         .. deprecated:: v1.5
-            This method was deprecated in v1.5 in favor of `DDPSpawnStrategy.add_to_queue`
-            and will be removed in v1.7.
+            This method was deprecated in v1.5 and will be removed in v1.7.
         """
 
     def get_from_queue(self, queue: pl.strategies.launchers.spawn._FakeQueue) -> None:
@@ -1982,8 +1981,7 @@ def get_from_queue(self, queue: pl.strategies.launchers.spawn._FakeQueue) -> Non
             queue: the instance of the queue from where to get the data.
 
         .. deprecated:: v1.5
-            This method was deprecated in v1.5 in favor of `DDPSpawnStrategy.get_from_queue`
-            and will be removed in v1.7.
+            This method was deprecated in v1.5 and will be removed in v1.7.
         """
 
     @contextmanager

pytorch_lightning/lite/lite.py

@@ -400,14 +400,14 @@ def seed_everything(seed: Optional[int] = None, workers: Optional[bool] = None)
 
     def _run_impl(self, run_method: Callable, *args: Any, **kwargs: Any) -> Any:
         # apply sharded context to prevent OOM
-        run_method = partial(self._run_with_sharded_context, run_method)
+        run_method = partial(self._run_with_strategy_setup, run_method)
 
         if self._strategy.launcher is not None:
             return self._strategy.launcher.launch(run_method, *args, **kwargs)
         else:
             return run_method(*args, **kwargs)
 
-    def _run_with_sharded_context(self, run_method: Callable, *args: Any, **kwargs: Any) -> Any:
+    def _run_with_strategy_setup(self, run_method: Callable, *args: Any, **kwargs: Any) -> Any:
         self._strategy.setup_environment()
         with self._strategy.model_sharded_context(), _replace_dataloader_init_method():
             return run_method(*args, **kwargs)

pytorch_lightning/trainer/configuration_validator.py

@@ -261,13 +261,11 @@ def _check_add_get_queue(model: "pl.LightningModule") -> None:
     """
     if is_overridden("add_to_queue", model):
         rank_zero_deprecation(
-            "The `LightningModule.add_to_queue` method was deprecated in v1.5 and will be removed in v1.7 in "
-            "favor of `DDPSpawnStrategy.add_to_queue`"
+            "The `LightningModule.add_to_queue` method was deprecated in v1.5 and will be removed in v1.7."
         )
     if is_overridden("get_from_queue", model):
         rank_zero_deprecation(
-            "The `LightningModule.get_from_queue` method was deprecated in v1.5 and will be removed in v1.7 in "
-            "favor of `DDPSpawnStrategy.get_from_queue`"
+            "The `LightningModule.get_from_queue` method was deprecated in v1.5 and will be removed in v1.7."
         )
 
 

setup.cfg

@@ -25,13 +25,13 @@ addopts =
     --color=yes
     --disable-pytest-warnings
 filterwarnings =
-   # error out on our deprecation warnings - ensures the code and tests are kept up-to-date
-   error::pytorch_lightning.utilities.rank_zero.LightningDeprecationWarning
-   error::FutureWarning
-   # warnings from deprecated modules on import
-   # TODO: remove in 1.7
-   ignore::pytorch_lightning.utilities.rank_zero.LightningDeprecationWarning:pytorch_lightning.core.decorators
-   ignore::pytorch_lightning.utilities.rank_zero.LightningDeprecationWarning:pytorch_lightning.core.memory
+    # error out on our deprecation warnings - ensures the code and tests are kept up-to-date
+    error::pytorch_lightning.utilities.rank_zero.LightningDeprecationWarning
+    error::FutureWarning
+    # warnings from deprecated modules on import
+    # TODO: remove in 1.7
+    ignore::pytorch_lightning.utilities.rank_zero.LightningDeprecationWarning:pytorch_lightning.core.decorators
+    ignore::pytorch_lightning.utilities.rank_zero.LightningDeprecationWarning:pytorch_lightning.core.memory
 
 junit_duration_report = call
 

tests/strategies/test_ddp_spawn_strategy.py

@@ -94,9 +94,6 @@ def get_from_queue(self, trainer: Trainer, queue) -> None:
 
 
 class TestDDPSpawnStrategy(DDPSpawnStrategy):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
     def _configure_launcher(self):
         self._launcher = CustomSpawnLauncher(self)