From e67cf66fe0f08b6abd731ba2ae6318e979d9d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sun, 27 Aug 2023 00:43:06 +0800 Subject: [PATCH] optimize: move vc_infer_pipeline to lib.train --- app.py | 2 +- infer-web.py | 2 +- infer_batch_rvc.py | 2 +- infer_cli.py | 2 +- vc_infer_pipeline.py => lib/train/vc_infer_pipeline.py | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename vc_infer_pipeline.py => lib/train/vc_infer_pipeline.py (100%) diff --git a/app.py b/app.py index e02cb18..69bb617 100644 --- a/app.py +++ b/app.py @@ -7,7 +7,7 @@ import librosa import numpy as np import logging from fairseq import checkpoint_utils -from vc_infer_pipeline import VC +from lib.train.vc_infer_pipeline import VC import traceback from config import defaultconfig as config from lib.infer_pack.models import ( diff --git a/infer-web.py b/infer-web.py index 48ba05d..d8971aa 100644 --- a/infer-web.py +++ b/infer-web.py @@ -35,7 +35,7 @@ from lib.infer_pack.models_onnx import SynthesizerTrnMsNSFsidM from infer_uvr5 import _audio_pre_, _audio_pre_new from lib.audio import load_audio from lib.train.process_ckpt import change_info, extract_small_model, merge, show_info -from vc_infer_pipeline import VC +from lib.train.vc_infer_pipeline import VC from sklearn.cluster import MiniBatchKMeans logging.getLogger("numba").setLevel(logging.WARNING) diff --git a/infer_batch_rvc.py b/infer_batch_rvc.py index 1f2b295..3fc9a05 100644 --- a/infer_batch_rvc.py +++ b/infer_batch_rvc.py @@ -109,7 +109,7 @@ print(sys.argv) config = Config(device, is_half) now_dir = os.getcwd() sys.path.append(now_dir) -from vc_infer_pipeline import VC +from lib.train.vc_infer_pipeline import VC from lib.infer_pack.models import ( SynthesizerTrnMs256NSFsid, SynthesizerTrnMs256NSFsid_nono, diff --git a/infer_cli.py b/infer_cli.py index 63170ae..59f246b 100644 --- a/infer_cli.py +++ b/infer_cli.py @@ -7,7 +7,7 @@ from lib.infer_pack.models import ( SynthesizerTrnMs768NSFsid, SynthesizerTrnMs768NSFsid_nono, ) -from vc_infer_pipeline import VC +from lib.train.vc_infer_pipeline import VC from multiprocessing import cpu_count import numpy as np import torch diff --git a/vc_infer_pipeline.py b/lib/train/vc_infer_pipeline.py similarity index 100% rename from vc_infer_pipeline.py rename to lib/train/vc_infer_pipeline.py