ref: clean up data reset (Lightning-AI#3161)

* clean up data reset

* clean up data reset

Author: williamFalcon

pytorch_lightning/trainer/evaluate_loop.py

@@ -17,11 +17,14 @@ def get_evaluation_dataloaders(self):
         # select dataloaders
         model = self.trainer.get_model()
 
+        # select dataloaders
         if self.testing:
             self.trainer.reset_test_dataloader(model)
+
             dataloaders = self.trainer.test_dataloaders
             max_batches = self.trainer.num_test_batches
         else:
+            # val
             if self.trainer.val_dataloaders is None:
                 self.trainer.reset_val_dataloader(model)
 

pytorch_lightning/trainer/evaluation_loop.py

@@ -316,18 +316,7 @@ def run_evaluation(self, test_mode: bool = False):
         model.on_pre_performance_check()
 
         # select dataloaders
-        if test_mode:
-            self.reset_test_dataloader(model)
-
-            dataloaders = self.test_dataloaders
-            max_batches = self.num_test_batches
-        else:
-            # val
-            if self.val_dataloaders is None:
-                self.reset_val_dataloader(model)
-
-            dataloaders = self.val_dataloaders
-            max_batches = self.num_val_batches
+        dataloaders, max_batches = self.evaluation_loop.get_evaluation_dataloaders()
 
         # enable disabling validation step with limit_val_batches = 0
         if self.evaluation_loop.should_skip_evaluation(dataloaders, max_batches):