[TTS/TN/G2P] Remove Text Processing from NeMo, move G2P to TTS #5982

ekmb · 2023-02-10T06:19:25Z

What does this PR do ?

Add a one line overview of what this PR aims to accomplish.

Collection: TTS/TN

Changelog

Add specific line by line info of high level changes in this PR.

Usage

You can potentially add a usage example below

# Add a code snippet demonstrating how to use this

Before your PR is "Ready for review"

Pre checks:

Make sure you read and followed Contributor guidelines
Did you write any new necessary tests?
Did you add or update any necessary documentation?
Does the PR affect components that are optional to install? (Ex: Numba, Pynini, Apex etc)
- Reviewer: Does the PR have correct import guards for all optional libraries?

PR Type:

New Feature
Bugfix
Documentation

If you haven't finished some of the above items you can still open "Draft" PR.

Who can review?

Anyone in the community is free to review the PR once the checks have passed.
Contributor guidelines contains specific people who can review PRs to various areas.

Additional Information

Related to # (issue)

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

for more information, see https://pre-commit.ci

nemo/collections/tts/g2p/data/__init__.py

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

…to_tts

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

for more information, see https://pre-commit.ci

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

…to_tts

for more information, see https://pre-commit.ci

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

nemo/collections/tts/torch/g2ps.py

@@ -14,4 +14,4 @@

 # TODO @xueyang: deprecate this file since no other places import modules from here anymore. However,
 #  all checkpoints uploaded in ngc used this path. So it requires to update all ngc checkpoints g2p path as well.
-from nemo_text_processing.g2p.modules import IPAG2P, BaseG2p, EnglishG2p
+from nemo.collections.tts.g2p.modules import IPAG2P, BaseG2p, EnglishG2p


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

XuesongYang

Not sure if all directories are removed as expected. I am still seeing below directories in my local copy although they are empty now. Maybe there are cached files in my local. But please double check it empty directories are removed.

nemo_text_processing
tests/nemo_text_processing/g2p

ekmb · 2023-02-13T22:30:54Z

Not sure if all directories are removed as expected. I am still seeing below directories in my local copy although they are empty now. Maybe there are cached files in my local. But please double check it empty directories are removed.

nemo_text_processing

tests/nemo_text_processing/g2p

removed. I might be easier to browse files in the branch https://github.com/NVIDIA/NeMo/tree/g2p_to_tts

docs/source/tts/configs.rst

docs/source/tts/datasets.rst

examples/tts/conf/aligner.yaml

examples/tts/conf/fastpitch_align_44100.yaml

examples/tts/conf/fastpitch_align_ipa.yaml

examples/tts/conf/rad-tts_feature_pred.yaml

examples/tts/conf/rad-tts_feature_pred_ipa.yaml

examples/tts/conf/tacotron2.yaml

examples/tts/conf/vits.yaml

examples/tts/conf/vits_44100.yaml

scripts/tts_dataset_files/wordid_to_ipa-0.7b_nv22.10.tsv

scripts/dataset_processing/tts/sfbilingual/ds_conf/ds_for_fastpitch_align.yaml

scripts/dataset_processing/tts/ljspeech/get_data.py

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

update based on offline discussion

requirements/requirements_nemo_text_processing.txt

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

for more information, see https://pre-commit.ci

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

…to_tts

XuesongYang

LGTM. Thank you!

redoctopus · 2023-02-15T17:32:32Z

docs/source/tts/configs.rst

@@ -96,7 +96,6 @@ Text normalization (TN) converts text from written form into its verbalized form
      _target_: nemo_text_processing.text_normalization.normalize.Normalizer
      lang: en
      input_case: cased
-      whitelist: "nemo_text_processing/text_normalization/en/data/whitelist/lj_speech.tsv"


As discussed offline: please add a paragraph in the documentation describing how default/non-default settings for whitelist work in a future PR.

nemo/collections/common/tokenizers/text_to_speech/tts_tokenizers.py

rlangman · 2023-02-15T17:55:33Z

nemo/collections/tts/models/vits.py

+            try:
+                import nemo_text_processing
+
+                self.normalizer = instantiate(cfg.text_normalizer, **normalizer_kwargs)
+                self.text_normalizer_call = self.normalizer.normalize
+            except Exception as e:
+                logging.error(e)
+                raise ImportError(
+                    "`nemo_text_processing` not installed, see https://github.com/NVIDIA/NeMo-text-processing for more details"
+                )


Should we use the same import guard like in other areas?

try: import nemo_text_processing NEMO_TEXT_INSTALLED = True except ModuleNotFoundError: NEMO_TEXT_INSTALLED = False if not NEMO_TEXT_INSTALLED: raise()

Should we use the same import guard like in other areas?

