Bugfix/_has_len

CHANGELOG.md

@@ -19,7 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Fixed
 
 - Fixed an issue with forward hooks not being removed after model summary ([#2298](https://github.com/PyTorchLightning/pytorch-lightning/pull/2298))
-
+- Fixed an issue how _has_len handels 'NotImplementedError' e.g. raised by torchtext.data.Iterator   ([#2293](https://github.com/PyTorchLightning/pytorch-lightning/pull/2293)) ([#2307](https://github.com/PyTorchLightning/pytorch-lightning/pull/2307))
 
 ## [0.8.1] - 2020-06-19
 

tests/base/dataloaders.py

@@ -23,23 +23,14 @@ def __next__(self):
             return next(self.iter)
 
 
-class CustomNotImplementedErrorDataloader:
-
-    def __init__(self, dataloader):
-        self.dataloader = dataloader
-        self.iter = iter(dataloader)
-        self.count = 0
+class CustomNotImplementedErrorDataloader(CustomInfDataloader):
 
     def __len__(self):
         """raise NotImplementedError"""
         raise NotImplementedError
 
-    def __iter__(self):
-        self.count = 0
-        return self
-
     def __next__(self):
-        if self.count >= 50:
+        if self.count >= 2:
             raise StopIteration
         self.count = self.count + 1
         try:

tests/trainer/test_dataloaders.py

@@ -295,15 +295,15 @@ def test_train_inf_dataloader_error(tmpdir):
         trainer.fit(model)
 
 
-@pytest.mark.skip('TODO: speed up this test')
+# @pytest.mark.skip('TODO: speed up this test')
 def test_train_not_implemented_error_dataloader_error(tmpdir):
     """Test not_implemented_error train data loader (e.g. IterableDataset)"""
     model = EvalModelTemplate()
     model.train_dataloader = model.train_dataloader__not_implemented_error
 
     trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, val_check_interval=0.5)
 
-    with pytest.raises(MisconfigurationException, match='not_implemented_error DataLoader'):
+    with pytest.raises(MisconfigurationException, match='infinite DataLoader'):
         trainer.fit(model)
 
 
@@ -319,15 +319,15 @@ def test_val_inf_dataloader_error(tmpdir):
         trainer.fit(model)
 
 
-@pytest.mark.skip('TODO: speed up this test')
+# @pytest.mark.skip('TODO: speed up this test')
 def test_val_not_implemented_error_dataloader_error(tmpdir):
     """Test not_implemented_error train data loader (e.g. IterableDataset)"""
     model = EvalModelTemplate()
     model.val_dataloader = model.val_dataloader__not_implemented_error
 
     trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, limit_val_batches=0.5)
 
-    with pytest.raises(MisconfigurationException, match='not_implemented_error DataLoader'):
+    with pytest.raises(MisconfigurationException, match='infinite DataLoader'):
         trainer.fit(model)
 
 
@@ -343,15 +343,15 @@ def test_test_inf_dataloader_error(tmpdir):
         trainer.test(model)
 
 
-@pytest.mark.skip('TODO: speed up this test')
+# @pytest.mark.skip('TODO: speed up this test')
 def test_test_not_implemented_error_dataloader_error(tmpdir):
     """Test not_implemented_error train data loader (e.g. IterableDataset)"""
     model = EvalModelTemplate()
     model.test_dataloader = model.test_dataloader__not_implemented_error
 
     trainer = Trainer(default_root_dir=tmpdir, max_epochs=1, limit_test_batches=0.5)
 
-    with pytest.raises(MisconfigurationException, match='not_implemented_error DataLoader'):
+    with pytest.raises(MisconfigurationException, match='infinite DataLoader'):
         trainer.test(model)
 
 
@@ -374,7 +374,7 @@ def test_inf_train_dataloader(tmpdir, check_interval):
 
 
 @pytest.mark.parametrize('check_interval', [50, 1.0])
-@pytest.mark.skip('TODO: speed up this test')
+# @pytest.mark.skip('TODO: speed up this test')
 def test_not_implemented_error_train_dataloader(tmpdir, check_interval):
     """Test not_implemented_error train data loader (e.g. IterableDataset)"""
 
@@ -412,8 +412,8 @@ def test_inf_val_dataloader(tmpdir, check_interval):
 
 
 @pytest.mark.parametrize('check_interval', [1.0])
-@pytest.mark.skip('TODO: speed up this test')
-def test_not_implemented_error_dataloader(tmpdir, check_interval):
+# @pytest.mark.skip('TODO: speed up this test')
+def test_not_implemented_error_val_dataloader(tmpdir, check_interval):
     """Test not_implemented_error data loader (e.g. IterableDataset)"""
 
     model = EvalModelTemplate()