tests tests tests

allennlp/tests/training/learning_rate_schedulers/slanted_triangular_test.py

@@ -4,10 +4,11 @@
 
 import torch
 
+from allennlp.data.dataset_readers.dataset_reader import AllennlpDataset
 from allennlp.common import Lazy, Params
 from allennlp.common.checks import ConfigurationError
 from allennlp.common.testing import AllenNlpTestCase
-from allennlp.data.iterators import BasicIterator
+from allennlp.data.samplers import DataLoader
 from allennlp.training import TrainerBase
 from allennlp.training.learning_rate_schedulers import LearningRateScheduler, SlantedTriangular
 from allennlp.training.optimizers import Optimizer
@@ -112,15 +113,14 @@ def test_from_params_in_trainer(self):
         )
         # The method called in the logic below only checks the length of this list, not its
         # contents, so this should be safe.
-        instances = [1] * 40
+        instances = AllennlpDataset([1] * 40)
         optim = self._get_optimizer()
         trainer = TrainerBase.from_params(
             model=self.model,
             optimizer=Lazy(lambda **kwargs: optim),
             serialization_dir=self.TEST_DIR,
             params=params,
-            iterator=BasicIterator(batch_size=10),
-            train_data=instances,
+            data_loader=DataLoader(instances, batch_size=10),
         )
         assert isinstance(trainer._learning_rate_scheduler, SlantedTriangular)
 
@@ -150,8 +150,7 @@ def test_from_params_in_trainer(self):
             optimizer=Lazy(lambda **kwargs: optim),
             serialization_dir=self.TEST_DIR,
             params=params,
-            iterator=BasicIterator(batch_size=10),
-            train_data=instances,
+            data_loader=DataLoader(instances, batch_size=10),
         )
         assert trainer._learning_rate_scheduler.num_epochs == 3
 

allennlp/tests/training/optimizer_test.py

@@ -2,7 +2,7 @@
 from allennlp.common.testing import AllenNlpTestCase
 from allennlp.data import Vocabulary
 from allennlp.data.dataset_readers import SequenceTaggingDatasetReader
-from allennlp.data.iterators import BasicIterator
+from allennlp.data.samplers import DataLoader
 from allennlp.models.simple_tagger import SimpleTagger
 from allennlp.training import Trainer
 from allennlp.training.optimizers import Optimizer
@@ -90,6 +90,5 @@ def test_can_optimise_model_with_dense_and_sparse_params(self):
         optimizer_params = Params({"type": "dense_sparse_adam"})
         parameters = [[n, p] for n, p in self.model.named_parameters() if p.requires_grad]
         optimizer = Optimizer.from_params(model_parameters=parameters, params=optimizer_params)
-        iterator = BasicIterator(2)
-        iterator.index_with(self.vocab)
-        Trainer(self.model, optimizer, iterator, self.instances).train()
+        self.instances.index_with(self.vocab)
+        Trainer(self.model, optimizer, DataLoader(self.instances, 2)).train()

allennlp/tests/training/trainer_test.py

