Switch v1.10 deprecation references (#16321)

Author: carmocca

src/pytorch_lightning/accelerators/accelerator.py

@@ -31,11 +31,11 @@ class Accelerator(_Accelerator, ABC):
     def setup_environment(self, root_device: torch.device) -> None:
         """
         .. deprecated:: v1.8.0
-            This hook was deprecated in v1.8.0 and will be removed in v1.10.0. Please use ``setup_device()`` instead.
+            This hook was deprecated in v1.8.0 and will be removed in v2.0.0. Please use ``setup_device()`` instead.
         """
         rank_zero_deprecation(
             "`Accelerator.setup_environment` has been deprecated in deprecated in v1.8.0 and will be removed in"
-            " v1.10.0. Please use ``setup_device()`` instead."
+            " v2.0.0. Please use `setup_device()` instead."
         )
         self.setup_device(root_device)
 

src/pytorch_lightning/cli.py

@@ -279,7 +279,7 @@ def __init__(
         args: ArgsType = None,
         run: bool = True,
         auto_configure_optimizers: bool = True,
-        **kwargs: Any,  # Remove with deprecations of v1.10
+        **kwargs: Any,  # Remove with deprecations of v2.0.0
     ) -> None:
         """Receives as input pytorch-lightning classes (or callables which return pytorch-lightning classes), which
         are called / instantiated using a parsed configuration file and / or command line args.
@@ -364,7 +364,7 @@ def _handle_deprecated_params(self, kwargs: dict) -> None:
             self.save_config_kwargs[key] = value
             rank_zero_deprecation(
                 f"LightningCLI's {name!r} init parameter is deprecated from v1.8 and will "
-                f"be removed in v1.10. Use `save_config_kwargs={{'{key}': ...}}` instead."
+                f"be removed in v2.0.0. Use `save_config_kwargs={{'{key}': ...}}` instead."
             )
 
         for name in kwargs.keys() & ["description", "env_prefix", "env_parse"]:

src/pytorch_lightning/core/mixins/device_dtype_mixin.py

@@ -20,6 +20,6 @@ class DeviceDtypeModuleMixin(_DeviceDtypeModuleMixin):
     def __init__(self) -> None:
         rank_zero_deprecation(
             "`pytorch_lightning.core.mixins.DeviceDtypeModuleMixin` has been deprecated in v1.8.0 and will be"
-            " removed in v1.10.0. This class is internal but you can copy over its implementation."
+            " removed in v2.0.0. This class is internal but you can copy over its implementation."
         )
         super().__init__()

src/pytorch_lightning/lite/lite.py

@@ -85,13 +85,13 @@ class LightningLite(Fabric, ABC):
         gpus: Provides the same function as the ``devices`` argument but implies ``accelerator="gpu"``.
 
             .. deprecated:: v1.8.0
-                ``gpus`` has been deprecated in v1.8.0 and will be removed in v1.10.0.
+                ``gpus`` has been deprecated in v1.8.0 and will be removed in v2.0.0.
                 Please use ``accelerator='gpu'`` and ``devices=x`` instead.
 
         tpu_cores: Provides the same function as the ``devices`` argument but implies ``accelerator="tpu"``.
 
             .. deprecated:: v1.8.0
-                ``tpu_cores`` has been deprecated in v1.8.0 and will be removed in v1.10.0.
+                ``tpu_cores`` has been deprecated in v1.8.0 and will be removed in v2.0.0.
                 Please use ``accelerator='tpu'`` and ``devices=x`` instead.
     """
 
@@ -154,12 +154,12 @@ def _convert_deprecated_device_flags(
     if gpus is not None:
         rank_zero_deprecation(
             f"Setting `Lite(gpus={gpus!r})` is deprecated in v1.8.0 and will be removed"
-            f" in v1.10.0. Please use `Lite(accelerator='gpu', devices={gpus!r})` instead."
+            f" in v2.0.0. Please use `Lite(accelerator='gpu', devices={gpus!r})` instead."
         )
     if tpu_cores is not None:
         rank_zero_deprecation(
             f"Setting `Lite(tpu_cores={tpu_cores!r})` is deprecated in v1.8.0 and will be removed"
-            f" in v1.10.0. Please use `Lite(accelerator='tpu', devices={tpu_cores!r})` instead."
+            f" in v2.0.0. Please use `Lite(accelerator='tpu', devices={tpu_cores!r})` instead."
         )
     deprecated_devices_specific_flag = gpus or tpu_cores
     if deprecated_devices_specific_flag and deprecated_devices_specific_flag not in ([], 0, "0"):

src/pytorch_lightning/loops/optimization/optimizer_loop.py

@@ -361,7 +361,7 @@ def _optimizer_step(
         if is_param_in_hook_signature(pl_module.optimizer_step, "using_native_amp", explicit=True):
             rank_zero_deprecation(
                 "The NVIDIA/apex AMP implementation has been deprecated upstream. Consequently, its integration inside"
-                " PyTorch Lightning has been deprecated in v1.9.0 and will be removed in v1.10.0."
+                " PyTorch Lightning has been deprecated in v1.9.0 and will be removed in v2.0.0."
                 f" The `{type(pl_module).__name__}.optimizer_step()` hook is overridden, including the"
                 " `using_native_amp` argument. Removing this argument will avoid this message, you can expect it to"
                 " return True."

src/pytorch_lightning/overrides/base.py

@@ -75,7 +75,7 @@ def __init__(
                 "`forward_module` must be a `LightningModule` instance or have an attribute `.module` pointing to one,"
                 f" got: {forward_module.__class__.__qualname__}"
             )
-        # TODO: In v1.10.0, remove the Optional type from forward_module and remove the assertion
+        # TODO: In v2.0.0, remove the Optional type from forward_module and remove the assertion
         assert forward_module is not None
         self._forward_module = forward_module
 
@@ -118,11 +118,11 @@ def _validate_init_arguments(
         pl_module: Optional[Union["pl.LightningModule", _LightningPrecisionModuleWrapperBase]] = None,
         forward_module: Optional[Union["pl.LightningModule", _LightningPrecisionModuleWrapperBase]] = None,
     ) -> None:
-        # TODO: In v1.10.0, remove this method and mark the forward_module init argument in all subclasses as required
+        # TODO: In v2.0.0, remove this method and mark the forward_module init argument in all subclasses as required
         if pl_module is not None:
             rank_zero_deprecation(
                 f"The argument `pl_module` in `{cls.__name__}` is deprecated in v1.8.0 and will be removed in"
-                " v1.10.0. Please use `forward_module` instead."
+                " v2.0.0. Please use `forward_module` instead."
             )
         elif forward_module is None:
             raise ValueError("Argument `forward_module` is required.")
@@ -133,7 +133,7 @@ def unwrap_lightning_module(wrapped_model: nn.Module, _suppress_warning: bool =
     attributes on the wrapper.
 
     .. deprecated:: v1.8.0
-        The function ``unwrap_lightning_module`` is deprecated in v1.8.0 and will be removed in v1.10.0. Access the
+        The function ``unwrap_lightning_module`` is deprecated in v1.8.0 and will be removed in v2.0.0. Access the
         ``LightningModule`` directly through the strategy attribute ``Strategy.lightning_module``.
 
     Raises:
@@ -142,7 +142,7 @@ def unwrap_lightning_module(wrapped_model: nn.Module, _suppress_warning: bool =
     """
     if not _suppress_warning:
         rank_zero_deprecation(
-            "The function `unwrap_lightning_module` is deprecated in v1.8.0 and will be removed in v1.10.0. Access the"
+            "The function `unwrap_lightning_module` is deprecated in v1.8.0 and will be removed in v2.0.0. Access the"
             " `LightningModule` directly through the strategy attribute `Strategy.lightning_module`."
         )
     model = wrapped_model

src/pytorch_lightning/overrides/data_parallel.py

@@ -55,7 +55,7 @@ class LightningParallelModule(_LightningModuleWrapperBase):
         pl_module: The module to wrap. See description for `forward_module`.
 
             .. deprecated:: v1.8.0
-                The argument ``pl_module`` is deprecated in v1.8.0 and will be removed in v1.10.0. Please use
+                The argument ``pl_module`` is deprecated in v1.8.0 and will be removed in v2.0.0. Please use
                 ``forward_module`` instead.
 
         forward_module: The module to wrap. If it's not a ``LightningModule``, it must have an attribute ``.module``

src/pytorch_lightning/overrides/fairscale.py

@@ -38,7 +38,7 @@ def unwrap_lightning_module_sharded(wrapped_model: nn.Module) -> "pl.LightningMo
     from fairscale.nn.data_parallel.sharded_ddp import ShardedDataParallel
 
     rank_zero_deprecation(
-        "The function `unwrap_lightning_module_sharded` is deprecated in v1.8.0 and will be removed in v1.10.0."
+        "The function `unwrap_lightning_module_sharded` is deprecated in v1.8.0 and will be removed in v2.0.0."
         " Access the `LightningModule` directly through the strategy attribute `Strategy.lightning_module`."
     )
     model = wrapped_model

src/pytorch_lightning/plugins/precision/apex_amp.py

@@ -36,7 +36,7 @@ def _import_amp_without_deprecation() -> ModuleType:
     return amp
 
 
-# TODO: remove in v1.10.0
+# TODO: remove in v2.0.0
 class ApexMixedPrecisionPlugin(PrecisionPlugin):
     """Mixed Precision Plugin based on Nvidia/Apex (https://github.com/NVIDIA/apex)"""
 
@@ -47,7 +47,7 @@ def __init__(self, amp_level: str = "O2") -> None:
         rank_zero_deprecation(
             "The NVIDIA/apex AMP implementation has been deprecated upstream. Consequently, its integration inside"
             f" PyTorch Lightning has been deprecated in v1.9.0. The `{type(self).__name__}` class will be removed in"
-            " v1.10.0. Please use PyTorch's AMP implementation available in"
+            " v2.0.0. Please use PyTorch's AMP implementation available in"
             " `pytorch_lightning.plugins.MixedPrecisionPlugin` instead."
         )
         if not _APEX_AVAILABLE:

src/pytorch_lightning/plugins/precision/deepspeed.py

@@ -55,11 +55,11 @@ def __init__(
         amp_level: Optional[str] = None,
     ) -> None:
         if amp_type == "apex":
-            # TODO: remove in v1.10.0
+            # TODO: remove in v2.0.0
             rank_zero_deprecation(
                 "The NVIDIA/apex AMP implementation has been deprecated upstream. Consequently, its integration inside"
                 " PyTorch Lightning has been deprecated in v1.9.0. Support for using it through the DeepSpeed"
-                " implementation will be removed in v1.10.0."
+                " implementation will be removed in v2.0.0."
             )
             if not _APEX_AVAILABLE:
                 raise MisconfigurationException(
@@ -77,7 +77,7 @@ def __init__(
         else:
             rank_zero_deprecation(
                 f"Passing `{type(self).__name__}(amp_type={amp_type!r})` been deprecated in v1.9.0 and will be removed"
-                f" in v1.10.0. This argument is no longer necessary."
+                f" in v2.0.0. This argument is no longer necessary."
             )
 
         supported_precision = get_args(_PRECISION_INPUT_STR) + get_args(_PRECISION_INPUT_INT)