Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed the unused train/val/test Mnist transforms #109

Merged
merged 3 commits into from Jul 12, 2020
Merged

Fixed the unused train/val/test Mnist transforms #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16c7ac4
Fixed the unused train/val/test Mnist transforms
lebrice Jul 9, 2020
570b4fc
Added the same fix for Fashion-Mnist
lebrice Jul 9, 2020
e119cc4
Fixed typo in val_dataloader of fashion_mnist dm
lebrice Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions pl_bolts/datamodules/fashion_mnist_datamodule.py
View file
Open in desktop
Expand Up @@ -67,8 +67,7 @@ def train_dataloader(self, batch_size=32, transforms=None):
batch_size: size of batch
transforms: custom transforms
"""
if transforms is None:
transforms = self._default_transforms()
transforms = transforms or self.train_transforms or self._default_transforms()

dataset = FashionMNIST(self.data_dir, train=True, download=False, transform=transforms)
train_length = len(dataset)
Expand All @@ -91,8 +90,7 @@ def val_dataloader(self, batch_size=32, transforms=None):
batch_size: size of batch
transforms: custom transforms
"""
if transforms is None:
transforms = self._default_transforms()
transforms = transforms or self.val_transforms or self._default_transforms()

dataset = FashionMNIST(self.data_dir, train=True, download=True, transform=transforms)
train_length = len(dataset)
Expand All @@ -115,8 +113,7 @@ def test_dataloader(self, batch_size=32, transforms=None):
batch_size: size of batch
transforms: custom transforms
"""
if transforms is None:
transforms = self._default_transforms()
transforms = transforms or self.test_transforms or self._default_transforms()

dataset = FashionMNIST(self.data_dir, train=False, download=False, transform=transforms)
loader = DataLoader(
Expand Down
10 changes: 3 additions & 7 deletions pl_bolts/datamodules/mnist_datamodule.py
View file
Open in desktop
Expand Up @@ -70,8 +70,7 @@ def train_dataloader(self, batch_size=32, transforms=None):
batch_size: size of batch
transforms: custom transforms
"""
if transforms is None:
transforms = self._default_transforms()
transforms = transforms or self.train_transforms or self._default_transforms()

dataset = MNIST(self.data_dir, train=True, download=False, transform=transforms)
train_length = len(dataset)
Expand All @@ -94,9 +93,7 @@ def val_dataloader(self, batch_size=32, transforms=None):
batch_size: size of batch
transforms: custom transforms
"""
if transforms is None:
transforms = self._default_transforms()

transforms = transforms or self.val_transforms or self._default_transforms()
dataset = MNIST(self.data_dir, train=True, download=True, transform=transforms)
train_length = len(dataset)
_, dataset_val = random_split(dataset, [train_length - self.val_split, self.val_split])
Expand All @@ -118,8 +115,7 @@ def test_dataloader(self, batch_size=32, transforms=None):
batch_size: size of batch
transforms: custom transforms
"""
if transforms is None:
transforms = self._default_transforms()
transforms = transforms or self.val_transforms or self._default_transforms()

dataset = MNIST(self.data_dir, train=False, download=False, transform=transforms)
loader = DataLoader(
Expand Down