move datasets to existing package (#275)

* move datasets * CI
Lightning-Universe · Oct 14, 2020 · c1204d5 · c1204d5
1 parent 40fd35b
commit c1204d5
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci_test-base.yml b/.github/workflows/ci_test-base.yml
@@ -66,7 +66,7 @@ jobs:
  - name: Test Package [only]
  run: |
  # NOTE: run coverage on tests does not propagare faler status for Win, https://github.com/nedbat/coveragepy/issues/1003
- coverage run --source pl_bolts -m pytest pl_bolts -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml --ignore=pl_bolts/datamodules --ignore=pl_bolts/models/self_supervised/amdim/transforms.py --ignore=pl_bolts/models/rl
+ coverage run --source pl_bolts -m pytest pl_bolts -v --junitxml=junit/test-results-${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.requires }}.xml --ignore=pl_bolts/datamodules --ignore=pl_bolts/datasets --ignore=pl_bolts/models/self_supervised/amdim/transforms.py --ignore=pl_bolts/models/rl
 
  - name: Upload pytest test results
  uses: actions/upload-artifact@master

diff --git a/pl_bolts/datamodules/__init__.py b/pl_bolts/datamodules/__init__.py
@@ -23,7 +23,7 @@
  from pl_bolts.datamodules.stl10_datamodule import STL10DataModule
  from pl_bolts.datamodules.vocdetection_datamodule import VOCDetectionDataModule
 
- from pl_bolts.datamodules.kitti_dataset import KittiDataset
+ from pl_bolts.datasets.kitti_dataset import KittiDataset
  from pl_bolts.datamodules.kitti_datamodule import KittiDataModule
 except ModuleNotFoundError:
  pass
diff --git a/pl_bolts/datamodules/binary_mnist_datamodule.py b/pl_bolts/datamodules/binary_mnist_datamodule.py
@@ -7,7 +7,7 @@
 try:
  from torchvision import transforms as transform_lib
  from torchvision.datasets import MNIST
- from pl_bolts.datamodules.mnist_dataset import BinaryMNIST
+ from pl_bolts.datasets.mnist_dataset import BinaryMNIST
 except ModuleNotFoundError:
  warn('You want to use `torchvision` which is not installed yet,' # pragma: no-cover
  ' install it with `pip install torchvision`.')

diff --git a/pl_bolts/datamodules/cifar10_datamodule.py b/pl_bolts/datamodules/cifar10_datamodule.py
@@ -6,7 +6,7 @@
 from pytorch_lightning import LightningDataModule
 from torch.utils.data import DataLoader, random_split
 
-from pl_bolts.datamodules.cifar10_dataset import TrialCIFAR10
+from pl_bolts.datasets.cifar10_dataset import TrialCIFAR10
 from pl_bolts.transforms.dataset_normalizations import cifar10_normalization
 
 try:

diff --git a/pl_bolts/datamodules/imagenet_datamodule.py b/pl_bolts/datamodules/imagenet_datamodule.py
@@ -8,7 +8,7 @@
 
 try:
  from torchvision import transforms as transform_lib
- from pl_bolts.datamodules.imagenet_dataset import UnlabeledImagenet
+ from pl_bolts.datasets.imagenet_dataset import UnlabeledImagenet
 except ModuleNotFoundError:
  warn('You want to use `torchvision` which is not installed yet,' # pragma: no-cover
  ' install it with `pip install torchvision`.')

diff --git a/pl_bolts/datamodules/kitti_datamodule.py b/pl_bolts/datamodules/kitti_datamodule.py
@@ -2,7 +2,7 @@
 import torch
 
 from pytorch_lightning import LightningDataModule
-from pl_bolts.datamodules.kitti_dataset import KittiDataset
+from pl_bolts.datasets.kitti_dataset import KittiDataset
 
 from torch.utils.data import DataLoader
 import torchvision.transforms as transforms

diff --git a/pl_bolts/datamodules/ssl_imagenet_datamodule.py b/pl_bolts/datamodules/ssl_imagenet_datamodule.py
@@ -4,7 +4,7 @@
 from pytorch_lightning import LightningDataModule
 from torch.utils.data import DataLoader
 
