drop torchvision, tests only (#797)

* drop torchvision, tests only * manifest * move test utils
Lightning-AI · Feb 11, 2020 · af44583 · af44583
1 parent 8fa802e
commit af44583
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 42 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -15,9 +15,7 @@ exclude *.svg
 recursive-include pytorch_lightning *.py
 
 # include examples
-recursive-include pl_examples *.py
-recursive-include pl_examples *.md
-recursive-include pl_examples *.sh
+recursive-include pl_examples *.py *.md *.sh *.txt
 
 # exclude tests from package
 recursive-exclude tests *

diff --git a/pl_examples/requirements.txt b/pl_examples/requirements.txt
@@ -0,0 +1 @@
+torchvision>=0.4.0
diff --git a/pytorch_lightning/testing/__init__.py b/pytorch_lightning/testing/__init__.py
diff --git a/pytorch_lightning/testing/model.py b/pytorch_lightning/testing/model.py
diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,6 @@ scikit-learn>=0.20.2
 tqdm>=4.35.0
 numpy>=1.16.4
 torch>=1.1
-torchvision>=0.4.0, < 0.5  # the 0.5. has some issues with torch JIT
 tensorboard>=1.14
 future>=0.17.1  # required for builtins in setup.py
 
diff --git a/tests/models/__init__.py b/tests/models/__init__.py
@@ -0,0 +1,24 @@
+"""Models for testing."""
+
+import torch
+
+from .base import LightningTestModelBase
+from .mixins import (
+    LightningValidationStepMixin,
+    LightningValidationMixin,
+    LightningValidationStepMultipleDataloadersMixin,
+    LightningValidationMultipleDataloadersMixin,
+    LightningTestStepMixin,
+    LightningTestMixin,
+    LightningTestStepMultipleDataloadersMixin,
+    LightningTestMultipleDataloadersMixin,
+)
+
+
+class LightningTestModel(LightningValidationMixin, LightningTestMixin, LightningTestModelBase):
+    """
+    Most common test case. Validation and test dataloaders.
+    """
+
+    def on_training_metrics(self, logs):
+        logs['some_tensor_to_test'] = torch.rand(1)
diff --git a/pytorch_lightning/testing/model_base.py → tests/models/base.py b/pytorch_lightning/testing/model_base.py → tests/models/base.py
diff --git a/tests/debug.py → tests/models/debug.py b/tests/debug.py → tests/models/debug.py
diff --git a/pytorch_lightning/testing/model_mixins.py → tests/models/mixins.py b/pytorch_lightning/testing/model_mixins.py → tests/models/mixins.py
diff --git a/tests/utils.py → tests/models/utils.py b/tests/utils.py → tests/models/utils.py
@@ -9,7 +9,7 @@
 from pytorch_lightning import Trainer
 from pytorch_lightning.callbacks import ModelCheckpoint
 from pytorch_lightning.loggers import TestTubeLogger, TensorBoardLogger
-from pytorch_lightning.testing import LightningTestModel
+from tests.models import LightningTestModel
 
 # generate a list of random seeds for each test
 RANDOM_PORTS = list(np.random.randint(12000, 19000, 1000))

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,3 +1,4 @@
+torchvision>=0.4.0, < 0.5  # the 0.5. has some issues with torch JIT
 tox
 coverage
 codecov

diff --git a/tests/test_amp.py b/tests/test_amp.py
@@ -2,9 +2,9 @@
 
 import pytest
 
-import tests.utils as tutils
+import tests.models.utils as tutils
 from pytorch_lightning import Trainer
-from pytorch_lightning.testing import (
+from tests.models import (
     LightningTestModel,
 )
 from pytorch_lightning.utilities.debugging import MisconfigurationException

diff --git a/tests/test_cpu_models.py b/tests/test_cpu_models.py
@@ -2,12 +2,12 @@
 
 import torch
 
-import tests.utils as tutils
+import tests.models.utils as tutils
 from pytorch_lightning import Trainer, data_loader
 from pytorch_lightning.callbacks import (
     EarlyStopping,
 )
-from pytorch_lightning.testing import (
+from tests.models import (
     LightningTestModel,
     LightningTestModelBase,
     LightningTestMixin,

diff --git a/tests/test_gpu_models.py b/tests/test_gpu_models.py
@@ -3,13 +3,13 @@
 import pytest
 import torch
 
-import tests.utils as tutils
+import tests.models.utils as tutils
 from pytorch_lightning import Trainer
 from pytorch_lightning.callbacks import (
     ModelCheckpoint,
 )
 from pytorch_lightning.core import memory
-from pytorch_lightning.testing import (
+from tests.models import (
     LightningTestModel,
 )
 from pytorch_lightning.trainer.distrib_parts import (

diff --git a/tests/test_logging.py b/tests/test_logging.py
@@ -4,7 +4,7 @@
 import pytest
 import torch
 
-import tests.utils as tutils
+import tests.models.utils as tutils
 from pytorch_lightning import Trainer
 from pytorch_lightning.loggers import (
     LightningLoggerBase,
@@ -15,7 +15,7 @@
     WandbLogger,
     NeptuneLogger
 )
-from pytorch_lightning.testing import LightningTestModel
+from tests.models import LightningTestModel
 
 
 def test_testtube_logger(tmpdir):

diff --git a/tests/test_restore_models.py b/tests/test_restore_models.py
@@ -3,10 +3,10 @@
 
 import torch
 
-import tests.utils as tutils
+import tests.models.utils as tutils
 from pytorch_lightning import Trainer
 from pytorch_lightning.callbacks import ModelCheckpoint
-from pytorch_lightning.testing import LightningTestModel
+from tests.models import LightningTestModel
 
 
 def test_running_test_pretrained_model_ddp(tmpdir):

diff --git a/tests/test_trainer.py b/tests/test_trainer.py
@@ -3,12 +3,12 @@
 import pytest
 import torch
 
-import tests.utils as tutils
+import tests.models.utils as tutils
 from pytorch_lightning import Trainer
 from pytorch_lightning.callbacks import (
     ModelCheckpoint,
 )
-from pytorch_lightning.testing import (
+from tests.models import (
     LightningTestModel,
     LightningTestModelBase,
     LightningValidationStepMixin,