diff --git a/configs/config.py b/configs/config.py index 681a7a7..8410c58 100644 --- a/configs/config.py +++ b/configs/config.py @@ -158,7 +158,8 @@ class Config: / 1024 + 0.4 ) - if self.gpu_mem <= 4: self.preprocess_per = 3.0 + if self.gpu_mem <= 4: + self.preprocess_per = 3.0 elif self.has_mps(): logger.info("No supported Nvidia GPU found") self.device = self.instead = "mps" @@ -241,5 +242,8 @@ class Config: ) except: pass - logger.info("Half-precision floating-point: %s, device: %s" % (self.is_half, self.device)) + logger.info( + "Half-precision floating-point: %s, device: %s" + % (self.is_half, self.device) + ) return x_pad, x_query, x_center, x_max diff --git a/infer-web.py b/infer-web.py index daaf631..60cd771 100644 --- a/infer-web.py +++ b/infer-web.py @@ -217,7 +217,7 @@ def preprocess_dataset(trainset_dir, exp_dir, sr, n_p): config.noparallel, config.preprocess_per, ) - logger.info("Execute: "+cmd) + logger.info("Execute: " + cmd) # , stdin=PIPE, stdout=PIPE,stderr=PIPE,cwd=now_dir p = Popen(cmd, shell=True) # 煞笔gr, popen read都非得全跑完了再一次性读取, 不用gr就正常读一句输出一句;只能额外弄出一个文本流定时读 @@ -259,7 +259,7 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp f0method, ) ) - logger.info("Execute: "+cmd) + logger.info("Execute: " + cmd) p = Popen( cmd, shell=True, cwd=now_dir ) # , stdin=PIPE, stdout=PIPE,stderr=PIPE @@ -290,7 +290,7 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp config.is_half, ) ) - logger.info("Execute: "+cmd) + logger.info("Execute: " + cmd) p = Popen( cmd, shell=True, cwd=now_dir ) # , shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, cwd=now_dir @@ -313,7 +313,7 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp exp_dir, ) ) - logger.info("Execute: "+cmd) + logger.info("Execute: " + cmd) p = Popen( cmd, shell=True, cwd=now_dir ) # , shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, cwd=now_dir @@ -356,7 +356,7 @@ def extract_f0_feature(gpus, n_p, f0method, if_f0, exp_dir, version19, gpus_rmvp config.is_half, ) ) - logger.info("Execute: "+cmd) + logger.info("Execute: " + cmd) p = Popen( cmd, shell=True, cwd=now_dir ) # , shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, cwd=now_dir @@ -589,7 +589,7 @@ def click_train( version19, ) ) - logger.info("Execute: "+cmd) + logger.info("Execute: " + cmd) p = Popen(cmd, shell=True, cwd=now_dir) p.wait() return "训练结束, 您可查看控制台训练日志或实验文件夹下的train.log" diff --git a/infer/modules/train/preprocess.py b/infer/modules/train/preprocess.py index 7c41817..138bb4c 100644 --- a/infer/modules/train/preprocess.py +++ b/infer/modules/train/preprocess.py @@ -31,6 +31,7 @@ def println(strr): f.write("%s\n" % strr) f.flush() + class PreProcess: def __init__(self, sr, exp_dir, per=3.7): self.slicer = Slicer(