From b972ad26affd3ba2fee49cf93747539bdc00a429 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 16 Mar 2020 22:35:22 -0700 Subject: [PATCH 1/2] auto_add_sampler() fix --- pytorch_lightning/trainer/data_loading.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pytorch_lightning/trainer/data_loading.py b/pytorch_lightning/trainer/data_loading.py index e848e09725e8a..1a1a40647f4f2 100644 --- a/pytorch_lightning/trainer/data_loading.py +++ b/pytorch_lightning/trainer/data_loading.py @@ -91,15 +91,15 @@ def auto_add_sampler(self, dataloader: DataLoader, train: bool) -> DataLoader: ) dl_args['shuffle'] = False else: - if train: - sampler = DistributedSampler(dataloader.dataset) - dl_args['shuffle'] = False - else: - sampler = SequentialSampler(dataloader.dataset) + sampler = DistributedSampler(dataloader.dataset) + dl_args['shuffle'] = False dl_args['sampler'] = sampler - dataloader = DataLoader(**dl_args) + # else: + # sampler = SequentialSampler(dataloader.dataset) + # dl_args['sampler'] = sampler + return dataloader def reset_train_dataloader(self, model: LightningModule) -> None: From 1eed293f39534ab6855f317edf85ebbdf0ca5cd0 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 16 Mar 2020 22:54:50 -0700 Subject: [PATCH 2/2] auto_add_sampler() fix --- pytorch_lightning/trainer/data_loading.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pytorch_lightning/trainer/data_loading.py b/pytorch_lightning/trainer/data_loading.py index 1a1a40647f4f2..0ca90e5962728 100644 --- a/pytorch_lightning/trainer/data_loading.py +++ b/pytorch_lightning/trainer/data_loading.py @@ -96,9 +96,6 @@ def auto_add_sampler(self, dataloader: DataLoader, train: bool) -> DataLoader: dl_args['sampler'] = sampler dataloader = DataLoader(**dl_args) - # else: - # sampler = SequentialSampler(dataloader.dataset) - # dl_args['sampler'] = sampler return dataloader