@@ -156,7 +156,7 @@ def test_trainer_can_resume_training_for_exponential_moving_average(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=1,
             serialization_dir=self.TEST_DIR,
             moving_average=moving_average,
@@ -168,7 +168,7 @@ def test_trainer_can_resume_training_for_exponential_moving_average(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
             moving_average=new_moving_average,
@@ -190,7 +190,7 @@ def test_metric_only_considered_best_so_far_when_strictly_better_than_those_befo
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
             patience=5,
@@ -225,7 +225,7 @@ def test_metric_only_considered_best_so_far_when_strictly_better_than_those_befo
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
             patience=5,
@@ -257,7 +257,7 @@ def test_should_stop_early_with_increasing_metric(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
             patience=5,
@@ -280,7 +280,7 @@ def test_should_stop_early_with_flat_lining_metric(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
             patience=5,
@@ -293,7 +293,7 @@ def test_should_stop_early_with_flat_lining_metric(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
             patience=5,
@@ -307,7 +307,7 @@ def test_should_stop_early_with_decreasing_metric(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
             patience=5,
@@ -333,7 +333,7 @@ def test_should_stop_early_with_early_stopping_disabled(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=100,
             patience=None,
             validation_metric="+test",
@@ -347,7 +347,7 @@ def test_should_stop_early_with_early_stopping_disabled(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=100,
             patience=None,
             validation_metric="-test",
@@ -368,7 +368,7 @@ def test_should_stop_early_with_invalid_patience(self):
                     self.model,
                     self.optimizer,
                     self.data_loader,
-                    validation_dataset_loader=self.validation_data_loader,
+                    validation_data_loader=self.validation_data_loader,
                     num_epochs=100,
                     patience=patience,
                     validation_metric="+test",
@@ -385,7 +385,7 @@ def test_trainer_can_run_and_resume_with_momentum_scheduler(self):
             data_loader=self.data_loader,
             momentum_scheduler=scheduler,
             validation_metric="-loss",
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=4,
             serialization_dir=self.TEST_DIR,
         )
@@ -401,7 +401,7 @@ def test_trainer_can_run_and_resume_with_momentum_scheduler(self):
             data_loader=self.data_loader,
             momentum_scheduler=new_scheduler,
             validation_metric="-loss",
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=6,
             serialization_dir=self.TEST_DIR,
         )
@@ -418,7 +418,7 @@ def test_trainer_can_run_with_lr_scheduler(self):
             data_loader=self.data_loader,
             learning_rate_scheduler=lr_scheduler,
             validation_metric="-loss",
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=2,
         )
         trainer.train()
@@ -430,7 +430,7 @@ def test_trainer_can_resume_with_lr_scheduler(self):
             optimizer=self.optimizer,
             data_loader=self.data_loader,
             learning_rate_scheduler=lr_scheduler,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=2,
             serialization_dir=self.TEST_DIR,
         )
@@ -442,7 +442,7 @@ def test_trainer_can_resume_with_lr_scheduler(self):
             optimizer=self.optimizer,
             data_loader=self.data_loader,
             learning_rate_scheduler=new_lr_scheduler,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=4,
             serialization_dir=self.TEST_DIR,
         )
@@ -503,7 +503,7 @@ def test_trainer_saves_metrics_every_epoch(self):
             model=self.model,
             optimizer=self.optimizer,
             data_loader=self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=5,
             serialization_dir=self.TEST_DIR,
             num_serialized_models_to_keep=3,
@@ -620,7 +620,7 @@ def test_trainer_saves_and_loads_best_validation_metrics_correctly_1(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             validation_metric="-loss",
             num_epochs=1,
             serialization_dir=self.TEST_DIR,
@@ -638,7 +638,7 @@ def test_trainer_saves_and_loads_best_validation_metrics_correctly_1(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             validation_metric="-loss",
             num_epochs=2,
             serialization_dir=self.TEST_DIR,
@@ -659,7 +659,7 @@ def test_trainer_saves_and_loads_best_validation_metrics_correctly_2(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             validation_metric="+loss",
             num_epochs=1,
             serialization_dir=self.TEST_DIR,
@@ -678,7 +678,7 @@ def test_trainer_saves_and_loads_best_validation_metrics_correctly_2(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             validation_metric="+loss",
             num_epochs=2,
             serialization_dir=self.TEST_DIR,
@@ -701,8 +701,7 @@ def test_restored_training_returns_best_epoch_metrics_even_if_no_better_epoch_is
             self.model,
             self.optimizer,
             self.data_loader,
-            self.instances,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             validation_metric="+loss",
             num_epochs=1,
             serialization_dir=self.TEST_DIR,
@@ -714,7 +713,7 @@ def test_restored_training_returns_best_epoch_metrics_even_if_no_better_epoch_is
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             validation_metric="+loss",
             num_epochs=2,
             serialization_dir=self.TEST_DIR,
@@ -736,7 +735,7 @@ def test_restoring_works_with_older_checkpointing(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=3,
             serialization_dir=self.TEST_DIR,
         )
@@ -767,7 +766,7 @@ def test_trainer_can_run_gradient_accumulation(self):
             self.model,
             self.optimizer,
             self.data_loader,
-            validation_dataset_loader=self.validation_data_loader,
+            validation_data_loader=self.validation_data_loader,
             num_epochs=2,
             num_gradient_accumulation_steps=steps_to_accumulate,
         )