mirror of
https://github.com/RVC-Boss/GPT-SoVITS.git
synced 2025-10-05 22:20:01 +08:00
Merge 55ce445432d8600fd613a884341a734cb3fe617a into 13055fa56994e75a7152c176047c56c62bbeede4
This commit is contained in:
commit
796cc67cdb
@ -565,6 +565,8 @@ class TTS:
|
||||
self.t2s_model = self.t2s_model.half()
|
||||
|
||||
def init_vocoder(self, version: str):
|
||||
# 防止第三方导入时,找不到模型文件
|
||||
root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
if version == "v3":
|
||||
if self.vocoder is not None and self.vocoder.__class__.__name__ == "BigVGAN":
|
||||
return
|
||||
@ -574,7 +576,7 @@ class TTS:
|
||||
self.empty_cache()
|
||||
|
||||
self.vocoder = BigVGAN.from_pretrained(
|
||||
"%s/GPT_SoVITS/pretrained_models/models--nvidia--bigvgan_v2_24khz_100band_256x" % (now_dir,),
|
||||
f"{root_dir}/pretrained_models/models--nvidia--bigvgan_v2_24khz_100band_256x",
|
||||
use_cuda_kernel=False,
|
||||
) # if True, RuntimeError: Ninja is required to load C++ extensions
|
||||
# remove weight norm in the model and set to eval mode
|
||||
@ -605,7 +607,7 @@ class TTS:
|
||||
gin_channels=0, is_bias=True
|
||||
)
|
||||
self.vocoder.remove_weight_norm()
|
||||
state_dict_g = torch.load("%s/GPT_SoVITS/pretrained_models/gsv-v4-pretrained/vocoder.pth" % (now_dir,), map_location="cpu")
|
||||
state_dict_g = torch.load(f"{root_dir}/pretrained_models/gsv-v4-pretrained/vocoder.pth", map_location="cpu")
|
||||
print("loading vocoder",self.vocoder.load_state_dict(state_dict_g))
|
||||
|
||||
self.vocoder_configs["sr"] = 48000
|
||||
|
@ -31,9 +31,12 @@ if is_g2pw:
|
||||
from text.g2pw import G2PWPinyin, correct_pronunciation
|
||||
|
||||
parent_directory = os.path.dirname(current_file_path)
|
||||
# 防止作为第三方库导入时,找不到模型文件
|
||||
model_dir = os.path.join(current_file_path, "G2PWModel")
|
||||
model_source = os.path.join(parent_directory, "pretrained_models/chinese-roberta-wwm-ext-large")
|
||||
g2pw = G2PWPinyin(
|
||||
model_dir="GPT_SoVITS/text/G2PWModel",
|
||||
model_source=os.environ.get("bert_path", "GPT_SoVITS/pretrained_models/chinese-roberta-wwm-ext-large"),
|
||||
model_dir=model_dir,
|
||||
model_source=os.environ.get("bert_path", model_source),
|
||||
v_to_u=False,
|
||||
neutral_tone_with_five=True,
|
||||
)
|
||||
|
@ -2,7 +2,7 @@ import json
|
||||
import locale
|
||||
import os
|
||||
|
||||
I18N_JSON_DIR: os.PathLike = os.path.join(os.path.dirname(os.path.relpath(__file__)), "locale")
|
||||
I18N_JSON_DIR: os.PathLike = os.path.join(os.path.dirname(os.path.abspath(__file__)), "locale")
|
||||
|
||||
|
||||
def load_language_list(language):
|
||||
|
Loading…
x
Reference in New Issue
Block a user