PublicMirrors/voice-changer
1
0
Fork 0
mirror of https://github.com/w-okada/voice-changer.git synced 2025-02-03 00:33:57 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: onnxexport path

Browse Source
This commit is contained in:
wataru 2023-05-04 15:20:36 +09:00
parent ec75219f18
commit a7a989407c
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/voice_changer/RVC/RVC.py
View File

@ -32,6 +32,7 @@ from voice_changer.RVC.inferencer.InferencerManager import InferencerManager
from voice_changer.utils.LoadModelParams import FilePaths, LoadModelParams from voice_changer.utils.LoadModelParams import FilePaths, LoadModelParams
from voice_changer.utils.VoiceChangerModel import AudioInOut from voice_changer.utils.VoiceChangerModel import AudioInOut
from voice_changer.utils.VoiceChangerParams import VoiceChangerParams from voice_changer.utils.VoiceChangerParams import VoiceChangerParams
from voice_changer.RVC.onnxExporter.export2onnx import export2onnx
from dataclasses import asdict from dataclasses import asdict
from typing import cast from typing import cast
@ -46,7 +47,7 @@ import faiss
from const import UPLOAD_DIR, EnumEmbedderTypes from const import UPLOAD_DIR, EnumEmbedderTypes
from voice_changer.RVC.custom_vc_infer_pipeline import VC from voice_changer.RVC.Pipeline import VC
providers = [ providers = [
"OpenVINOExecutionProvider", "OpenVINOExecutionProvider",
@ -393,9 +394,7 @@ class RVC:
print("[Voice Changer] export2onnx, No pyTorch filepath.") print("[Voice Changer] export2onnx, No pyTorch filepath.")
return {"status": "ng", "path": ""} return {"status": "ng", "path": ""}
import voice_changer.RVC.onnx.export2onnx as onnxExporter output_file_simple = export2onnx(self.settings.gpu, modelSlot)
output_file_simple = onnxExporter.export2onnx(self.settings.gpu, modelSlot)
return { return {
"status": "ok", "status": "ok",
"path": f"/tmp/{output_file_simple}", "path": f"/tmp/{output_file_simple}",

23
server/voice_changer/RVC/onnxExporter/export2onnx.py
View File

@ -6,21 +6,34 @@ import onnx
from const import TMP_DIR, EnumInferenceTypes from const import TMP_DIR, EnumInferenceTypes
from voice_changer.RVC.ModelSlot import ModelSlot from voice_changer.RVC.ModelSlot import ModelSlot
from voice_changer.RVC.deviceManager.DeviceManager import DeviceManager from voice_changer.RVC.deviceManager.DeviceManager import DeviceManager
from voice_changer.RVC.onnxExporter.SynthesizerTrnMs256NSFsid_ONNX import (
from voice_changer.RVC.onnx.SynthesizerTrnMs256NSFsid_ONNX import (
SynthesizerTrnMs256NSFsid_ONNX, SynthesizerTrnMs256NSFsid_ONNX,
) )
from voice_changer.RVC.onnx.SynthesizerTrnMs256NSFsid_nono_ONNX import ( from voice_changer.RVC.onnxExporter.SynthesizerTrnMs256NSFsid_nono_ONNX import (
SynthesizerTrnMs256NSFsid_nono_ONNX, SynthesizerTrnMs256NSFsid_nono_ONNX,
) )
from voice_changer.RVC.onnx.SynthesizerTrnMsNSFsidNono_webui_ONNX import ( from voice_changer.RVC.onnxExporter.SynthesizerTrnMsNSFsidNono_webui_ONNX import (
SynthesizerTrnMsNSFsidNono_webui_ONNX, SynthesizerTrnMsNSFsidNono_webui_ONNX,
) )
from voice_changer.RVC.onnx.SynthesizerTrnMsNSFsid_webui_ONNX import ( from voice_changer.RVC.onnxExporter.SynthesizerTrnMsNSFsid_webui_ONNX import (
SynthesizerTrnMsNSFsid_webui_ONNX, SynthesizerTrnMsNSFsid_webui_ONNX,
) )
# from voice_changer.RVC.onnx.SynthesizerTrnMs256NSFsid_ONNX import (
# SynthesizerTrnMs256NSFsid_ONNX,
# )
# from voice_changer.RVC.onnx.SynthesizerTrnMs256NSFsid_nono_ONNX import (
# SynthesizerTrnMs256NSFsid_nono_ONNX,
# )
# from voice_changer.RVC.onnx.SynthesizerTrnMsNSFsidNono_webui_ONNX import (
# SynthesizerTrnMsNSFsidNono_webui_ONNX,
# )
# from voice_changer.RVC.onnx.SynthesizerTrnMsNSFsid_webui_ONNX import (
# SynthesizerTrnMsNSFsid_webui_ONNX,
# )
def export2onnx(gpu: int, modelSlot: ModelSlot): def export2onnx(gpu: int, modelSlot: ModelSlot):
pyTorchModelFile = modelSlot.pyTorchModelFile pyTorchModelFile = modelSlot.pyTorchModelFile