WIP: refactor, swicher model type

This commit is contained in:
wataru 2023-03-08 01:46:08 +09:00
parent c14ea07dd5
commit 3ad682dba2
2 changed files with 14 additions and 8 deletions

View File

@ -2,6 +2,10 @@ import os
import sys
import tempfile
# MODEL_TYPE = "MMVCv13"
MODEL_TYPE = "MMVCv15"
# MODEL_TYPE = "sovt-vits-svc"
frontend_path = os.path.join(sys._MEIPASS, "dist") if hasattr(sys, "_MEIPASS") else "../client/demo/dist"
ERROR_NO_ONNX_SESSION = "ERROR_NO_ONNX_SESSION"

View File

@ -1,7 +1,4 @@
import sys
from const import TMP_DIR
from const import TMP_DIR, MODEL_TYPE
import torch
import os
import traceback
@ -10,8 +7,11 @@ from dataclasses import dataclass, asdict
import resampy
# from voice_changer.MMVCv15.MMVCv15 import MMVCv15
from voice_changer.MMVCv13.MMVCv13 import MMVCv13
if MODEL_TYPE == "MMVCv15":
from voice_changer.MMVCv15.MMVCv15 import MMVCv15
else:
from voice_changer.MMVCv13.MMVCv13 import MMVCv13
from voice_changer.IORecorder import IORecorder
from voice_changer.IOAnalyzer import IOAnalyzer
@ -53,8 +53,10 @@ class VoiceChanger():
self.currentCrossFadeEndRate = 0
self.currentCrossFadeOverlapSize = 0
# self.voiceChanger = MMVCv15()
self.voiceChanger = MMVCv13()
if MODEL_TYPE == "MMVCv15":
self.voiceChanger = MMVCv15()
else:
self.voiceChanger = MMVCv13()
self.gpu_num = torch.cuda.device_count()
self.prev_audio = np.zeros(1)