diff --git a/pytorch_lightning/__init__.py b/pytorch_lightning/__init__.py index 6252e343..3ef4f4a1 100644 --- a/pytorch_lightning/__init__.py +++ b/pytorch_lightning/__init__.py @@ -1,6 +1,6 @@ """Package info""" -__version__ = '0.5.3.2' +__version__ = '0.6.0' __author__ = 'William Falcon et al.' __author_email__ = 'waf2107@columbia.edu' __license__ = 'Apache-2.0' diff --git a/pytorch_lightning/core/model_saving.py b/pytorch_lightning/core/model_saving.py index a7bf1e6b..d607422c 100644 --- a/pytorch_lightning/core/model_saving.py +++ b/pytorch_lightning/core/model_saving.py @@ -1,10 +1,10 @@ """ -.. warning:: `model_saving` module has been renamed to `saving` since v0.5.3 and will be removed in v0.8.0 +.. warning:: `model_saving` module has been renamed to `saving` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`model_saving` module has been renamed to `saving` since v0.5.3" +warnings.warn("`model_saving` module has been renamed to `saving` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.core.saving import ModelIO # noqa: E402 diff --git a/pytorch_lightning/core/root_module.py b/pytorch_lightning/core/root_module.py index 43eb8276..9f8612bd 100644 --- a/pytorch_lightning/core/root_module.py +++ b/pytorch_lightning/core/root_module.py @@ -1,10 +1,10 @@ """ -.. warning:: `root_module` module has been renamed to `lightning` since v0.5.3 and will be removed in v0.8.0 +.. warning:: `root_module` module has been renamed to `lightning` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`root_module` module has been renamed to `lightning` since v0.5.3" +warnings.warn("`root_module` module has been renamed to `lightning` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.core.lightning import LightningModule # noqa: E402 diff --git a/pytorch_lightning/logging/comet_logger.py b/pytorch_lightning/logging/comet_logger.py index 93cf32b0..4ea0c071 100644 --- a/pytorch_lightning/logging/comet_logger.py +++ b/pytorch_lightning/logging/comet_logger.py @@ -1,10 +1,10 @@ """ -.. warning:: `comet_logger` module has been renamed to `comet` since v0.5.3 and will be removed in v0.8.0 +.. warning:: `comet_logger` module has been renamed to `comet` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`comet_logger` module has been renamed to `comet` since v0.5.3" +warnings.warn("`comet_logger` module has been renamed to `comet` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.logging.comet import CometLogger # noqa: E402 diff --git a/pytorch_lightning/logging/mlflow_logger.py b/pytorch_lightning/logging/mlflow_logger.py index a2d0d17e..aa56f5ff 100644 --- a/pytorch_lightning/logging/mlflow_logger.py +++ b/pytorch_lightning/logging/mlflow_logger.py @@ -1,10 +1,10 @@ """ -.. warning:: `mlflow_logger` module has been renamed to `mlflow` since v0.5.3 and will be removed in v0.8.0 +.. warning:: `mlflow_logger` module has been renamed to `mlflow` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`mlflow_logger` module has been renamed to `mlflow` since v0.5.3" +warnings.warn("`mlflow_logger` module has been renamed to `mlflow` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.logging.mlflow import MLFlowLogger # noqa: E402 diff --git a/pytorch_lightning/logging/test_tube_logger.py b/pytorch_lightning/logging/test_tube_logger.py index e9dc60b4..b76d526d 100644 --- a/pytorch_lightning/logging/test_tube_logger.py +++ b/pytorch_lightning/logging/test_tube_logger.py @@ -1,10 +1,10 @@ """ -.. warning:: `test_tube_logger` module has been renamed to `test_tube` since v0.5.3 and will be removed in v0.8.0 +.. warning:: `test_tube_logger` module has been renamed to `test_tube` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`test_tube_logger` module has been renamed to `test_tube` since v0.5.3" +warnings.warn("`test_tube_logger` module has been renamed to `test_tube` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.logging.test_tube import TestTubeLogger # noqa: E402 diff --git a/pytorch_lightning/overrides/override_data_parallel.py b/pytorch_lightning/overrides/override_data_parallel.py index 522ca74a..c2631847 100644 --- a/pytorch_lightning/overrides/override_data_parallel.py +++ b/pytorch_lightning/overrides/override_data_parallel.py @@ -1,11 +1,11 @@ """ -.. warning:: `override_data_parallel` module has been renamed to `data_parallel` since v0.5.3 +.. warning:: `override_data_parallel` module has been renamed to `data_parallel` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`override_data_parallel` module has been renamed to `data_parallel` since v0.5.3" +warnings.warn("`override_data_parallel` module has been renamed to `data_parallel` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.overrides.data_parallel import ( # noqa: E402 diff --git a/pytorch_lightning/pt_overrides/__init__.py b/pytorch_lightning/pt_overrides/__init__.py index afbe46bf..2f65f1f1 100644 --- a/pytorch_lightning/pt_overrides/__init__.py +++ b/pytorch_lightning/pt_overrides/__init__.py @@ -1,10 +1,10 @@ """ -.. warning:: `pt_overrides` package has been renamed to `overrides` since v0.5.3 and will be removed in v0.8.0 +.. warning:: `pt_overrides` package has been renamed to `overrides` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`pt_overrides` package has been renamed to `overrides` since v0.5.3" +warnings.warn("`pt_overrides` package has been renamed to `overrides` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.overrides import override_data_parallel # noqa: E402 diff --git a/pytorch_lightning/root_module/__init__.py b/pytorch_lightning/root_module/__init__.py index a4e8bc2f..1d0f5f06 100644 --- a/pytorch_lightning/root_module/__init__.py +++ b/pytorch_lightning/root_module/__init__.py @@ -1,10 +1,10 @@ """ -.. warning:: `root_module` package has been renamed to `core` since v0.5.3 and will be removed in v0.8.0 +.. warning:: `root_module` package has been renamed to `core` since v0.6.0 and will be removed in v0.8.0 """ import warnings -warnings.warn("`root_module` package has been renamed to `core` since v0.5.3" +warnings.warn("`root_module` package has been renamed to `core` since v0.6.0" " and will be removed in v0.8.0", DeprecationWarning) from pytorch_lightning.core import ( # noqa: E402 diff --git a/tests/requirements.txt b/tests/requirements.txt index 1ff186d8..bc3fcc8f 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -8,4 +8,5 @@ check-manifest # test_tube # already installed in main req. mlflow comet_ml -twine==1.13.0 \ No newline at end of file +twine==1.13.0 +pillow<7.0.0 \ No newline at end of file diff --git a/tests/test_cpu_models.py b/tests/test_cpu_models.py index f2cae173..1e71b8cd 100644 --- a/tests/test_cpu_models.py +++ b/tests/test_cpu_models.py @@ -97,7 +97,7 @@ def test_running_test_after_fitting(tmpdir): trainer_options = dict( default_save_path=tmpdir, show_progress_bar=False, - max_epochs=1, + max_epochs=4, train_percent_check=0.4, val_percent_check=0.2, test_percent_check=0.2, diff --git a/tests/test_restore_models.py b/tests/test_restore_models.py index 27f1d5db..fe6f3adf 100644 --- a/tests/test_restore_models.py +++ b/tests/test_restore_models.py @@ -153,7 +153,7 @@ def test_running_test_pretrained_model_dp(tmpdir): trainer_options = dict( show_progress_bar=True, - max_epochs=1, + max_epochs=4, train_percent_check=0.4, val_percent_check=0.2, checkpoint_callback=checkpoint, @@ -269,7 +269,7 @@ def test_cpu_restore_training(tmpdir): logger = tutils.get_test_tube_logger(tmpdir, False, version=test_logger_version) trainer_options = dict( - max_epochs=4, + max_epochs=8, val_check_interval=0.50, val_percent_check=0.2, train_percent_check=0.2, @@ -290,7 +290,7 @@ def test_cpu_restore_training(tmpdir): # we want to see if the weights come back correctly new_logger = tutils.get_test_tube_logger(tmpdir, False, version=test_logger_version) trainer_options = dict( - max_epochs=4, + max_epochs=2, val_check_interval=0.50, val_percent_check=0.2, train_percent_check=0.2,