optimize rmvpe inference

sandyzikun · Jul 21, 2023 · 599add9 · 599add9
1 parent 30810bb
commit 599add9
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 5 deletions.
diff --git a/configs/config.yaml b/configs/config.yaml
@@ -1,5 +1,5 @@
 data:
-  f0_extractor: 'crepe' # 'parselmouth', 'dio', 'harvest', or 'crepe'
+  f0_extractor: 'crepe' # 'parselmouth', 'dio', 'harvest', 'crepe', or 'rmvpe'
   f0_min: 65 # about C2
   f0_max: 800 # about G5
   sampling_rate: 44100

diff --git a/configs/config_naive.yaml b/configs/config_naive.yaml
@@ -1,5 +1,5 @@
 data:
-  f0_extractor: 'crepe' # 'parselmouth', 'dio', 'harvest', or 'crepe'
+  f0_extractor: 'crepe' # 'parselmouth', 'dio', 'harvest', 'crepe', or 'rmvpe'
   f0_min: 65 # about C2
   f0_max: 800 # about G5
   sampling_rate: 44100

diff --git a/configs/config_shallow.yaml b/configs/config_shallow.yaml
@@ -1,5 +1,5 @@
 data:
-  f0_extractor: 'crepe' # 'parselmouth', 'dio', 'harvest', or 'crepe'
+  f0_extractor: 'crepe' # 'parselmouth', 'dio', 'harvest', 'crepe', or 'rmvpe'
   f0_min: 65 # about C2
   f0_max: 800 # about G5
   sampling_rate: 44100

diff --git a/rmvpe/__init__.py → encoder/rmvpe/__init__.py b/rmvpe/__init__.py → encoder/rmvpe/__init__.py
diff --git a/rmvpe/constants.py → encoder/rmvpe/constants.py b/rmvpe/constants.py → encoder/rmvpe/constants.py
diff --git a/rmvpe/deepunet.py → encoder/rmvpe/deepunet.py b/rmvpe/deepunet.py → encoder/rmvpe/deepunet.py
diff --git a/rmvpe/inference.py → encoder/rmvpe/inference.py b/rmvpe/inference.py → encoder/rmvpe/inference.py
diff --git a/rmvpe/model.py → encoder/rmvpe/model.py b/rmvpe/model.py → encoder/rmvpe/model.py
diff --git a/rmvpe/seq.py → encoder/rmvpe/seq.py b/rmvpe/seq.py → encoder/rmvpe/seq.py
diff --git a/rmvpe/spec.py → encoder/rmvpe/spec.py b/rmvpe/spec.py → encoder/rmvpe/spec.py
diff --git a/rmvpe/utils.py → encoder/rmvpe/utils.py b/rmvpe/utils.py → encoder/rmvpe/utils.py
diff --git a/main.py b/main.py
@@ -77,7 +77,7 @@ def parse_args(args=None, namespace=None):
         type=str,
         required=False,
         default='crepe',
-        help="pitch extrator type: parselmouth, dio, harvest, crepe (default)",
+        help="pitch extrator type: parselmouth, dio, harvest, crepe (default) or rmvpe",
     )
     parser.add_argument(
         "-fmin",

diff --git a/tools/tools.py b/tools/tools.py
@@ -298,7 +298,7 @@ def extract(self, audio, uv_interp=False, device=None, silence_front=0, sr=None)
             # f0 = np.pad(f0.astype('float'), (start_frame, n_frames - len(f0) - start_frame))
         elif self.f0_extractor == "rmvpe":
             if self.rmvpe is None:
-                from rmvpe import RMVPE
+                from encoder.rmvpe import RMVPE
                 self.rmvpe = RMVPE('pretrain/rmvpe/model.pt', hop_length=160)
             f0 = self.rmvpe.infer_from_audio(audio, self.sample_rate, device=device, thred=0.05, use_viterbi=False)
             f0 = np.array(