Merge branch 'master' into speaker_ids_config

Author: dathudeptrai

examples/fastspeech2_libritts/libri_experiment/prepare_libri.ipynb

@@ -79,8 +79,7 @@
     "                    f_path = os.path.join(id_path, k, j)\n",
     "                    sf_file =  sf.SoundFile(f_path)\n",
     "                    dur = len(sf_file) / sf_file.samplerate\n",
-    "                    if max_file_len < dur < min_file_len:\n",
-    "                        print(dur)\n",
+    "                    if max_file_len < dur or dur < min_file_len:\n",
     "                        continue\n",
     "                    else:\n",
     "                        id_included.append(f_path)\n",

examples/multiband_melgan/conf/multiband_melgan.v1.yaml

@@ -69,7 +69,7 @@ lambda_adv: 2.5              # Loss balancing coefficient for adversarial loss.
 ###########################################################
 batch_size: 64                 # Batch size.
 batch_max_steps: 8192          # Length of each audio in batch for training. Make sure dividable by hop_size.
-batch_max_steps_valid: 81920   # Length of each audio for validation. Make sure dividable by hope_size.
+batch_max_steps_valid: 8192    # Length of each audio for validation. Make sure dividable by hope_size.
 remove_short_samples: true     # Whether to remove samples the length of which are less than batch_max_steps.
 allow_cache: true              # Whether to allow cache in dataset. If true, it requires cpu memory.
 is_shuffle: true               # shuffle dataset after each epoch.

notebooks/TensorFlowTTS_FastSpeech_with_TFLite.ipynb

@@ -200,7 +200,7 @@
     "# initialize melgan model\n",
     "with open('../examples/melgan/conf/melgan.v1.yaml') as f:\n",
     "    melgan_config = yaml.load(f, Loader=yaml.Loader)\n",
-    "melgan_config = MelGANGeneratorConfig(**melgan_config[\"generator_params\"])\n",
+    "melgan_config = MelGANGeneratorConfig(**melgan_config[\"melgan_generator_params\"])\n",
     "melgan = TFMelGANGenerator(config=melgan_config, name='melgan_generator')\n",
     "melgan._build()\n",
     "melgan.load_weights(\"../examples/melgan/checkpoints/generator-1500000.h5\")"

notebooks/TensorFlowTTS_Tacotron2_with_TFLite.ipynb

@@ -197,7 +197,7 @@
     "# initialize melgan model\n",
     "with open('../examples/melgan/conf/melgan.v1.yaml') as f:\n",
     "    melgan_config = yaml.load(f, Loader=yaml.Loader)\n",
-    "melgan_config = MelGANGeneratorConfig(**melgan_config[\"generator_params\"])\n",
+    "melgan_config = MelGANGeneratorConfig(**melgan_config[\"melgan_generator_params\"])\n",
     "melgan = TFMelGANGenerator(config=melgan_config, name='melgan_generator')\n",
     "melgan._build()\n",
     "melgan.load_weights(\"../examples/melgan/checkpoints/generator-1500000.h5\")"