Merge remote-tracking branch 'upstream/main' into clean

This commit is contained in:
Ftps
2023-08-27 12:43:37 +09:00
32 changed files with 1481 additions and 1501 deletions

View File

@@ -18,7 +18,10 @@ from time import sleep
import faiss
import gradio as gr
from configs.config import Config
import soundfile as sf
import fairseq
from i18n.i18n import I18nAuto
from infer.lib.train.process_ckpt import (
@@ -27,6 +30,7 @@ from infer.lib.train.process_ckpt import (
merge,
show_info,
)
from sklearn.cluster import MiniBatchKMeans
from dotenv import load_dotenv
@@ -48,10 +52,12 @@ os.makedirs(os.path.join(now_dir, "weights"), exist_ok=True)
warnings.filterwarnings("ignore")
torch.manual_seed(114514)
load_dotenv()
config = Config()
vc = VC(config)
if config.dml == True:
def forward_dml(ctx, x, scale):
@@ -195,14 +201,19 @@ def if_done_multi(done, ps):
done[0] = True
def get_quoted_python_cmd():
return f'"{config.python_cmd}"'
def preprocess_dataset(trainset_dir, exp_dir, sr, n_p):
sr = sr_dict[sr]
os.makedirs("%s/logs/%s" % (now_dir, exp_dir), exist_ok=True)
f = open("%s/logs/%s/preprocess.log" % (now_dir, exp_dir), "w")
f.close()
cmd = (
config.python_cmd
get_quoted_python_cmd()
+ ' infer/modules/train/preprocess.py "%s" %s %s "%s/logs/%s" '
% (trainset_dir, sr, n_p, now_dir, exp_dir)
+ str(config.noparallel)
)
@@ -238,8 +249,9 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp
if if_f0:
if f0method != "rmvpe_gpu":
cmd = (
config.python_cmd
get_quoted_python_cmd()
+ ' infer/modules/train/extract/extract_f0_print.py "%s/logs/%s" %s %s'
% (
now_dir,
exp_dir,
@@ -267,8 +279,9 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp
ps = []
for idx, n_g in enumerate(gpus_rmvpe):
cmd = (
config.python_cmd
get_quoted_python_cmd()
+ ' infer/modules/train/extract/extract_f0_rmvpe.py %s %s %s "%s/logs/%s" %s '
% (leng, idx, n_g, now_dir, exp_dir, config.is_half)
)
print(cmd)
@@ -324,8 +337,9 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp
ps = []
for idx, n_g in enumerate(gpus):
cmd = (
config.python_cmd
get_quoted_python_cmd()
+ ' infer/modules/train/extract_feature_print.py %s %s %s %s "%s/logs/%s" %s'
% (
config.device,
leng,
@@ -560,7 +574,7 @@ def click_train(
print("no pretrained Discriminator")
if gpus16:
cmd = (
config.python_cmd
get_quoted_python_cmd()
+ ' infer/modules/train/train.py -e "%s" -sr %s -f0 %s -bs %s -g %s -te %s -se %s %s %s -l %s -c %s -sw %s -v %s'
% (
exp_dir1,
@@ -725,7 +739,7 @@ def train1key(
#########step1:处理数据
open(preprocess_log_path, "w").close()
cmd = (
config.python_cmd
get_quoted_python_cmd()
+ ' trainset_preprocess_pipeline_print.py "%s" %s %s "%s" '
% (trainset_dir4, sr_dict[sr2], np7, model_log_dir)
+ str(config.noparallel)
@@ -756,7 +770,7 @@ def train1key(
ps = []
for idx, n_g in enumerate(gpus_rmvpe):
cmd = (
config.python_cmd
get_quoted_python_cmd()
+ ' extract_f0_rmvpe.py %s %s %s "%s" %s '
% (
leng,
@@ -792,13 +806,17 @@ def train1key(
leng = len(gpus)
ps = []
for idx, n_g in enumerate(gpus):
cmd = config.python_cmd + ' extract_feature_print.py %s %s %s %s "%s" %s' % (
config.device,
leng,
idx,
n_g,
model_log_dir,
version19,
cmd = (
get_quoted_python_cmd()
+ ' extract_feature_print.py %s %s %s %s "%s" %s'
% (
config.device,
leng,
idx,
n_g,
model_log_dir,
version19,
)
)
yield get_info_str(cmd)
p = Popen(
@@ -871,24 +889,20 @@ def train1key(
f.write("\n".join(opt))
yield get_info_str("write filelist done")
if gpus16:
cmd = (
config.python_cmd
+ ' train_nsf_sim_cache_sid_load_pretrain.py -e "%s" -sr %s -f0 %s -bs %s -g %s -te %s -se %s %s %s -l %s -c %s -sw %s -v %s'
% (
exp_dir1,
sr2,
1 if if_f0_3 else 0,
batch_size12,
gpus16,
total_epoch11,
save_epoch10,
"-pg %s" % pretrained_G14 if pretrained_G14 != "" else "",
"-pd %s" % pretrained_D15 if pretrained_D15 != "" else "",
1 if if_save_latest13 == i18n("") else 0,
1 if if_cache_gpu17 == i18n("") else 0,
1 if if_save_every_weights18 == i18n("") else 0,
version19,
)
cmd = get_quoted_python_cmd() + ' train_nsf_sim_cache_sid_load_pretrain.py -e "%s" -sr %s -f0 %s -bs %s -g %s -te %s -se %s %s %s -l %s -c %s -sw %s -v %s' % (
exp_dir1,
sr2,
1 if if_f0_3 else 0,
batch_size12,
gpus16,
total_epoch11,
save_epoch10,
"-pg %s" % pretrained_G14 if pretrained_G14 != "" else "",
"-pd %s" % pretrained_D15 if pretrained_D15 != "" else "",
1 if if_save_latest13 == i18n("") else 0,
1 if if_cache_gpu17 == i18n("") else 0,
1 if if_save_every_weights18 == i18n("") else 0,
version19,
)
else:
cmd = (