deprecation warning is only triggered when old models applied old g2p.

Signed-off-by: Xuesong Yang <1646669+XuesongYang@users.noreply.github.com>
NVIDIA · May 26, 2023 · bc3e5e1 · bc3e5e1
1 parent 9c59b66
commit bc3e5e1
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/nemo/collections/tts/models/aligner.py b/nemo/collections/tts/models/aligner.py
@@ -104,7 +104,11 @@ def _setup_tokenizer(self, cfg):
         text_tokenizer_kwargs = {}
         if "g2p" in cfg.text_tokenizer:
             # for backward compatibility
-            if self._is_model_being_restored():
+            if (
+                self._is_model_being_restored()
+                and (not cfg.text_tokenizer.g2p.get('_target_', None))
+                and cfg.text_tokenizer.g2p["_target_"].startswith("nemo_text_processing.g2p")
+            ):
                 cfg.text_tokenizer.g2p["_target_"] = g2p_backward_compatible_support(
                     cfg.text_tokenizer.g2p["_target_"]
                 )

diff --git a/nemo/collections/tts/models/fastpitch.py b/nemo/collections/tts/models/fastpitch.py
@@ -233,7 +233,11 @@ def _setup_tokenizer(self, cfg):
 
         if "g2p" in cfg.text_tokenizer:
             # for backward compatibility
-            if self._is_model_being_restored():
+            if (
+                self._is_model_being_restored()
+                and (not cfg.text_tokenizer.g2p.get('_target_', None))
+                and cfg.text_tokenizer.g2p["_target_"].startswith("nemo_text_processing.g2p")
+            ):
                 cfg.text_tokenizer.g2p["_target_"] = g2p_backward_compatible_support(
                     cfg.text_tokenizer.g2p["_target_"]
                 )

diff --git a/nemo/collections/tts/models/mixer_tts.py b/nemo/collections/tts/models/mixer_tts.py
@@ -150,7 +150,11 @@ def _setup_tokenizer(self, cfg):
         text_tokenizer_kwargs = {}
         if "g2p" in cfg.text_tokenizer:
             # for backward compatibility
-            if self._is_model_being_restored():
+            if (
+                self._is_model_being_restored()
+                and (not cfg.text_tokenizer.g2p.get('_target_', None))
+                and cfg.text_tokenizer.g2p["_target_"].startswith("nemo_text_processing.g2p")
+            ):
                 cfg.text_tokenizer.g2p["_target_"] = g2p_backward_compatible_support(
                     cfg.text_tokenizer.g2p["_target_"]
                 )

diff --git a/nemo/collections/tts/models/radtts.py b/nemo/collections/tts/models/radtts.py
@@ -334,7 +334,11 @@ def _setup_tokenizer(self, cfg):
         text_tokenizer_kwargs = {}
         if "g2p" in cfg.text_tokenizer:
             # for backward compatibility
-            if self._is_model_being_restored():
+            if (
+                self._is_model_being_restored()
+                and (not cfg.text_tokenizer.g2p.get('_target_', None))
+                and cfg.text_tokenizer.g2p["_target_"].startswith("nemo_text_processing.g2p")
+            ):
                 cfg.text_tokenizer.g2p["_target_"] = g2p_backward_compatible_support(
                     cfg.text_tokenizer.g2p["_target_"]
                 )

diff --git a/nemo/collections/tts/models/tacotron2.py b/nemo/collections/tts/models/tacotron2.py
@@ -334,7 +334,11 @@ def _setup_tokenizer(self, cfg):
         text_tokenizer_kwargs = {}
         if "g2p" in cfg.text_tokenizer and cfg.text_tokenizer.g2p is not None:
             # for backward compatibility
-            if self._is_model_being_restored():
+            if (
+                self._is_model_being_restored()
+                and (not cfg.text_tokenizer.g2p.get('_target_', None))
+                and cfg.text_tokenizer.g2p["_target_"].startswith("nemo_text_processing.g2p")
+            ):
                 cfg.text_tokenizer.g2p["_target_"] = g2p_backward_compatible_support(
                     cfg.text_tokenizer.g2p["_target_"]
                 )

diff --git a/nemo/collections/tts/models/vits.py b/nemo/collections/tts/models/vits.py
@@ -118,7 +118,11 @@ def _setup_tokenizer(self, cfg):
         text_tokenizer_kwargs = {}
         if "g2p" in cfg.text_tokenizer and cfg.text_tokenizer.g2p is not None:
             # for backward compatibility
-            if self._is_model_being_restored():
+            if (
+                self._is_model_being_restored()
+                and (not cfg.text_tokenizer.g2p.get('_target_', None))
+                and cfg.text_tokenizer.g2p["_target_"].startswith("nemo_text_processing.g2p")
+            ):
                 cfg.text_tokenizer.g2p["_target_"] = g2p_backward_compatible_support(
                     cfg.text_tokenizer.g2p["_target_"]
                 )