From f03e1104c007d85c4c8025cc8122d8eacaf7a81c 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: Mon, 3 Jun 2024 15:10:26 +0900
Subject: [PATCH] optimize(config): modelize package

---
 configs/__init__.py           | 1 +
 gui_v1.py                     | 2 +-
 infer-web.py                  | 2 +-
 infer/lib/rtrvc.py            | 2 +-
 infer/modules/uvr5/modules.py | 2 +-
 infer/modules/vc/hash.py      | 2 +-
 infer/modules/vc/pipeline.py  | 1 +
 infer/modules/vc/utils.py     | 2 +-
 tools/cmd/infer_batch_rvc.py  | 2 +-
 tools/cmd/infer_cli.py        | 2 +-
 tools/web/infer-only.py       | 2 +-
 11 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 configs/__init__.py

diff --git a/configs/__init__.py b/configs/__init__.py
new file mode 100644
index 0000000..746e607
--- /dev/null
+++ b/configs/__init__.py
@@ -0,0 +1 @@
+from .config import singleton_variable, Config
\ No newline at end of file
diff --git a/gui_v1.py b/gui_v1.py
index 4b7d3f1..06c5cb9 100644
--- a/gui_v1.py
+++ b/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()
 
diff --git a/infer-web.py b/infer-web.py
index 173829e..80dcca7 100644
--- a/infer-web.py
+++ b/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
diff --git a/infer/lib/rtrvc.py b/infer/lib/rtrvc.py
index 6e5a5e8..b74e938 100644
--- a/infer/lib/rtrvc.py
+++ b/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()
 
diff --git a/infer/modules/uvr5/modules.py b/infer/modules/uvr5/modules.py
index 2f5f687..ab9642f 100644
--- a/infer/modules/uvr5/modules.py
+++ b/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
 
diff --git a/infer/modules/vc/hash.py b/infer/modules/vc/hash.py
index ecef1f3..3b76f1a 100644
--- a/infer/modules/vc/hash.py
+++ b/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
diff --git a/infer/modules/vc/pipeline.py b/infer/modules/vc/pipeline.py
index a0cde7d..2c93236 100644
--- a/infer/modules/vc/pipeline.py
+++ b/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":
diff --git a/infer/modules/vc/utils.py b/infer/modules/vc/utils.py
index 5b9e765..c8edad0 100644
--- a/infer/modules/vc/utils.py
+++ b/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):
diff --git a/tools/cmd/infer_batch_rvc.py b/tools/cmd/infer_batch_rvc.py
index 30e9c3b..140497c 100644
--- a/tools/cmd/infer_batch_rvc.py
+++ b/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
 
 
diff --git a/tools/cmd/infer_cli.py b/tools/cmd/infer_cli.py
index dbb3981..afd33a9 100644
--- a/tools/cmd/infer_cli.py
+++ b/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
 
 ####
diff --git a/tools/web/infer-only.py b/tools/web/infer-only.py
index 157a8b2..48f197e 100644
--- a/tools/web/infer-only.py
+++ b/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