-from pl_bolts.datamodules.imagenet_dataset import UnlabeledImagenet
+from pl_bolts.datasets.imagenet_dataset import UnlabeledImagenet
 from pl_bolts.transforms.dataset_normalizations import imagenet_normalization
 
 try:

diff --git a/pl_bolts/datamodules/stl10_datamodule.py b/pl_bolts/datamodules/stl10_datamodule.py
@@ -5,7 +5,7 @@
 from pytorch_lightning import LightningDataModule
 from torch.utils.data import DataLoader, random_split
 
-from pl_bolts.datamodules.concat_dataset import ConcatDataset
+from pl_bolts.datasets.concat_dataset import ConcatDataset
 from pl_bolts.transforms.dataset_normalizations import stl10_normalization
 
 try:

diff --git a/pl_bolts/datamodules/base_dataset.py → pl_bolts/datasets/base_dataset.py b/pl_bolts/datamodules/base_dataset.py → pl_bolts/datasets/base_dataset.py
diff --git a/pl_bolts/datamodules/cifar10_dataset.py → pl_bolts/datasets/cifar10_dataset.py b/pl_bolts/datamodules/cifar10_dataset.py → pl_bolts/datasets/cifar10_dataset.py
@@ -16,7 +16,7 @@
 else:
  _PIL_AVAILABLE = True
 
-from pl_bolts.datamodules.base_dataset import LightDataset
+from pl_bolts.datasets.base_dataset import LightDataset
 
 
 class CIFAR10(LightDataset):

diff --git a/pl_bolts/datamodules/concat_dataset.py → pl_bolts/datasets/concat_dataset.py b/pl_bolts/datamodules/concat_dataset.py → pl_bolts/datasets/concat_dataset.py
diff --git a/pl_bolts/datamodules/imagenet_dataset.py → pl_bolts/datasets/imagenet_dataset.py b/pl_bolts/datamodules/imagenet_dataset.py → pl_bolts/datasets/imagenet_dataset.py
diff --git a/pl_bolts/datamodules/kitti_dataset.py → pl_bolts/datasets/kitti_dataset.py b/pl_bolts/datamodules/kitti_dataset.py → pl_bolts/datasets/kitti_dataset.py
diff --git a/pl_bolts/datamodules/mnist_dataset.py → pl_bolts/datasets/mnist_dataset.py b/pl_bolts/datamodules/mnist_dataset.py → pl_bolts/datasets/mnist_dataset.py
diff --git a/pl_bolts/datamodules/ssl_amdim_datasets.py → pl_bolts/datasets/ssl_amdim_datasets.py b/pl_bolts/datamodules/ssl_amdim_datasets.py → pl_bolts/datasets/ssl_amdim_datasets.py
diff --git a/pl_bolts/models/self_supervised/amdim/datasets.py b/pl_bolts/models/self_supervised/amdim/datasets.py
@@ -4,8 +4,8 @@
 
 try:
  from torchvision.datasets import STL10
- from pl_bolts.datamodules.imagenet_dataset import UnlabeledImagenet
- from pl_bolts.datamodules.ssl_amdim_datasets import CIFAR10Mixed
+ from pl_bolts.datasets.imagenet_dataset import UnlabeledImagenet
+ from pl_bolts.datasets.ssl_amdim_datasets import CIFAR10Mixed
  from pl_bolts.models.self_supervised.amdim import transforms as amdim_transforms
 except ModuleNotFoundError:
  warn('You want to use `torchvision` which is not installed yet,' # pragma: no-cover

diff --git a/tests/datamodules/test_dataloader.py b/tests/datamodules/test_dataloader.py
@@ -2,7 +2,7 @@
 from torch.utils.data import DataLoader
 
 from pl_bolts.datamodules.async_dataloader import AsynchronousLoader
-from pl_bolts.datamodules.cifar10_dataset import CIFAR10
+from pl_bolts.datasets.cifar10_dataset import CIFAR10
 
 
 def test_async_dataloader(tmpdir):

diff --git a/tests/datamodules/test_datamodules.py b/tests/datamodules/test_datamodules.py
@@ -1,4 +1,4 @@
-from pl_bolts.datamodules.cifar10_dataset import CIFAR10
+from pl_bolts.datasets.cifar10_dataset import CIFAR10
 
 
 def test_dev_datasets(tmpdir):