diff --git a/paddlespeech/t2s/__init__.py b/paddlespeech/t2s/__init__.py index 57fe82a9c68f6eea00487c06285570d25b334909..7d93c026ecedda485d52b84c349e8fc1806daaf5 100644 --- a/paddlespeech/t2s/__init__.py +++ b/paddlespeech/t2s/__init__.py @@ -18,6 +18,5 @@ from . import exps from . import frontend from . import models from . import modules -from . import ssml from . import training from . import utils diff --git a/paddlespeech/t2s/exps/synthesize_e2e.py b/paddlespeech/t2s/exps/synthesize_e2e.py index bff329a49c71a7f4da8d3eaf6a628d0d745bb2cd..f78213841debfe2bf7a7265af615afb2f0fdac84 100644 --- a/paddlespeech/t2s/exps/synthesize_e2e.py +++ b/paddlespeech/t2s/exps/synthesize_e2e.py @@ -148,7 +148,7 @@ def evaluate(args): # multi speaker if am_dataset in {"aishell3", "vctk", "mix", "canton"}: # multi-speaker - spk_id = paddle.to_tensor(args.spk_id) + spk_id = paddle.to_tensor([args.spk_id]) mel = am_inference(part_phone_ids, spk_id) else: # single-speaker @@ -157,7 +157,7 @@ def evaluate(args): part_tone_ids = frontend_dict['tone_ids'][i] if am_dataset in {"aishell3", "vctk", "mix"}: # multi-speaker - spk_id = paddle.to_tensor(args.spk_id) + spk_id = paddle.to_tensor([args.spk_id]) mel = am_inference(part_phone_ids, part_tone_ids, spk_id) else: diff --git a/paddlespeech/t2s/frontend/__init__.py b/paddlespeech/t2s/frontend/__init__.py index 64015435eefd7a8f1d3369a49cb0be7e10c8ec60..09caa1bef31b1b84052272e57ded1ab8a07d1af4 100644 --- a/paddlespeech/t2s/frontend/__init__.py +++ b/paddlespeech/t2s/frontend/__init__.py @@ -15,6 +15,7 @@ from .generate_lexicon import * from .normalizer import * from .phonectic import * from .punctuation import * +from .ssml import * from .tone_sandhi import * from .vocab import * from .zh_normalization import * diff --git a/paddlespeech/t2s/frontend/mix_frontend.py b/paddlespeech/t2s/frontend/mix_frontend.py index b8c16097c44b3265ed32682605f292411ccb8ad0..fb7ea94e706289bde8575b70031dcd42d41888da 100644 --- a/paddlespeech/t2s/frontend/mix_frontend.py +++ b/paddlespeech/t2s/frontend/mix_frontend.py @@ -19,8 +19,8 @@ import numpy as np import paddle from paddlespeech.t2s.frontend import English +from paddlespeech.t2s.frontend.ssml.xml_processor import MixTextProcessor from paddlespeech.t2s.frontend.zh_frontend import Frontend -from paddlespeech.t2s.ssml.xml_processor import MixTextProcessor class MixFrontend():