optimize(config): modelize package

configs/__init__.py

@@ -0,0 +1 @@
+from .config import singleton_variable, Config

gui_v1.py

@@ -90,7 +90,7 @@ if __name__ == "__main__":
 
     import infer.lib.rtrvc as rtrvc
     from i18n.i18n import I18nAuto
-    from configs.config import Config
+    from configs import Config
 
     i18n = I18nAuto()
 

infer-web.py

@@ -18,7 +18,7 @@ from infer.lib.train.process_ckpt import (
     merge,
 )
 from i18n.i18n import I18nAuto
-from configs.config import Config
+from configs import Config
 from sklearn.cluster import MiniBatchKMeans
 import torch, platform
 import numpy as np

infer/lib/rtrvc.py

@@ -21,7 +21,7 @@ now_dir = os.getcwd()
 sys.path.append(now_dir)
 from multiprocessing import Manager as M
 
-from configs.config import Config
+from configs import Config
 
 # config = Config()
 

infer/modules/uvr5/modules.py

@@ -7,7 +7,7 @@ logger = logging.getLogger(__name__)
 import ffmpeg
 import torch
 
-from configs.config import Config
+from configs import Config
 from infer.modules.uvr5.mdxnet import MDXNetDereverb
 from infer.modules.uvr5.vr import AudioPre, AudioPreDeEcho
 

infer/modules/vc/hash.py

@@ -11,7 +11,7 @@ if __name__ == "__main__":
     now_dir = os.getcwd()
     sys.path.append(now_dir)
 
-from configs.config import Config, singleton_variable
+from configs import Config, singleton_variable
 
 from .pipeline import Pipeline
 from .utils import load_hubert

infer/modules/vc/pipeline.py

@@ -118,6 +118,7 @@ class Pipeline(object):
             f0_cache_key = md5(x.tobytes()).digest()
             input_audio_path2wav[f0_cache_key] = x.astype(np.double)
             f0 = cache_harvest_f0(f0_cache_key, self.sr, f0_max, f0_min, 10)
+            del input_audio_path2wav[f0_cache_key]
             if filter_radius > 2:
                 f0 = signal.medfilt(f0, 3)
         elif f0_method == "crepe":

infer/modules/vc/utils.py

@@ -2,7 +2,7 @@ import os
 
 from fairseq import checkpoint_utils
 
-from configs.config import singleton_variable
+from configs import singleton_variable
 
 
 def get_index_path_from_model(sid):

tools/cmd/infer_batch_rvc.py

@@ -12,7 +12,7 @@ import tqdm as tq
 from dotenv import load_dotenv
 from scipy.io import wavfile
 
-from configs.config import Config
+from configs import Config
 from infer.modules.vc import VC
 
 

tools/cmd/infer_cli.py

@@ -7,7 +7,7 @@ sys.path.append(now_dir)
 from dotenv import load_dotenv
 from scipy.io import wavfile
 
-from configs.config import Config
+from configs import Config
 from infer.modules.vc import VC
 
 ####

tools/web/infer-only.py

@@ -5,7 +5,7 @@ import os
 import gradio as gr
 from dotenv import load_dotenv
 
-from configs.config import Config
+from configs import Config
 from i18n.i18n import I18nAuto
 from infer.modules.vc import VC