From 28c908489d10245bf911bdce7c5fa19822961648 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 22 Apr 2024 18:16:48 +0000 Subject: [PATCH] chore(format): run black on dev --- infer/lib/infer_pack/models_onnx.py | 18 ++++++++-------- infer/lib/rvcmd.py | 32 +++++++++++++++++++++-------- infer/modules/onnx/export.py | 2 +- tools/onnx/export_onnx.py | 2 +- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/infer/lib/infer_pack/models_onnx.py b/infer/lib/infer_pack/models_onnx.py index ef93cf5..b06bb9a 100644 --- a/infer/lib/infer_pack/models_onnx.py +++ b/infer/lib/infer_pack/models_onnx.py @@ -637,15 +637,15 @@ class SynthesizerTrnMsNSFsidM(nn.Module): # self.hop_length = hop_length# self.spk_embed_dim = spk_embed_dim self.enc_p = TextEncoder( - encoder_dim, - inter_channels, - hidden_channels, - filter_channels, - n_heads, - n_layers, - kernel_size, - float(p_dropout), - ) + encoder_dim, + inter_channels, + hidden_channels, + filter_channels, + n_heads, + n_layers, + kernel_size, + float(p_dropout), + ) self.dec = GeneratorNSF( inter_channels, resblock, diff --git a/infer/lib/rvcmd.py b/infer/lib/rvcmd.py index 56e9277..d1e357b 100644 --- a/infer/lib/rvcmd.py +++ b/infer/lib/rvcmd.py @@ -16,7 +16,9 @@ def sha256(f) -> str: return sha256_hash.hexdigest() -def check_model(dir_name: Path, model_name: str, hash: str, remove_incorrect=False) -> bool: +def check_model( + dir_name: Path, model_name: str, hash: str, remove_incorrect=False +) -> bool: target = dir_name / model_name relname = target.as_posix() relname = relname[relname.rindex("assets/") :] @@ -30,7 +32,8 @@ def check_model(dir_name: Path, model_name: str, hash: str, remove_incorrect=Fal logger.info(f"{target} sha256 hash mismatch.") logger.info(f"expected: {hash}") logger.info(f"real val: {digest}") - if remove_incorrect: os.remove(str(target)) + if remove_incorrect: + os.remove(str(target)) return False return True @@ -48,11 +51,17 @@ def check_all_assets(update=False) -> bool: ): return False if not check_model( - BASE_DIR / "assets" / "rmvpe", "rmvpe.pt", os.environ["sha256_rmvpe_pt"], update, + BASE_DIR / "assets" / "rmvpe", + "rmvpe.pt", + os.environ["sha256_rmvpe_pt"], + update, ): return False if not check_model( - BASE_DIR / "assets" / "rmvpe", "rmvpe.onnx", os.environ["sha256_rmvpe_onnx"], update, + BASE_DIR / "assets" / "rmvpe", + "rmvpe.onnx", + os.environ["sha256_rmvpe_onnx"], + update, ): return False @@ -74,14 +83,18 @@ def check_all_assets(update=False) -> bool: ] for model in model_names: menv = model.replace(".", "_") - if not check_model(rvc_models_dir, model, os.environ[f"sha256_v1_{menv}"], update): + if not check_model( + rvc_models_dir, model, os.environ[f"sha256_v1_{menv}"], update + ): return False rvc_models_dir = BASE_DIR / "assets" / "pretrained_v2" logger.info("checking pretrained models v2...") for model in model_names: menv = model.replace(".", "_") - if not check_model(rvc_models_dir, model, os.environ[f"sha256_v2_{menv}"], update): + if not check_model( + rvc_models_dir, model, os.environ[f"sha256_v2_{menv}"], update + ): return False logger.info("checking uvr5_weights...") @@ -98,12 +111,15 @@ def check_all_assets(update=False) -> bool: ] for model in model_names: menv = model.replace(".", "_") - if not check_model(rvc_models_dir, model, os.environ[f"sha256_uvr5_{menv}"], update): + if not check_model( + rvc_models_dir, model, os.environ[f"sha256_uvr5_{menv}"], update + ): return False if not check_model( BASE_DIR / "assets" / "uvr5_weights" / "onnx_dereverb_By_FoxJoy", "vocals.onnx", - os.environ[f"sha256_uvr5_vocals_onnx"], update, + os.environ[f"sha256_uvr5_vocals_onnx"], + update, ): return False diff --git a/infer/modules/onnx/export.py b/infer/modules/onnx/export.py index 83bdd63..b5ef2f5 100644 --- a/infer/modules/onnx/export.py +++ b/infer/modules/onnx/export.py @@ -25,7 +25,7 @@ def export_onnx(ModelPath, ExportedPath): output_names = [ "audio", ] - #net_g.construct_spkmixmap() #多角色混合轨道导出 + # net_g.construct_spkmixmap() #多角色混合轨道导出 torch.onnx.export( net_g, ( diff --git a/tools/onnx/export_onnx.py b/tools/onnx/export_onnx.py index d374f92..7776e3c 100644 --- a/tools/onnx/export_onnx.py +++ b/tools/onnx/export_onnx.py @@ -1,3 +1,3 @@ from infer.modules.onnx.export import export_onnx -export_onnx("pt/Justin Bieber.pth" ,"pt/TestRvc_Rvc.onnx") \ No newline at end of file +export_onnx("pt/Justin Bieber.pth", "pt/TestRvc_Rvc.onnx")