tuna2134/sbv2-v2
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix normal model N bug

Browse Source
This commit is contained in:
litagin02
2024-02-02 23:06:31 +09:00
parent 59421c07d6
commit d2da83a1fd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
infer.py
View File

@@ -9,8 +9,6 @@ from text.cleaner import clean_text
from text.symbols import symbols from text.symbols import symbols
from common.log import logger from common.log import logger
# latest_version = "1.0"
class InvalidToneError(ValueError): class InvalidToneError(ValueError):
pass pass
@@ -18,6 +16,7 @@ class InvalidToneError(ValueError):
def get_net_g(model_path: str, version: str, device: str, hps): def get_net_g(model_path: str, version: str, device: str, hps):
if version.endswith("JP-Extra"): if version.endswith("JP-Extra"):
logger.info("Using JP-Extra model")
net_g = SynthesizerTrnJPExtra( net_g = SynthesizerTrnJPExtra(
len(symbols), len(symbols),
hps.data.filter_length // 2 + 1, hps.data.filter_length // 2 + 1,
@@ -26,6 +25,7 @@ def get_net_g(model_path: str, version: str, device: str, hps):
**hps.model, **hps.model,
).to(device) ).to(device)
else: else:
logger.info("Using normal model")
net_g = SynthesizerTrn( net_g = SynthesizerTrn(
len(symbols), len(symbols),
hps.data.filter_length // 2 + 1, hps.data.filter_length // 2 + 1,
@@ -53,8 +53,8 @@ def get_text(
assist_text_weight=0.7, assist_text_weight=0.7,
given_tone=None, given_tone=None,
): ):
# 在此处实现当前版本的get_text use_jp_extra = hps.version.endswith("JP-Extra")
norm_text, phone, tone, word2ph = clean_text(text, language_str) norm_text, phone, tone, word2ph = clean_text(text, language_str, use_jp_extra)
if given_tone is not None: if given_tone is not None:
if len(given_tone) != len(phone): if len(given_tone) != len(phone):
raise InvalidToneError( raise InvalidToneError(

2
text/japanese.py
View File

@@ -210,7 +210,7 @@ def g2p(
assert len(phones) == sum(word2ph), f"{len(phones)} != {sum(word2ph)}" assert len(phones) == sum(word2ph), f"{len(phones)} != {sum(word2ph)}"
# 最後にuse_jp_extraでない場合は「N」を「n」に変換 # use_jp_extraでない場合は「N」を「n」に変換
if not use_jp_extra: if not use_jp_extra:
phones = [phone if phone != "N" else "n" for phone in phones] phones = [phone if phone != "N" else "n" for phone in phones]