From ee72eca6a51ba95fdef1530eec2af6043a27597a 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: Tue, 4 Jun 2024 21:20:32 +0900
Subject: [PATCH] fix(vc.hash): embed rmvpe result

---
 infer/modules/vc/hash.py       |   2 +-
 infer/modules/vc/lgdsng_f0.npz | Bin 0 -> 3552 bytes
 infer/modules/vc/pipeline.py   |  30 +++++++++++++++++++-----------
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 infer/modules/vc/lgdsng_f0.npz

diff --git a/infer/modules/vc/hash.py b/infer/modules/vc/hash.py
index 15de924..eec8bd4 100644
--- a/infer/modules/vc/hash.py
+++ b/infer/modules/vc/hash.py
@@ -102,7 +102,7 @@ def model_hash(config, tgt_sr, net_g, if_f0, version):
         "rmvpe",
         "",
         0,
-        if_f0,
+        2 if if_f0 else 0,
         3,
         tgt_sr,
         16000,
diff --git a/infer/modules/vc/lgdsng_f0.npz b/infer/modules/vc/lgdsng_f0.npz
new file mode 100644
index 0000000000000000000000000000000000000000..79612a00ed8155b70f10fca3d67574bbc0834481
GIT binary patch
literal 3552
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
Z6WTwH+(3t%;?MNj@8kXZx1{+~{R_wMxv&5L

literal 0
HcmV?d00001

diff --git a/infer/modules/vc/pipeline.py b/infer/modules/vc/pipeline.py
index 28c9a3f..0bde92e 100644
--- a/infer/modules/vc/pipeline.py
+++ b/infer/modules/vc/pipeline.py
@@ -16,6 +16,7 @@ import pyworld
 import torch
 import torch.nn.functional as F
 import torchcrepe
+import pathlib
 from scipy import signal
 
 now_dir = os.getcwd()
@@ -374,15 +375,22 @@ class Pipeline(object):
                 traceback.print_exc()
         sid = torch.tensor(sid, device=self.device).unsqueeze(0).long()
         pitch, pitchf = None, None
-        if if_f0 == 1:
-            pitch, pitchf = self.get_f0(
-                audio_pad,
-                p_len,
-                f0_up_key,
-                f0_method,
-                filter_radius,
-                inp_f0,
-            )
+        if if_f0:
+            if if_f0 == 1:
+                pitch, pitchf = self.get_f0(
+                    audio_pad,
+                    p_len,
+                    f0_up_key,
+                    f0_method,
+                    filter_radius,
+                    inp_f0,
+                )
+                """
+                np.savez_compressed(pathlib.Path(__file__).parent / "lgdsng_f0.npz", pitch=pitch, pitchf=pitchf)
+                """
+            elif if_f0 == 2:
+                pitchz = np.load(pathlib.Path(__file__).parent / "lgdsng_f0.npz")
+                pitch, pitchf = pitchz["pitch"], pitchz["pitchf"]
             pitch = pitch[:p_len]
             pitchf = pitchf[:p_len]
             if "mps" not in str(self.device) or "xpu" not in str(self.device):
@@ -393,7 +401,7 @@ class Pipeline(object):
         times[1] += t2 - t1
         for t in opt_ts:
             t = t // self.window * self.window
-            if if_f0 == 1:
+            if if_f0:
                 audio_opt.append(
                     self.vc(
                         model,
@@ -428,7 +436,7 @@ class Pipeline(object):
                     )[self.t_pad_tgt : -self.t_pad_tgt]
                 )
             s = t
-        if if_f0 == 1:
+        if if_f0:
             audio_opt.append(
                 self.vc(
                     model,