From 64ac09bf660ed5bde4fac3e819eb988b27e79ec2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 00:21:33 +0800 Subject: [PATCH] Format code (#1076) Co-authored-by: github-actions[bot] --- config.py | 7 ++-- infer-web.py | 100 ++++++++++++++++++++++++++------------------------- 2 files changed, 55 insertions(+), 52 deletions(-) diff --git a/config.py b/config.py index 510103b..737f12b 100644 --- a/config.py +++ b/config.py @@ -92,7 +92,8 @@ class Config: self.gpu_name = torch.cuda.get_device_name(i_device) if ( ("16" in self.gpu_name and "V100" not in self.gpu_name.upper()) - or "P40" in self.gpu_name.upper()or "P10" in self.gpu_name.upper() + or "P40" in self.gpu_name.upper() + or "P10" in self.gpu_name.upper() or "1060" in self.gpu_name or "1070" in self.gpu_name or "1080" in self.gpu_name @@ -168,9 +169,9 @@ class Config: ) except: pass - if(self.device!="cpu"): + if self.device != "cpu": import torch_directml - + self.device = torch_directml.device(torch_directml.default_device()) self.is_half = False else: diff --git a/infer-web.py b/infer-web.py index 9f5f0b4..fec788f 100644 --- a/infer-web.py +++ b/infer-web.py @@ -570,10 +570,12 @@ def if_done_multi(done, ps): if flag == 1: break 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) @@ -616,11 +618,15 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp f.close() if if_f0: if f0method != "rmvpe_gpu": - cmd = get_quoted_python_cmd() + ' extract_f0_print.py "%s/logs/%s" %s %s' % ( - now_dir, - exp_dir, - n_p, - f0method, + cmd = ( + get_quoted_python_cmd() + + ' extract_f0_print.py "%s/logs/%s" %s %s' + % ( + now_dir, + exp_dir, + n_p, + f0method, + ) ) print(cmd) p = Popen( @@ -930,24 +936,20 @@ def click_train( if pretrained_D15 == "": print("no pretrained Discriminator") if gpus16: - 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, - ) + 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 = ( @@ -1163,13 +1165,17 @@ def train1key( leng = len(gpus) ps = [] for idx, n_g in enumerate(gpus): - 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, + 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( @@ -1242,24 +1248,20 @@ def train1key( f.write("\n".join(opt)) yield get_info_str("write filelist done") if gpus16: - 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, - ) + 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 = (