From 6bc7132c998fbba3c544ceb062cc2806e946a18f Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Fri, 6 Mar 2020 12:45:59 +0100 Subject: [PATCH] fix deprecated warnings (#1048) * fix deprecated warnings * deprecated --- docs/source/tpu.rst | 2 +- pytorch_lightning/__init__.py | 2 +- pytorch_lightning/core/decorators.py | 2 +- pytorch_lightning/logging/__init__.py | 8 ++++---- pytorch_lightning/logging/comet.py | 2 +- pytorch_lightning/logging/mlflow.py | 2 +- pytorch_lightning/logging/neptune.py | 2 +- pytorch_lightning/logging/test_tube.py | 2 +- pytorch_lightning/logging/wandb.py | 2 +- pytorch_lightning/trainer/__init__.py | 4 ++-- pytorch_lightning/trainer/trainer.py | 18 +++++++++--------- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/source/tpu.rst b/docs/source/tpu.rst index 3a3b6ba2..7a7ece8c 100644 --- a/docs/source/tpu.rst +++ b/docs/source/tpu.rst @@ -86,7 +86,7 @@ the TPU. !pip install "$TORCHVISION_WHEEL" !sudo apt-get install libomp5 update.join() -5. Once the above is done, install PyTorch Lightning (v 0.6.1+). +5. Once the above is done, install PyTorch Lightning (v 0.7.0+). .. code-block:: diff --git a/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py index 9ff1ba30..6c2b328d 100644 --- a/pytorch_lightning/__init__.py +++ b/pytorch_lightning/__init__.py @@ -1,6 +1,6 @@ """Root package info.""" -__version__ = '0.6.1.dev' +__version__ = '0.7.0.dev' __author__ = 'William Falcon et al.' __author_email__ = 'waf2107@columbia.edu' __license__ = 'Apache-2.0' diff --git a/pytorch_lightning/core/decorators.py b/pytorch_lightning/core/decorators.py index be4fd41d..13643eea 100644 --- a/pytorch_lightning/core/decorators.py +++ b/pytorch_lightning/core/decorators.py @@ -9,7 +9,7 @@ def data_loader(fn): :param fn: :return: """ - w = 'data_loader decorator deprecated in 0.6.1. Will remove 0.8.0' + w = 'data_loader decorator deprecated in 0.7.0. Will remove 0.9.0' warnings.warn(w) def inner_fx(self): diff --git a/pytorch_lightning/logging/__init__.py b/pytorch_lightning/logging/__init__.py index 69c451eb..2058fffa 100644 --- a/pytorch_lightning/logging/__init__.py +++ b/pytorch_lightning/logging/__init__.py @@ -1,12 +1,12 @@ """ -.. warning:: `logging` package has been renamed to `loggers` since v0.6.1. - The deprecated package name will be removed in v0.8.0. +.. warning:: `logging` package has been renamed to `loggers` since v0.7.0. + The deprecated package name will be removed in v0.9.0. """ import warnings -warnings.warn("`logging` package has been renamed to `loggers` since v0.6.1" - " The deprecated package name will be removed in v0.8.0.", DeprecationWarning) +warnings.warn("`logging` package has been renamed to `loggers` since v0.7.0" + " The deprecated package name will be removed in v0.9.0.", DeprecationWarning) from pytorch_lightning.loggers import * # noqa: F403 from pytorch_lightning.loggers import base, tensorboard # noqa: F403 diff --git a/pytorch_lightning/logging/comet.py b/pytorch_lightning/logging/comet.py index 3961fcde..d3397f17 100644 --- a/pytorch_lightning/logging/comet.py +++ b/pytorch_lightning/logging/comet.py @@ -1,5 +1,5 @@ """ -.. warning:: `logging` package has been renamed to `loggers` since v0.6.1 and will be removed in v0.8.0 +.. warning:: `logging` package has been renamed to `loggers` since v0.7.0 and will be removed in v0.9.0 """ from pytorch_lightning.loggers import comet # noqa: F403 diff --git a/pytorch_lightning/logging/mlflow.py b/pytorch_lightning/logging/mlflow.py index 70ab7359..4d16e418 100644 --- a/pytorch_lightning/logging/mlflow.py +++ b/pytorch_lightning/logging/mlflow.py @@ -1,5 +1,5 @@ """ -.. warning:: `logging` package has been renamed to `loggers` since v0.6.1 and will be removed in v0.8.0 +.. warning:: `logging` package has been renamed to `loggers` since v0.7.0 and will be removed in v0.9.0 """ from pytorch_lightning.loggers import mlflow # noqa: F403 diff --git a/pytorch_lightning/logging/neptune.py b/pytorch_lightning/logging/neptune.py index 0f5a73d5..a952daed 100644 --- a/pytorch_lightning/logging/neptune.py +++ b/pytorch_lightning/logging/neptune.py @@ -1,5 +1,5 @@ """ -.. warning:: `logging` package has been renamed to `loggers` since v0.6.1 and will be removed in v0.8.0 +.. warning:: `logging` package has been renamed to `loggers` since v0.7.0 and will be removed in v0.9.0 """ from pytorch_lightning.loggers import neptune # noqa: F403 diff --git a/pytorch_lightning/logging/test_tube.py b/pytorch_lightning/logging/test_tube.py index a821a433..f3494c13 100644 --- a/pytorch_lightning/logging/test_tube.py +++ b/pytorch_lightning/logging/test_tube.py @@ -1,5 +1,5 @@ """ -.. warning:: `logging` package has been renamed to `loggers` since v0.6.1 and will be removed in v0.8.0 +.. warning:: `logging` package has been renamed to `loggers` since v0.7.0 and will be removed in v0.9.0 """ from pytorch_lightning.loggers import test_tube # noqa: F403 diff --git a/pytorch_lightning/logging/wandb.py b/pytorch_lightning/logging/wandb.py index b0a96d2f..bc112b1d 100644 --- a/pytorch_lightning/logging/wandb.py +++ b/pytorch_lightning/logging/wandb.py @@ -1,5 +1,5 @@ """ -.. warning:: `logging` package has been renamed to `loggers` since v0.6.1 and will be removed in v0.8.0 +.. warning:: `logging` package has been renamed to `loggers` since v0.7.0 and will be removed in v0.9.0 """ from pytorch_lightning.loggers import wandb # noqa: F403 diff --git a/pytorch_lightning/trainer/__init__.py b/pytorch_lightning/trainer/__init__.py index 70cc4da7..f2e0125b 100644 --- a/pytorch_lightning/trainer/__init__.py +++ b/pytorch_lightning/trainer/__init__.py @@ -675,8 +675,8 @@ add_row_log_interval: use_amp: -.. warning:: .. deprecated:: 0.6.1 - Use `precision` instead. Will remove 0.8.0. +.. warning:: .. deprecated:: 0.7.0 + Use `precision` instead. Will remove 0.9.0. show_progress_bar ^^^^^^^^^^^^^^^^^ diff --git a/pytorch_lightning/trainer/trainer.py b/pytorch_lightning/trainer/trainer.py index 3d9bde72..c2e0ea3d 100644 --- a/pytorch_lightning/trainer/trainer.py +++ b/pytorch_lightning/trainer/trainer.py @@ -138,15 +138,15 @@ class Trainer(TrainerIOMixin, gradient_clip_val: 0 means don't clip. gradient_clip: - .. warning:: deprecated 0.6.1 Use `gradient_clip_val` instead. Will remove 0.8.0. + .. warning:: deprecated 0.7.0 Use `gradient_clip_val` instead. Will remove 0.9.0. process_position: orders the tqdm bar when running multiple models on same machine. num_nodes: number of GPU nodes for distributed training. nb_gpu_nodes: - .. warning:: .. deprecated:: 0.6.1 - Use `num_nodes` instead. Will remove 0.8.0. + .. warning:: .. deprecated:: 0.7.0 + Use `num_nodes` instead. Will remove 0.9.0. gpus: Which GPUs to train on. @@ -169,14 +169,14 @@ class Trainer(TrainerIOMixin, max_epochs: Stop training once this number of epochs is reached. max_nb_epochs: - .. warning:: .. deprecated:: 0.6.1 - Use `max_epochs` instead. Will remove 0.8.0. + .. warning:: .. deprecated:: 0.7.0 + Use `max_epochs` instead. Will remove 0.9.0. min_epochs: Force training for at least these many epochs min_nb_epochs: - .. warning:: .. deprecated:: 0.6.1 - Use `min_epochs` instead. Will remove 0.8.0. + .. warning:: .. deprecated:: 0.7.0 + Use `min_epochs` instead. Will remove 0.9.0. max_steps: Stop training after this number of steps. Disabled by default (None). @@ -195,8 +195,8 @@ class Trainer(TrainerIOMixin, row_log_interval: How often to add logging rows (does not write to disk) add_row_log_interval: - .. warning:: .. deprecated:: 0.6.1 - Use `row_log_interval` instead. Will remove 0.8.0. + .. warning:: .. deprecated:: 0.7.0 + Use `row_log_interval` instead. Will remove 0.9.0. distributed_backend: The distributed backend to use.