Merge branch 'tts_fastpitch_adapter_tutorial' of https://github.com/N…

…VIDIA/NeMo into tts_fastpitch_adapter_tutorial
NVIDIA · May 2, 2023 · 1cb4727 · 1cb4727
2 parents 4e75a6e + f402847
commit 1cb4727
Show file tree

Hide file tree

Showing 18 changed files with 872 additions and 166 deletions.
diff --git a/examples/nlp/language_modeling/megatron_change_num_partitions.py b/examples/nlp/language_modeling/megatron_change_num_partitions.py
diff --git a/nemo/collections/asr/data/audio_to_text.py b/nemo/collections/asr/data/audio_to_text.py
@@ -191,8 +191,8 @@ def expand_sharded_filepaths(sharded_filepaths, shard_strategy: str, world_size:
                 sharded_filepaths = sharded_filepaths.replace(bkey, "}")
 
     if isinstance(sharded_filepaths, str):
-        # Brace expand
-        sharded_filepaths = list(braceexpand.braceexpand(sharded_filepaths))
+        # Brace expand, set escape=False for Windows compatibility
+        sharded_filepaths = list(braceexpand.braceexpand(sharded_filepaths, escape=False))
 
     # Expand store paths into WebDataset URLs
     sharded_filepaths = [
@@ -1359,5 +1359,9 @@ def __iter__(self):
         for dataset_idx in shuffled_order:
             d = self.datasets[dataset_idx]
             assert isinstance(d, IterableDataset), "ChainDataset only supports IterableDataset"
-            for x in d:
+            for idx, x in enumerate(d):
                 yield x
+                # in case d is an infinite dataset, we want to break the loop
+                # so that the other datasets get a chance to yield too
+                if idx >= len(d) - 1:
+                    break
diff --git a/nemo/collections/asr/data/audio_to_text_dataset.py b/nemo/collections/asr/data/audio_to_text_dataset.py
@@ -512,7 +512,7 @@ def get_audio_to_text_char_dataset_from_config(
         constructed dataset or None if dataset config is invalid or nothing to load
     """
     if 'augmentor' in config:
-        augmentor = process_augmentations(config['augmentor'])
+        augmentor = process_augmentations(config['augmentor'], global_rank=global_rank, world_size=world_size)
     else:
         augmentor = None
 
@@ -609,7 +609,7 @@ def get_audio_to_text_bpe_dataset_from_config(
         constructed dataset or None if dataset config is invalid or nothing to load
     """
     if 'augmentor' in config:
-        augmentor = process_augmentations(config['augmentor'])
+        augmentor = process_augmentations(config['augmentor'], global_rank=global_rank, world_size=world_size)
     else:
         augmentor = None
 

diff --git a/nemo/collections/asr/parts/preprocessing/__init__.py b/nemo/collections/asr/parts/preprocessing/__init__.py
@@ -20,6 +20,7 @@
     GainPerturbation,
     ImpulsePerturbation,
     NoisePerturbation,
+    NoisePerturbationWithNormalization,
     Perturbation,
     RirAndNoisePerturbation,
     ShiftPerturbation,