1berry/wokada-voice-changer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hubert

Browse Source
This commit is contained in:
wataru 2023-03-30 00:16:26 +09:00
parent 4bbcbd66bc
commit f0fbf58258
2 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/MMVCServerSIO.py
View File

@ -42,6 +42,7 @@ def setupArgParser():
parser.add_argument("--cluster", type=str, help="path to cluster model")
parser.add_argument("--hubert", type=str, help="path to hubert model")
parser.add_argument("--internal", type=strtobool, default=False, help="各種パスをmac appの中身に変換")
parser.add_argument("--useHubertOnnx", type=strtobool, default=False, help="use hubert onnx")
return parser
@ -86,6 +87,8 @@ MODEL = args.m if args.m != None else None
ONNX_MODEL = args.o if args.o != None else None
HUBERT_MODEL = args.hubert if args.hubert != None else None # hubertはユーザがダウンロードして解凍フォルダに格納する運用。
CLUSTER_MODEL = args.cluster if args.cluster != None else None
USE_HUBERT_ONNX = args.useHubertOnnx
if args.internal and hasattr(sys, "_MEIPASS"):
print("use internal path")
if CONFIG != None:
@ -122,7 +125,7 @@ if args.colab == True:
os.environ["colab"] = "True"
if __name__ == 'MMVCServerSIO':
voiceChangerManager = VoiceChangerManager.get_instance({"hubert": HUBERT_MODEL})
voiceChangerManager = VoiceChangerManager.get_instance({"hubert": HUBERT_MODEL, "useHubertOnnx": USE_HUBERT_ONNX})
if CONFIG and (MODEL or ONNX_MODEL):
if MODEL_TYPE == "MMVCv15" or MODEL_TYPE == "MMVCv13":
voiceChangerManager.loadModel(CONFIG, MODEL, ONNX_MODEL, None)

56
server/voice_changer/SoVitsSvc40/SoVitsSvc40.py
View File

@ -74,14 +74,20 @@ class SoVitsSvc40:
# hubert model
try:
# if sys.platform.startswith('darwin'):
# vec_path = os.path.join(sys._MEIPASS, "hubert/checkpoint_best_legacy_500.pt")
# else:
# vec_path = "hubert/checkpoint_best_legacy_500.pt"
vec_path = self.params["hubert"]
hubert_path = self.params["hubert"]
useHubertOnnx = self.params["useHubertOnnx"]
self.useHubertOnnx = useHubertOnnx
if useHubertOnnx == True:
ort_options = onnxruntime.SessionOptions()
ort_options.intra_op_num_threads = 8
self.hubert_onnx = onnxruntime.InferenceSession(
"model_hubert/hubert_simple.onnx",
providers=['TensorrtExecutionProvider', 'CUDAExecutionProvider', 'CPUExecutionProvider']
)
else:
models, saved_cfg, task = checkpoint_utils.load_model_ensemble_and_task(
[vec_path],
[hubert_path],
suffix="",
)
model = models[0]
@ -204,39 +210,21 @@ class SoVitsSvc40:
else:
dev = torch.device("cuda", index=self.settings.gpu)
if hasattr(self, "hubert_onnx"):
c = self.hubert_onnx.run(
["units"],
{
"audio": wav16k_numpy.reshape(1, -1),
})
c = torch.from_numpy(np.array(c)).squeeze(0).transpose(1, 2)
else:
self.hubert_model = self.hubert_model.to(dev)
wav16k_tensor = wav16k_tensor.to(dev)
c = utils.get_hubert_content(self.hubert_model, wav_16k_tensor=wav16k_tensor)
uv = uv.to(dev)
f0 = f0.to(dev)
import time
start = time.time()
for i in range(10):
c = utils.get_hubert_content(self.hubert_model, wav_16k_tensor=wav16k_tensor)
end = time.time()
elapse = end - start
print("torch time", elapse, elapse / 10)
import onnxruntime
ort_options = onnxruntime.SessionOptions()
ort_options.intra_op_num_threads = 8
if not hasattr(self, "hubert_onnx"):
self.hubert_onnx = onnxruntime.InferenceSession(
"model_hubert/hubert_simple.onnx",
# providers=['TensorrtExecutionProvider', 'CUDAExecutionProvider', 'CPUExecutionProvider']
providers=['CPUExecutionProvider']
)
start = time.time()
for i in range(10):
c_onnx = utils.get_hubert_content2(self.hubert_onnx, wav16k_numpy)
end = time.time()
elapse = end - start
print("onnx time", elapse, elapse / 10)
print("torch units:", c)
print("onnx units:", c_onnx)
c = utils.repeat_expand_2d(c.squeeze(0), f0.shape[1])
if self.settings.clusterInferRatio != 0 and hasattr(self, "cluster_model") and self.cluster_model != None: