optimize(rvc.f0): rename inner defs

Author: fumiama

infer/modules/vc/pipeline.py

@@ -10,7 +10,6 @@
 import faiss
 import librosa
 import numpy as np
-import pyworld
 import torch
 import torch.nn.functional as F
 import torchcrepe

rvc/f0/dio.py

@@ -28,4 +28,4 @@ def compute_f0(
         f0 = pyworld.stonemask(wav.astype(np.double), f0, t, self.sampling_rate)
         for index, pitch in enumerate(f0):
             f0[index] = round(pitch, 1)
-        return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
+        return self._interpolate_f0(self._resize_f0(f0, p_len))[0]

rvc/f0/f0.py

@@ -17,7 +17,7 @@ def compute_f0(
         filter_radius: Optional[Union[int, float]] = None,
     ): ...
 
-    def interpolate_f0(self, f0: np.ndarray[Any, np.dtype]):
+    def _interpolate_f0(self, f0: np.ndarray[Any, np.dtype]):
         """
         对F0进行插值处理
         """
@@ -55,7 +55,7 @@ def interpolate_f0(self, f0: np.ndarray[Any, np.dtype]):
 
         return ip_data[:, 0], vuv_vector[:, 0]
 
-    def resize_f0(self, x: np.ndarray[Any, np.dtype], target_len: int):
+    def _resize_f0(self, x: np.ndarray[Any, np.dtype], target_len: int):
         source = np.array(x)
         source[source < 0.001] = np.nan
         target = np.interp(

rvc/f0/harvest.py

@@ -29,4 +29,4 @@ def compute_f0(
         f0 = pyworld.stonemask(wav.astype(np.double), f0, t, self.sampling_rate)
         if filter_radius is not None and filter_radius > 2:
             f0 = signal.medfilt(f0, 3)
-        return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
+        return self._interpolate_f0(self._resize_f0(f0, p_len))[0]

rvc/f0/pm.py

@@ -36,4 +36,4 @@ def compute_f0(
         pad_size = (p_len - len(f0) + 1) // 2
         if pad_size > 0 or p_len - len(f0) - pad_size > 0:
             f0 = np.pad(f0, [[pad_size, p_len - len(f0) - pad_size]], mode="constant")
-        return self.interpolate_f0(f0)[0]
+        return self._interpolate_f0(f0)[0]

rvc/f0/rmvpe.py

@@ -122,7 +122,7 @@ def compute_f0(
 
         f0 = self._decode(hidden, thred=filter_radius)
 
-        return self.interpolate_f0(self.resize_f0(f0, p_len))[0]
+        return self._interpolate_f0(self._resize_f0(f0, p_len))[0]
 
     def _to_local_average_cents(self, salience, threshold=0.05):
         center = np.argmax(salience, axis=1)  # 帧长#index