Merge branch 'RVC-Boss:main' into main

This commit is contained in:
梨梨梨
2024-01-22 02:03:46 +08:00
committed by GitHub
10 changed files with 115 additions and 110 deletions

View File

@@ -6,11 +6,18 @@ import sys,os,traceback
dir=sys.argv[1]
# opt_name=dir.split("\\")[-1].split("/")[-1]
opt_name=os.path.basename(dir)
path_asr='tools/damo_asr/models/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch'
path_vad='tools/damo_asr/models/speech_fsmn_vad_zh-cn-16k-common-pytorch'
path_punc='tools/damo_asr/models/punc_ct-transformer_zh-cn-common-vocab272727-pytorch'
path_asr=path_asr if os.path.exists(path_asr)else "damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch"
path_vad=path_vad if os.path.exists(path_vad)else "damo/speech_fsmn_vad_zh-cn-16k-common-pytorch"
path_punc=path_punc if os.path.exists(path_punc)else "damo/punc_ct-transformer_zh-cn-common-vocab272727-pytorch"
inference_pipeline = pipeline(
task=Tasks.auto_speech_recognition,
model='tools/damo_asr/models/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-pytorch',
vad_model='tools/damo_asr/models/speech_fsmn_vad_zh-cn-16k-common-pytorch',
punc_model='tools/damo_asr/models/punc_ct-transformer_zh-cn-common-vocab272727-pytorch',
model=path_asr,
vad_model=path_vad,
punc_model=path_punc,
)
opt=[]

View File

@@ -79,6 +79,7 @@ def b_change_index(index, batch):
def b_next_index(index, batch):
b_save_file()
if (index + batch) <= g_max_json_index:
return index + batch , *b_change_index(index + batch, batch)
else:
@@ -86,6 +87,7 @@ def b_next_index(index, batch):
def b_previous_index(index, batch):
b_save_file()
if (index - batch) >= 0:
return index - batch , *b_change_index(index - batch, batch)
else:
@@ -294,6 +296,7 @@ def set_global(load_json, load_list, json_key_text, json_key_path, batch):
if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Process some integers.')
parser.add_argument('--load_json', default="None", help='source file, like demo.json')
parser.add_argument('--is_share', default="False", help='whether webui is_share=True')
parser.add_argument('--load_list', default="None", help='source file, like demo.list')
parser.add_argument('--webui_port_subfix', default=9871, help='source file, like demo.list')
parser.add_argument('--json_key_text', default="text", help='the text key name in json, Default: text')
@@ -488,5 +491,6 @@ if __name__ == "__main__":
server_name="0.0.0.0",
inbrowser=True,
quiet=True,
share=eval(args.is_share),
server_port=int(args.webui_port_subfix)
)

View File

@@ -19,7 +19,8 @@ for name in os.listdir(weight_uvr5_root):
device=sys.argv[1]
is_half=sys.argv[2]
webui_port_uvr5=int(sys.argv[3])
is_share=eval(sys.argv[4])
def uvr(model_name, inp_root, save_root_vocal, paths, save_root_ins, agg, format0):
infos = []
@@ -179,6 +180,7 @@ with gr.Blocks(title="RVC WebUI") as app:
app.queue(concurrency_count=511, max_size=1022).launch(
server_name="0.0.0.0",
inbrowser=True,
server_port=9873,
share=is_share,
server_port=webui_port_uvr5,
quiet=True,
)