From 5de4d9725e6736ff19ef43a9b8b5b634afdb8abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20W=C3=A4lchli?= Date: Fri, 16 Jul 2021 19:16:31 +0200 Subject: [PATCH 1/3] move deprecation test to correct 1.6 test file --- tests/deprecated_api/test_remove_1-4.py | 14 -------------- tests/deprecated_api/test_remove_1-6.py | 13 +++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/deprecated_api/test_remove_1-4.py b/tests/deprecated_api/test_remove_1-4.py index dde03b1de1c7a..b3ed7ab604d6d 100644 --- a/tests/deprecated_api/test_remove_1-4.py +++ b/tests/deprecated_api/test_remove_1-4.py @@ -15,9 +15,7 @@ import pytest -from pytorch_lightning import Trainer from tests.deprecated_api import _soft_unimport_module -from tests.helpers import BoringModel def test_v1_4_0_deprecated_imports(): @@ -25,15 +23,3 @@ def test_v1_4_0_deprecated_imports(): with pytest.deprecated_call(match='will be removed in v1.4'): from pytorch_lightning.utilities.argparse_utils import _gpus_arg_default # noqa: F811 F401 - -def test_v1_4_0_deprecated_hpc_load(tmpdir): - model = BoringModel() - trainer = Trainer( - default_root_dir=tmpdir, - max_steps=1, - ) - trainer.fit(model) - trainer.checkpoint_connector.hpc_save(tmpdir, trainer.logger) - checkpoint_path = trainer.checkpoint_connector.get_max_ckpt_path_from_folder(str(tmpdir)) - with pytest.deprecated_call(match=r"`CheckpointConnector.hpc_load\(\)` was deprecated in v1.4"): - trainer.checkpoint_connector.hpc_load(checkpoint_path) diff --git a/tests/deprecated_api/test_remove_1-6.py b/tests/deprecated_api/test_remove_1-6.py index ddb551631cb57..2dc2793a56820 100644 --- a/tests/deprecated_api/test_remove_1-6.py +++ b/tests/deprecated_api/test_remove_1-6.py @@ -309,3 +309,16 @@ def test_v1_6_0_deprecated_disable_validation(): def test_v1_6_0_every_n_val_epochs(): with pytest.deprecated_call(match="use `every_n_epochs` instead"): _ = ModelCheckpoint(every_n_val_epochs=1) + + +def test_v1_4_0_deprecated_hpc_load(tmpdir): + model = BoringModel() + trainer = Trainer( + default_root_dir=tmpdir, + max_steps=1, + ) + trainer.fit(model) + trainer.checkpoint_connector.hpc_save(tmpdir, trainer.logger) + checkpoint_path = trainer.checkpoint_connector.get_max_ckpt_path_from_folder(str(tmpdir)) + with pytest.deprecated_call(match=r"`CheckpointConnector.hpc_load\(\)` was deprecated in v1.4"): + trainer.checkpoint_connector.hpc_load(checkpoint_path) From 287b423a7e9fcbe00d7dfea20f541beb4125a794 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 16 Jul 2021 17:19:25 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/deprecated_api/test_remove_1-4.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/deprecated_api/test_remove_1-4.py b/tests/deprecated_api/test_remove_1-4.py index b3ed7ab604d6d..50bf88c026a52 100644 --- a/tests/deprecated_api/test_remove_1-4.py +++ b/tests/deprecated_api/test_remove_1-4.py @@ -22,4 +22,3 @@ def test_v1_4_0_deprecated_imports(): _soft_unimport_module('pytorch_lightning.utilities.argparse_utils') with pytest.deprecated_call(match='will be removed in v1.4'): from pytorch_lightning.utilities.argparse_utils import _gpus_arg_default # noqa: F811 F401 - From da5b79ce4060f348220c6787c5bda322b13c69bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20W=C3=A4lchli?= Date: Fri, 16 Jul 2021 19:20:52 +0200 Subject: [PATCH 3/3] Update tests/deprecated_api/test_remove_1-6.py Co-authored-by: Jirka Borovec --- tests/deprecated_api/test_remove_1-6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/deprecated_api/test_remove_1-6.py b/tests/deprecated_api/test_remove_1-6.py index 2dc2793a56820..73365f8d022f2 100644 --- a/tests/deprecated_api/test_remove_1-6.py +++ b/tests/deprecated_api/test_remove_1-6.py @@ -311,7 +311,7 @@ def test_v1_6_0_every_n_val_epochs(): _ = ModelCheckpoint(every_n_val_epochs=1) -def test_v1_4_0_deprecated_hpc_load(tmpdir): +def test_v1_6_0_deprecated_hpc_load(tmpdir): model = BoringModel() trainer = Trainer( default_root_dir=tmpdir,