Remove unused paramater

pull/950/head
babysor00 2023-08-29 23:00:08 +08:00
parent a7b0431afe
commit ad1ce89c7a
1 changed files with 3 additions and 8 deletions

View File

@ -102,9 +102,7 @@ def preprocess_dataset(datasets_root: Path, out_dir: Path, n_processes: int,
print("Max mel frames length: %d" % max(int(m[4]) for m in metadata))
print("Max audio timesteps length: %d" % max(int(m[3]) for m in metadata))
def embed_utterance(fpaths: str, encoder_model_fpath: str, skip_existing: bool):
if should_skip(fpaths, skip_existing):
return
def _embed_utterance(fpaths: str, encoder_model_fpath: str):
if not encoder.is_loaded():
encoder.load_model(encoder_model_fpath)
@ -115,9 +113,7 @@ def embed_utterance(fpaths: str, encoder_model_fpath: str, skip_existing: bool):
embed = encoder.embed_utterance(wav)
np.save(embed_fpath, embed, allow_pickle=False)
def _emo_extract_from_utterance(fpaths, hparams, skip_existing=False):
if skip_existing and fpaths.exists():
return
def _emo_extract_from_utterance(fpaths, hparams):
wav_fpath, emo_fpath = fpaths
wav = np.load(wav_fpath)
emo = extract_emo(np.expand_dims(wav, 0), hparams.sample_rate, True)
@ -130,7 +126,6 @@ def create_embeddings(synthesizer_root: Path, encoder_model_fpath: Path, n_proce
embed_dir = synthesizer_root.joinpath("embeds")
embed_dir.mkdir(exist_ok=True)
# Gather the input wave filepath and the target output embed filepath
with metadata_fpath.open("r", encoding="utf-8") as metadata_file:
metadata = [line.split("|") for line in metadata_file]
@ -138,7 +133,7 @@ def create_embeddings(synthesizer_root: Path, encoder_model_fpath: Path, n_proce
# TODO: improve on the multiprocessing, it's terrible. Disk I/O is the bottleneck here.
# Embed the utterances in separate threads
func = partial(embed_utterance, encoder_model_fpath=encoder_model_fpath)
func = partial(_embed_utterance, encoder_model_fpath=encoder_model_fpath)
job = Pool(n_processes).imap(func, fpaths)
tuple(tqdm(job, "Embedding", len(fpaths), unit="utterances"))