From 52c97ed4643547c7f10a9f6f3e7342611a147f0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:35:35 +0000 Subject: [PATCH] Format code (#455) Co-authored-by: github-actions[bot] --- MDXNet.py | 15 +++--- gui.py | 8 ++- infer-web.py | 6 +-- infer_uvr5.py | 64 +++++++++++++----------- train/process_ckpt.py | 8 +-- train_nsf_sim_cache_sid_load_pretrain.py | 9 +++- 6 files changed, 63 insertions(+), 47 deletions(-) diff --git a/MDXNet.py b/MDXNet.py index d244f8a..6e996ac 100644 --- a/MDXNet.py +++ b/MDXNet.py @@ -206,25 +206,28 @@ class Predictor: mix = mix.T sources = self.demix(mix.T) opt = sources[0].T - if(format in ["wav", "flac"]): - sf.write("%s/%s_main_vocal.%s" % (vocal_root, basename, format), mix - opt, rate) + if format in ["wav", "flac"]: + sf.write( + "%s/%s_main_vocal.%s" % (vocal_root, basename, format), mix - opt, rate + ) sf.write("%s/%s_others.%s" % (others_root, basename, format), opt, rate) else: - path_vocal="%s/%s_main_vocal.wav" % (vocal_root, basename) - path_other="%s/%s_others.wav" % (others_root, basename) + path_vocal = "%s/%s_main_vocal.wav" % (vocal_root, basename) + path_other = "%s/%s_others.wav" % (others_root, basename) sf.write(path_vocal, mix - opt, rate) sf.write(path_other, opt, rate) - if (os.path.exists(path_vocal)): + if os.path.exists(path_vocal): os.system( "ffmpeg -i %s -vn %s -q:a 2 -y" % (path_vocal, path_vocal[:-4] + ".%s" % format) ) - if (os.path.exists(path_other)): + if os.path.exists(path_other): os.system( "ffmpeg -i %s -vn %s -q:a 2 -y" % (path_other, path_other[:-4] + ".%s" % format) ) + class MDXNetDereverb: def __init__(self, chunks): self.onnx = "uvr5_weights/onnx_dereverb_By_FoxJoy" diff --git a/gui.py b/gui.py index e7432c8..a181238 100644 --- a/gui.py +++ b/gui.py @@ -584,10 +584,14 @@ class GUI: if d["max_output_channels"] > 0 ] input_devices_indices = [ - d["index"] if "index" in d else d["name"] for d in devices if d["max_input_channels"] > 0 + d["index"] if "index" in d else d["name"] + for d in devices + if d["max_input_channels"] > 0 ] output_devices_indices = [ - d["index"] if "index" in d else d["name"] for d in devices if d["max_output_channels"] > 0 + d["index"] if "index" in d else d["name"] + for d in devices + if d["max_output_channels"] > 0 ] return ( input_devices, diff --git a/infer-web.py b/infer-web.py index 1d2f713..d85520f 100644 --- a/infer-web.py +++ b/infer-web.py @@ -272,20 +272,20 @@ def vc_multi( if "Success" in info: try: tgt_sr, audio_opt = opt - if (format1 in ["wav", "flac"]): + if format1 in ["wav", "flac"]: sf.write( "%s/%s.%s" % (opt_root, os.path.basename(path), format1), audio_opt, tgt_sr, ) else: - path="%s/%s.wav" % (opt_root, os.path.basename(path)) + path = "%s/%s.wav" % (opt_root, os.path.basename(path)) sf.write( path, audio_opt, tgt_sr, ) - if (os.path.exists(path)): + if os.path.exists(path): os.system( "ffmpeg -i %s -vn %s -q:a 2 -y" % (path, path[:-4] + ".%s" % format1) diff --git a/infer_uvr5.py b/infer_uvr5.py index bcbf78c..884c841 100644 --- a/infer_uvr5.py +++ b/infer_uvr5.py @@ -123,7 +123,7 @@ class _audio_pre_: else: wav_instrument = spec_utils.cmb_spectrogram_to_wave(y_spec_m, self.mp) print("%s instruments done" % name) - if(format in ["wav","flac"]): + if format in ["wav", "flac"]: sf.write( os.path.join( ins_root, @@ -133,18 +133,18 @@ class _audio_pre_: self.mp.param["sr"], ) # else: - path=os.path.join( - ins_root, "instrument_{}_{}.wav".format(name, self.data["agg"]) - ) + path = os.path.join( + ins_root, "instrument_{}_{}.wav".format(name, self.data["agg"]) + ) sf.write( - path , + path, (np.array(wav_instrument) * 32768).astype("int16"), self.mp.param["sr"], ) - if(os.path.exists(path)): + if os.path.exists(path): os.system( "ffmpeg -i %s -vn %s -q:a 2 -y" - % (path, path[:-4]+".%s"%format) + % (path, path[:-4] + ".%s" % format) ) if vocal_root is not None: if self.data["high_end_process"].startswith("mirroring"): @@ -157,29 +157,31 @@ class _audio_pre_: else: wav_vocals = spec_utils.cmb_spectrogram_to_wave(v_spec_m, self.mp) print("%s vocals done" % name) - if(format in ["wav","flac"]): + if format in ["wav", "flac"]: sf.write( os.path.join( - vocal_root, "vocal_{}_{}.{}".format(name, self.data["agg"], format) + vocal_root, + "vocal_{}_{}.{}".format(name, self.data["agg"], format), ), (np.array(wav_vocals) * 32768).astype("int16"), self.mp.param["sr"], ) else: - path=os.path.join( - vocal_root, "vocal_{}_{}.wav".format(name, self.data["agg"]) - ) + path = os.path.join( + vocal_root, "vocal_{}_{}.wav".format(name, self.data["agg"]) + ) sf.write( - path , + path, (np.array(wav_vocals) * 32768).astype("int16"), self.mp.param["sr"], ) - if(os.path.exists(path)): + if os.path.exists(path): os.system( "ffmpeg -i %s -vn %s -q:a 2 -y" - % (path, path[:-4]+".%s"%format) + % (path, path[:-4] + ".%s" % format) ) + class _audio_pre_new: def __init__(self, agg, model_path, device, is_half): self.model_path = model_path @@ -288,7 +290,7 @@ class _audio_pre_new: else: wav_instrument = spec_utils.cmb_spectrogram_to_wave(y_spec_m, self.mp) print("%s instruments done" % name) - if(format in ["wav","flac"]): + if format in ["wav", "flac"]: sf.write( os.path.join( ins_root, @@ -298,18 +300,18 @@ class _audio_pre_new: self.mp.param["sr"], ) # else: - path=os.path.join( - ins_root, "instrument_{}_{}.wav".format(name, self.data["agg"]) - ) + path = os.path.join( + ins_root, "instrument_{}_{}.wav".format(name, self.data["agg"]) + ) sf.write( - path , + path, (np.array(wav_instrument) * 32768).astype("int16"), self.mp.param["sr"], ) - if(os.path.exists(path)): + if os.path.exists(path): os.system( "ffmpeg -i %s -vn %s -q:a 2 -y" - % (path, path[:-4]+".%s"%format) + % (path, path[:-4] + ".%s" % format) ) if vocal_root is not None: if self.data["high_end_process"].startswith("mirroring"): @@ -322,29 +324,31 @@ class _audio_pre_new: else: wav_vocals = spec_utils.cmb_spectrogram_to_wave(v_spec_m, self.mp) print("%s vocals done" % name) - if(format in ["wav","flac"]): + if format in ["wav", "flac"]: sf.write( os.path.join( - vocal_root, "vocal_{}_{}.{}".format(name, self.data["agg"], format) + vocal_root, + "vocal_{}_{}.{}".format(name, self.data["agg"], format), ), (np.array(wav_vocals) * 32768).astype("int16"), self.mp.param["sr"], ) else: - path=os.path.join( - vocal_root, "vocal_{}_{}.wav".format(name, self.data["agg"]) - ) + path = os.path.join( + vocal_root, "vocal_{}_{}.wav".format(name, self.data["agg"]) + ) sf.write( - path , + path, (np.array(wav_vocals) * 32768).astype("int16"), self.mp.param["sr"], ) - if(os.path.exists(path)): + if os.path.exists(path): os.system( "ffmpeg -i %s -vn %s -q:a 2 -y" - % (path, path[:-4]+".%s"%format) + % (path, path[:-4] + ".%s" % format) ) + if __name__ == "__main__": device = "cuda" is_half = True diff --git a/train/process_ckpt.py b/train/process_ckpt.py index 876be51..916165e 100644 --- a/train/process_ckpt.py +++ b/train/process_ckpt.py @@ -8,7 +8,7 @@ from i18n import I18nAuto i18n = I18nAuto() -def savee(ckpt, sr, if_f0, name, epoch, version,hps): +def savee(ckpt, sr, if_f0, name, epoch, version, hps): try: opt = OrderedDict() opt["weight"] = {} @@ -16,8 +16,8 @@ def savee(ckpt, sr, if_f0, name, epoch, version,hps): if "enc_q" in key: continue opt["weight"][key] = ckpt[key].half() - opt["config"]=[ - hpt.data.filter_length//2+1, + opt["config"] = [ + hpt.data.filter_length // 2 + 1, 32, hpt.model.inter_channels, hpt.model.hidden_channels, @@ -34,7 +34,7 @@ def savee(ckpt, sr, if_f0, name, epoch, version,hps): hpt.model.upsample_kernel_sizes, hpt.model.spk_embed_dim, hpt.model.gin_channels, - hpt.data.sampling_rate + hpt.data.sampling_rate, ] opt["info"] = "%sepoch" % epoch opt["sr"] = sr diff --git a/train_nsf_sim_cache_sid_load_pretrain.py b/train_nsf_sim_cache_sid_load_pretrain.py index fb9d430..21521c5 100644 --- a/train_nsf_sim_cache_sid_load_pretrain.py +++ b/train_nsf_sim_cache_sid_load_pretrain.py @@ -559,7 +559,8 @@ def train_and_evaluate( hps.if_f0, hps.name + "_e%s" % epoch, epoch, - hps.version,hps + hps.version, + hps, ), ) ) @@ -575,7 +576,11 @@ def train_and_evaluate( ckpt = net_g.state_dict() logger.info( "saving final ckpt:%s" - % (savee(ckpt, hps.sample_rate, hps.if_f0, hps.name, epoch, hps.version,hps)) + % ( + savee( + ckpt, hps.sample_rate, hps.if_f0, hps.name, epoch, hps.version, hps + ) + ) ) sleep(1) os._exit(2333333)