diff --git a/server/voice_changer/RVC/RVC.py b/server/voice_changer/RVC/RVC.py index 9dd13db3..5700f89e 100644 --- a/server/voice_changer/RVC/RVC.py +++ b/server/voice_changer/RVC/RVC.py @@ -32,6 +32,7 @@ from voice_changer.RVC.inferencer.InferencerManager import InferencerManager from voice_changer.utils.LoadModelParams import FilePaths, LoadModelParams from voice_changer.utils.VoiceChangerModel import AudioInOut from voice_changer.utils.VoiceChangerParams import VoiceChangerParams +from voice_changer.RVC.onnxExporter.export2onnx import export2onnx from dataclasses import asdict from typing import cast @@ -46,7 +47,7 @@ import faiss from const import UPLOAD_DIR, EnumEmbedderTypes -from voice_changer.RVC.custom_vc_infer_pipeline import VC +from voice_changer.RVC.Pipeline import VC providers = [ "OpenVINOExecutionProvider", @@ -393,9 +394,7 @@ class RVC: print("[Voice Changer] export2onnx, No pyTorch filepath.") return {"status": "ng", "path": ""} - import voice_changer.RVC.onnx.export2onnx as onnxExporter - - output_file_simple = onnxExporter.export2onnx(self.settings.gpu, modelSlot) + output_file_simple = export2onnx(self.settings.gpu, modelSlot) return { "status": "ok", "path": f"/tmp/{output_file_simple}", diff --git a/server/voice_changer/RVC/onnxExporter/export2onnx.py b/server/voice_changer/RVC/onnxExporter/export2onnx.py index 11a6e7ae..bf98fc57 100644 --- a/server/voice_changer/RVC/onnxExporter/export2onnx.py +++ b/server/voice_changer/RVC/onnxExporter/export2onnx.py @@ -6,21 +6,34 @@ import onnx from const import TMP_DIR, EnumInferenceTypes from voice_changer.RVC.ModelSlot import ModelSlot from voice_changer.RVC.deviceManager.DeviceManager import DeviceManager - -from voice_changer.RVC.onnx.SynthesizerTrnMs256NSFsid_ONNX import ( +from voice_changer.RVC.onnxExporter.SynthesizerTrnMs256NSFsid_ONNX import ( SynthesizerTrnMs256NSFsid_ONNX, ) -from voice_changer.RVC.onnx.SynthesizerTrnMs256NSFsid_nono_ONNX import ( +from voice_changer.RVC.onnxExporter.SynthesizerTrnMs256NSFsid_nono_ONNX import ( SynthesizerTrnMs256NSFsid_nono_ONNX, ) -from voice_changer.RVC.onnx.SynthesizerTrnMsNSFsidNono_webui_ONNX import ( +from voice_changer.RVC.onnxExporter.SynthesizerTrnMsNSFsidNono_webui_ONNX import ( SynthesizerTrnMsNSFsidNono_webui_ONNX, ) -from voice_changer.RVC.onnx.SynthesizerTrnMsNSFsid_webui_ONNX import ( +from voice_changer.RVC.onnxExporter.SynthesizerTrnMsNSFsid_webui_ONNX import ( 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): pyTorchModelFile = modelSlot.pyTorchModelFile