wassname/pytorch-lightning
1
0
Fork 0
mirror of https://github.com/wassname/pytorch-lightning.git synced 2026-09-09 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tests: refactor cleanup (#1744)

Browse Source 
* wip

* cleaning

* optim imports

* -

* default hparams

* fix restore

* fix imports
This commit is contained in:
Jirka Borovec
2020-05-10 13:15:28 -04:00
committed by GitHub
parent 4970927ec8
commit 134eb61e1a
41 changed files with 187 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_deprecated.py
+8 -8
View File
@@ -6,7 +6,7 @@ import pytest
from pytorch_lightning import Trainer
import tests.base.utils as tutils
from tests.base import TestModelBase, LightTrainDataloader, LightEmptyTestStep
from tests.base import EvalModelTemplate
def _soft_unimport_module(str_module):
@@ -120,11 +120,11 @@ def test_tbd_remove_in_v0_9_0_module_imports():
from pytorch_lightning.logging.wandb import WandbLogger # noqa: F402
class ModelVer0_6(LightTrainDataloader, LightEmptyTestStep, TestModelBase):
class ModelVer0_6(EvalModelTemplate):
# todo: this shall not be needed while evaluate asks for dataloader explicitly
def val_dataloader(self):
return self._dataloader(train=False)
return self.dataloader(train=False)
def validation_step(self, batch, batch_idx, *args, **kwargs):
return {'val_loss': 0.6}
@@ -133,17 +133,17 @@ class ModelVer0_6(LightTrainDataloader, LightEmptyTestStep, TestModelBase):
return {'val_loss': 0.6}
def test_dataloader(self):
return self._dataloader(train=False)
return self.dataloader(train=False)
def test_end(self, outputs):
return {'test_loss': 0.6}
class ModelVer0_7(LightTrainDataloader, LightEmptyTestStep, TestModelBase):
class ModelVer0_7(EvalModelTemplate):
# todo: this shall not be needed while evaluate asks for dataloader explicitly
def val_dataloader(self):
return self._dataloader(train=False)
return self.dataloader(train=False)
def validation_step(self, batch, batch_idx, *args, **kwargs):
return {'val_loss': 0.7}
@@ -152,14 +152,14 @@ class ModelVer0_7(LightTrainDataloader, LightEmptyTestStep, TestModelBase):
return {'val_loss': 0.7}
def test_dataloader(self):
return self._dataloader(train=False)
return self.dataloader(train=False)
def test_end(self, outputs):
return {'test_loss': 0.7}
def test_tbd_remove_in_v1_0_0_model_hooks():
hparams = tutils.get_default_hparams()
hparams = EvalModelTemplate.get_default_hparams()
model = ModelVer0_6(hparams)