mirror of
https://github.com/RVC-Boss/GPT-SoVITS.git
synced 2026-04-29 21:00:42 +08:00
fix: 修复多个模块中的独立 bug (#2755)
1. 修复 sync_buffer 中除以函数对象而非调用结果(distrib.py)
- `buffer.data /= world_size` 中 world_size 是函数,缺少 (),
导致 TypeError 使分布式训练 buffer 同步失败
2. 修复 istft 函数缺少 return 语句(spec_utils.py)
- 函数计算了结果但未返回,调用者始终得到 None
3. 修复 cut0 返回字面量 "/n" 而非换行符 "\n"(text_segmentation_method.py)
- 导致后续 text.split("\n") 无法正确切分,字面 /n 被当作文本内容
4. 修复粤语 ASR 的 vad/punc model_revision 被无条件覆盖(funasr_asr.py)
- 粤语分支将 vad_model_revision 设为空(因不使用 VAD/标点模型),
但 if/else 外的赋值将其覆盖为 "v2.0.4",传入错误的 revision 参数
Made-with: Cursor
This commit is contained in:
parent
780383d5bd
commit
14191901cd
@ -92,7 +92,7 @@ def cut0(inp):
|
|||||||
if not set(inp).issubset(punctuation):
|
if not set(inp).issubset(punctuation):
|
||||||
return inp
|
return inp
|
||||||
else:
|
else:
|
||||||
return "/n"
|
return "\n"
|
||||||
|
|
||||||
|
|
||||||
# 凑四句一切
|
# 凑四句一切
|
||||||
|
|||||||
@ -87,7 +87,7 @@ def sync_buffer(buffers, average=True):
|
|||||||
for buffer, handle in handles:
|
for buffer, handle in handles:
|
||||||
handle.wait()
|
handle.wait()
|
||||||
if average:
|
if average:
|
||||||
buffer.data /= world_size
|
buffer.data /= world_size()
|
||||||
|
|
||||||
|
|
||||||
def sync_grad(params):
|
def sync_grad(params):
|
||||||
|
|||||||
@ -39,6 +39,7 @@ def create_model(language="zh"):
|
|||||||
local_dir="tools/asr/models/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch",
|
local_dir="tools/asr/models/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch",
|
||||||
)
|
)
|
||||||
model_revision = "v2.0.4"
|
model_revision = "v2.0.4"
|
||||||
|
vad_model_revision = punc_model_revision = "v2.0.4"
|
||||||
elif language == "yue":
|
elif language == "yue":
|
||||||
path_asr = "tools/asr/models/speech_UniASR_asr_2pass-cantonese-CHS-16k-common-vocab1468-tensorflow1-online"
|
path_asr = "tools/asr/models/speech_UniASR_asr_2pass-cantonese-CHS-16k-common-vocab1468-tensorflow1-online"
|
||||||
snapshot_download(
|
snapshot_download(
|
||||||
@ -51,8 +52,6 @@ def create_model(language="zh"):
|
|||||||
else:
|
else:
|
||||||
raise ValueError(f"{language} is not supported")
|
raise ValueError(f"{language} is not supported")
|
||||||
|
|
||||||
vad_model_revision = punc_model_revision = "v2.0.4"
|
|
||||||
|
|
||||||
if language in funasr_models:
|
if language in funasr_models:
|
||||||
return funasr_models[language]
|
return funasr_models[language]
|
||||||
else:
|
else:
|
||||||
|
|||||||
@ -485,6 +485,8 @@ def istft(spec, hl):
|
|||||||
wave_right = librosa.istft(spec_right, hop_length=hl)
|
wave_right = librosa.istft(spec_right, hop_length=hl)
|
||||||
wave = np.asfortranarray([wave_left, wave_right])
|
wave = np.asfortranarray([wave_left, wave_right])
|
||||||
|
|
||||||
|
return wave
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
import argparse
|
import argparse
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user