diff --git a/infer-web.py b/infer-web.py index b9fc2c6..0717d3d 100644 --- a/infer-web.py +++ b/infer-web.py @@ -1,9 +1,5 @@ import os import shutil -import sys - -now_dir = os.getcwd() -sys.path.append(now_dir) import traceback, pdb import warnings @@ -40,7 +36,7 @@ from sklearn.cluster import MiniBatchKMeans logging.getLogger("numba").setLevel(logging.WARNING) - +now_dir = os.getcwd() tmp = os.path.join(now_dir, "TEMP") shutil.rmtree(tmp, ignore_errors=True) shutil.rmtree( @@ -156,6 +152,7 @@ for name in os.listdir(weight_uvr5_root): if name.endswith(".pth") or "onnx" in name: uvr5_names.append(name.replace(".pth", "")) +cpt = None def vc_single( sid, @@ -172,7 +169,7 @@ def vc_single( rms_mix_rate, protect, ): # spk_item, input_audio0, vc_transform0,f0_file,f0method0 - global tgt_sr, net_g, vc, hubert_model, version + global tgt_sr, net_g, vc, hubert_model, version, cpt if input_audio_path is None: return "You need to upload an audio", None f0_up_key = int(f0_up_key) @@ -429,9 +426,7 @@ def get_vc(sid, to_return_protect0, to_return_protect1): else: net_g = SynthesizerTrnMs768NSFsid_nono(*cpt["config"]) del net_g, cpt - if torch.cuda.is_available(): - torch.cuda.empty_cache() - cpt = None + if torch.cuda.is_available(): torch.cuda.empty_cache() return {"visible": False, "__type__": "update"} person = "%s/%s" % (weight_root, sid) print("loading %s" % person) @@ -1253,6 +1248,7 @@ def change_info_(ckpt_path): def export_onnx(ModelPath, ExportedPath): + global cpt cpt = torch.load(ModelPath, map_location="cpu") cpt["config"][-3] = cpt["weight"]["emb_g.weight"].shape[0] vec_channels = 256 if cpt.get("version", "v1") == "v1" else 768