reading all speakers upfront

This commit is contained in:
Thomas Werkmeister
2019-07-10 18:38:55 +02:00
parent 6390c3b2e6
commit 2f2482f9b4
9 changed files with 52 additions and 46 deletions
+2 -2
View File
@@ -251,14 +251,14 @@ def set_init_dict(model_dict, checkpoint, c):
return model_dict
def setup_model(num_chars, c):
def setup_model(num_chars, num_speakers, c):
print(" > Using model: {}".format(c.model))
MyModel = importlib.import_module('models.' + c.model.lower())
MyModel = getattr(MyModel, c.model)
if c.model.lower() in ["tacotron", "tacotrongst"]:
model = MyModel(
num_chars=num_chars,
num_speakers=c.num_speakers,
num_speakers=num_speakers,
r=c.r,
linear_dim=1025,
mel_dim=80,
+8 -5
View File
@@ -1,6 +1,8 @@
import os
import json
from datasets.preprocess import get_preprocessor_by_name
def make_speakers_json_path(out_path):
"""Returns conventional speakers.json location."""
@@ -23,8 +25,9 @@ def save_speaker_mapping(out_path, speaker_mapping):
json.dump(speaker_mapping, f, indent=4)
def copy_speaker_mapping(out_path_a, out_path_b):
"""Copies a speaker mapping when restoring a model from a previous path."""
speaker_mapping = load_speaker_mapping(out_path_a)
if speaker_mapping is not None:
save_speaker_mapping(out_path_b, speaker_mapping)
def get_speakers(data_root, meta_file, dataset_type):
"""Returns a sorted, unique list of speakers in a given dataset."""
preprocessor = get_preprocessor_by_name(dataset_type)
items = preprocessor(data_root, meta_file)
speakers = {e[2] for e in items}
return sorted(speakers)