Replace all occurances of validation_epoch_end to on_validation_epoch_end

Signed-off-by: Abhishree <[email protected]>

Author: athitten

docs/source/nlp/api.rst

@@ -22,15 +22,15 @@ Model Classes
 
 .. autoclass:: nemo.collections.nlp.models.QAModel
     :show-inheritance:
-    :members: setup_training_data, setup_optimization, setup_validation_data, setup_test_data, inference, validation_epoch_end, test_epoch_end
+    :members: setup_training_data, setup_optimization, setup_validation_data, setup_test_data, inference, on_validation_epoch_end, test_epoch_end
 
 .. autoclass:: nemo.collections.nlp.models.DuplexTaggerModel
     :show-inheritance:
-    :members: setup_training_data, setup_optimization, setup_validation_data, setup_test_data, inference, validation_epoch_end, test_epoch_end
+    :members: setup_training_data, setup_optimization, setup_validation_data, setup_test_data, inference, on_validation_epoch_end, test_epoch_end
 
 .. autoclass:: nemo.collections.nlp.models.DuplexDecoderModel
     :show-inheritance:
-    :members: setup_training_data, setup_optimization, setup_validation_data, setup_test_data, inference, validation_epoch_end, test_epoch_end
+    :members: setup_training_data, setup_optimization, setup_validation_data, setup_test_data, inference, on_validation_epoch_end, test_epoch_end
 
 .. autoclass:: nemo.collections.nlp.models.BERTLMModel
     :show-inheritance:

docs/source/tts/api.rst

@@ -8,61 +8,61 @@ Mel-Spectrogram Generators
 .. autoclass:: nemo.collections.tts.models.FastPitchModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 .. autoclass:: nemo.collections.tts.models.MixerTTSModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 .. autoclass:: nemo.collections.tts.models.RadTTSModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 .. autoclass:: nemo.collections.tts.models.Tacotron2Model
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 
 Speech-to-Text Aligner Models
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. autoclass:: nemo.collections.tts.models.AlignerModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 
 Two-Stage Models
 ~~~~~~~~~~~~~~~~~
 .. autoclass:: nemo.collections.tts.models.TwoStagesModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 
 Vocoders
 ~~~~~~~~
 .. autoclass:: nemo.collections.tts.models.GriffinLimModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 .. autoclass:: nemo.collections.tts.models.HifiGanModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 .. autoclass:: nemo.collections.tts.models.UnivNetModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 .. autoclass:: nemo.collections.tts.models.WaveGlowModel
     :show-inheritance:
     :members:
-    :exclude-members: setup_training_data, setup_validation_data, training_step, validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
+    :exclude-members: setup_training_data, setup_validation_data, training_step, on_validation_epoch_end, validation_step, setup_test_data, on_train_epoch_start
 
 
 Base Classes

nemo/collections/asr/models/hybrid_asr_tts_models.py

@@ -363,11 +363,11 @@ def validation_step(self, batch, batch_idx, dataloader_idx=0):
         """Validation step, forward to ASR model"""
         return self.asr_model.validation_step(batch=batch, batch_idx=batch_idx, dataloader_idx=dataloader_idx)
 