try: import nemo_text_processing NEMO_TEXT_INSTALLED = True except ModuleNotFoundError: NEMO_TEXT_INSTALLED = False if not NEMO_TEXT_INSTALLED: raise()

I like this suggestion! And how about putting this to base.py so that every class can just import NEMO_TEXT_INSTALLED from base.py?

This code style is good, but are we really wanna unify it in this PR? This is a known issue that is not only applied for nemo_text_processing. We have other lib import needs to be updated as well. I wonder if we could file a separate PR to fix the import guard altogether.

Let's do a separate PR for that.

Sure, we can leave it for a separate PR.

Added it to JIRA backlog. Please feel free to pick it up.

Dockerfile

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

rlangman

LGTM

XuesongYang

Thanks for updating!

As discussed offline: please add a paragraph in the documentation describing how default/non-default settings for whitelist work in a future PR.
rebase to the lastest main to avoid conflicts.

XuesongYang · 2023-02-15T19:41:01Z

nemo/collections/common/tokenizers/text_to_speech/tts_tokenizers.py

@@ -731,11 +731,11 @@ def encode(self, text):

    def encode_from_g2p(self, g2p_text: List[str], raw_text: Optional[str] = None):
        """
-        Encodes text that has already been run through G2P_paper.
-        Called for encoding to tokens after text preprocessing and G2P_paper.
+        Encodes text that has already been run through G2Pr.


nit: s/G2Pr/G2P/

XuesongYang · 2023-02-15T19:45:56Z

nemo/collections/tts/models/vits.py

+            try:
+                import nemo_text_processing
+
+                self.normalizer = instantiate(cfg.text_normalizer, **normalizer_kwargs)
+                self.text_normalizer_call = self.normalizer.normalize
+            except Exception as e:
+                logging.error(e)
+                raise ImportError(
+                    "`nemo_text_processing` not installed, see https://github.com/NVIDIA/NeMo-text-processing for more details"
+                )


Added it to JIRA backlog. Please feel free to pick it up.

XuesongYang · 2023-02-15T20:03:17Z

I observed that the TN related item in Tool section is not removed.

[Tools](https://github.com/NVIDIA/NeMo/tree/stable/tools)
[Text Processing (text normalization and inverse text normalization)](https://docs.nvidia.com/deeplearning/nemo/user-guide/docs/en/main/nlp/text_normalization/intro.html)

…A#5982) * remove TN Signed-off-by: ekmb <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix imports Signed-off-by: ekmb <[email protected]> * fix import Signed-off-by: ekmb <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add missing init Signed-off-by: ekmb <[email protected]> * fix import Signed-off-by: ekmb <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * rename unit test Signed-off-by: ekmb <[email protected]> * fix import Signed-off-by: ekmb <[email protected]> * fix modules test Signed-off-by: ekmb <[email protected]> * fix imports Signed-off-by: ekmb <[email protected]> * remove whitelist from config Signed-off-by: ekmb <[email protected]> * delete wordid file Signed-off-by: ekmb <[email protected]> * remove pynini_install from tutorials Signed-off-by: ekmb <[email protected]> * update requirements Signed-off-by: ekmb <[email protected]> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add support warning Signed-off-by: ekmb <[email protected]> * review Signed-off-by: ekmb <[email protected]> --------- Signed-off-by: ekmb <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

ekmb added 2 commits February 9, 2023 22:13

remove TN

2966c2c

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

Merge branch 'main' into g2p_to_tts

730b497

github-actions bot added CI common TTS labels Feb 10, 2023

[pre-commit.ci] auto fixes from pre-commit.com hooks

c023aca

for more information, see https://pre-commit.ci

github-advanced-security bot found potential problems Feb 10, 2023

View reviewed changes

nemo/collections/tts/g2p/data/__init__.py Fixed Show fixed Hide fixed

ekmb and others added 6 commits February 10, 2023 12:06

fix imports

e7019b7

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

Merge branch 'g2p_to_tts' of https://github.com/NVIDIA/NeMo into g2p_…

3921020

…to_tts

Merge branch 'main' into g2p_to_tts

312b966

fix import

dec4c0b

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

[pre-commit.ci] auto fixes from pre-commit.com hooks

48683ab

for more information, see https://pre-commit.ci

add missing init

09e881f

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

ekmb marked this pull request as draft February 10, 2023 21:14

ekmb and others added 3 commits February 10, 2023 13:15

fix import

71b0616

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

Merge branch 'g2p_to_tts' of https://github.com/NVIDIA/NeMo into g2p_…

0cde4de

…to_tts

[pre-commit.ci] auto fixes from pre-commit.com hooks

1fc2f82

for more information, see https://pre-commit.ci

ekmb marked this pull request as ready for review February 10, 2023 21:45

ekmb added 3 commits February 10, 2023 13:50

Merge branch 'main' into g2p_to_tts

79193e0

rename unit test

0399299

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

fix import

fcc8f08

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

github-advanced-security bot found potential problems Feb 11, 2023

View reviewed changes

ekmb added 2 commits February 10, 2023 22:47

fix modules test

6bcdbf1

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

fix imports

bfead4b

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

ekmb requested review from XuesongYang, redoctopus and yzhang123 February 13, 2023 14:50

XuesongYang reviewed Feb 13, 2023

View reviewed changes

XuesongYang requested changes Feb 13, 2023

View reviewed changes

XuesongYang requested a review from rlangman February 14, 2023 00:29

XuesongYang previously requested changes Feb 14, 2023

View reviewed changes

scripts/tts_dataset_files/wordid_to_ipa-0.7b_nv22.10.tsv Outdated Show resolved Hide resolved

scripts/dataset_processing/tts/sfbilingual/ds_conf/ds_for_fastpitch_align.yaml Outdated Show resolved Hide resolved

scripts/dataset_processing/tts/ljspeech/get_data.py Show resolved Hide resolved

ekmb added 3 commits February 14, 2023 16:23

Merge branch 'main' into g2p_to_tts

ee0bf93

remove whitelist from config

be645ed

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

delete wordid file

6cbc570

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

XuesongYang self-requested a review February 15, 2023 03:08

XuesongYang reviewed Feb 15, 2023

View reviewed changes

requirements/requirements_nemo_text_processing.txt Outdated Show resolved Hide resolved

remove pynini_install from tutorials

2696d10

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

github-actions bot added the NLP label Feb 15, 2023

ekmb and others added 4 commits February 14, 2023 20:07

update requirements

b3c3ca6

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

[pre-commit.ci] auto fixes from pre-commit.com hooks

eb8adf2

for more information, see https://pre-commit.ci

add support warning

9e8e0dc

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

Merge branch 'g2p_to_tts' of https://github.com/NVIDIA/NeMo into g2p_…

680b383

…to_tts

XuesongYang previously approved these changes Feb 15, 2023

View reviewed changes

redoctopus previously approved these changes Feb 15, 2023

View reviewed changes

rlangman reviewed Feb 15, 2023

View reviewed changes

review

e304858

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

ekmb dismissed stale reviews from redoctopus and XuesongYang via e304858 February 15, 2023 19:20

rlangman approved these changes Feb 15, 2023

View reviewed changes

XuesongYang approved these changes Feb 15, 2023

View reviewed changes

ekmb merged commit 5b71d4d into main Feb 15, 2023

ekmb deleted the g2p_to_tts branch February 15, 2023 22:23

ekmb restored the g2p_to_tts branch February 16, 2023 20:54

XuesongYang deleted the g2p_to_tts branch February 21, 2023 08:33

XuesongYang mentioned this pull request Mar 15, 2023

[TTS] fix broken tutorial for Tacotron2 #6199

Merged

8 tasks

github-actions bot mentioned this pull request Mar 15, 2023

[TTS] fix broken tutorial for Tacotron2 #6204

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TTS/TN/G2P] Remove Text Processing from NeMo, move G2P to TTS #5982

[TTS/TN/G2P] Remove Text Processing from NeMo, move G2P to TTS #5982

ekmb commented Feb 10, 2023

XuesongYang left a comment

ekmb commented Feb 13, 2023

XuesongYang left a comment

redoctopus Feb 15, 2023

rlangman Feb 15, 2023

ekmb Feb 15, 2023

XuesongYang Feb 15, 2023 •

edited

Loading

ekmb Feb 15, 2023

rlangman Feb 15, 2023

XuesongYang Feb 15, 2023

rlangman left a comment

XuesongYang left a comment

XuesongYang Feb 15, 2023

XuesongYang Feb 15, 2023

XuesongYang commented Feb 15, 2023 •

edited

Loading

[TTS/TN/G2P] Remove Text Processing from NeMo, move G2P to TTS #5982

[TTS/TN/G2P] Remove Text Processing from NeMo, move G2P to TTS #5982

Conversation

ekmb commented Feb 10, 2023

What does this PR do ?

Changelog

Usage

Before your PR is "Ready for review"

Who can review?

Additional Information

XuesongYang left a comment

Choose a reason for hiding this comment

ekmb commented Feb 13, 2023

XuesongYang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

XuesongYang Feb 15, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rlangman left a comment

Choose a reason for hiding this comment

XuesongYang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

XuesongYang commented Feb 15, 2023 • edited Loading

XuesongYang Feb 15, 2023 •

edited

Loading

XuesongYang commented Feb 15, 2023 •

edited

Loading