added diffusion_model and tokenizer_json as arguments for settings editing

This commit is contained in:
mrq 2023-03-16 14:19:24 +00:00
parent 1f674a468f
commit e201746eeb

View File

@ -565,6 +565,8 @@ class TextToSpeech:
num_autoregressive_samples=512, temperature=.8, length_penalty=1, repetition_penalty=2.0, top_p=.8, max_mel_tokens=500, num_autoregressive_samples=512, temperature=.8, length_penalty=1, repetition_penalty=2.0, top_p=.8, max_mel_tokens=500,
sample_batch_size=None, sample_batch_size=None,
autoregressive_model=None, autoregressive_model=None,
diffusion_model=None,
tokenizer_json=None,
# CVVP parameters follow # CVVP parameters follow
cvvp_amount=.0, cvvp_amount=.0,
# diffusion generation parameters follow # diffusion generation parameters follow
@ -632,6 +634,16 @@ class TextToSpeech:
elif autoregressive_model != self.autoregressive_model_path: elif autoregressive_model != self.autoregressive_model_path:
self.load_autoregressive_model(autoregressive_model) self.load_autoregressive_model(autoregressive_model)
if diffusion_model is None:
diffusion_model = self.diffusion_model_path
elif diffusion_model != self.diffusion_model_path:
self.load_diffusion_model(diffusion_model)
if tokenizer_json is None:
tokenizer_json = self.tokenizer_json
elif tokenizer_json != self.tokenizer_json:
self.load_tokenizer_json(tokenizer_json)
text_tokens = torch.IntTensor(self.tokenizer.encode(text)).unsqueeze(0) text_tokens = torch.IntTensor(self.tokenizer.encode(text)).unsqueeze(0)
text_tokens = migrate_to_device( text_tokens, self.device ) text_tokens = migrate_to_device( text_tokens, self.device )