-    def validation_epoch_end(
+    def on_validation_epoch_end(
         self, outputs: Union[List[Dict[str, torch.Tensor]], List[List[Dict[str, torch.Tensor]]]]
     ) -> Optional[Dict[str, Dict[str, torch.Tensor]]]:
         """Validation epoch end hook, forward to ASR model"""
-        return self.asr_model.validation_epoch_end(outputs=outputs)
+        return self.asr_model.on_validation_epoch_end(outputs=outputs)
 
     def test_epoch_end(
         self, outputs: Union[List[Dict[str, torch.Tensor]], List[List[Dict[str, torch.Tensor]]]]

nemo/collections/common/metrics/classification_accuracy.py

@@ -37,7 +37,7 @@ def validation_step(self, batch, batch_idx):
             correct_count, total_count = self._accuracy(logits, labels)
             return {'val_loss': loss_value, 'val_correct_count': correct_count, 'val_total_count': total_count}
 
-        def validation_epoch_end(self, outputs):
+        def on_validation_epoch_end(self, outputs):
             ...
             val_loss_mean = torch.stack([x['val_loss'] for x in outputs]).mean()
             correct_counts = torch.stack([x['val_correct_counts'] for x in outputs])

nemo/collections/nlp/metrics/classification_report.py

@@ -38,7 +38,7 @@ def validation_step(self, batch, batch_idx):
 
             return {'val_loss': val_loss, 'tp': tp, 'fn': fn, 'fp': fp}
 
-        def validation_epoch_end(self, outputs):
+        def on_validation_epoch_end(self, outputs):
             ...
             # calculate metrics and classification report
             precision, recall, f1, report = self.classification_report.compute()
@@ -205,7 +205,7 @@ def validation_step(self, batch, batch_idx):
 
             return {'val_loss': val_loss, 'tp': tp, 'fn': fn, 'fp': fp}
 
-        def validation_epoch_end(self, outputs):
+        def on_validation_epoch_end(self, outputs):
             ...
             # calculate metrics and classification report
             precision, recall, f1, report = self.classification_report.compute()

nemo/collections/nlp/models/dialogue/dialogue_gpt_classification_model.py

@@ -180,7 +180,7 @@ def training_step(self, batch, batch_idx):
     def validation_step(self, batch, batch_idx):
         return self.eval_step_helper(batch=batch)
 
-    def validation_epoch_end(self, outputs):
+    def on_validation_epoch_end(self, outputs):
         self.eval_epoch_end(outputs, mode='val')
 
     def test_epoch_end(self, outputs):

nemo/collections/nlp/models/dialogue/dialogue_gpt_generation_model.py

@@ -79,7 +79,7 @@ def training_step(self, batch, batch_idx):
     def validation_step(self, batch, batch_idx):
         return self.eval_step_helper(batch=batch)
 
-    def validation_epoch_end(self, outputs):
+    def on_validation_epoch_end(self, outputs):
         self.eval_epoch_end(outputs, mode='val')
 
     def test_epoch_end(self, outputs):

nemo/collections/nlp/models/dialogue/dialogue_nearest_neighbour_model.py

@@ -124,9 +124,9 @@ def validation_step(self, batch, batch_idx, mode='val'):
         return {'preds': torch.stack(preds), 'labels': torch.stack(gts), 'inputs': torch.stack(inputs)}
 
     def multi_test_epoch_end(self, outputs, dataloader_idx):
-        return self.validation_epoch_end(outputs)
+        return self.on_validation_epoch_end(outputs)
 
-    def validation_epoch_end(self, outputs):
+    def on_validation_epoch_end(self, outputs):
         """
         Get metrics based on the candidate label with the highest predicted likelihood and the ground truth label for intent
         """

nemo/collections/nlp/models/dialogue/dialogue_s2s_generation_model.py

@@ -91,7 +91,7 @@ def training_step(self, batch, batch_idx):
     def validation_step(self, batch, batch_idx):
         return self.eval_step_helper(batch=batch)
 
-    def validation_epoch_end(self, outputs):
+    def on_validation_epoch_end(self, outputs):
         self.eval_epoch_end(outputs, mode='val')
 
     def test_epoch_end(self, outputs):

nemo/collections/nlp/models/dialogue/dialogue_zero_shot_intent_model.py

@@ -216,7 +216,7 @@ def validation_step(self, batch, batch_idx):
             'labels': labels,
         }
 
-    def validation_epoch_end(self, outputs):
+    def on_validation_epoch_end(self, outputs):
         """
         Get metrics based on the candidate label with the highest predicted likelihood and the ground truth label for intent
         """