From ec75219f187757a153e589fbd65fe6d5c28e4821 Mon Sep 17 00:00:00 2001
From: wataru <wataru@fdev.local.com>
Date: Thu, 4 May 2023 13:09:13 +0900
Subject: [PATCH] change structure

---
 .../RVC/{custom_vc_infer_pipeline.py => Pipeline.py}        | 0
 server/voice_changer/RVC/RVC.py                             | 6 +++---
 server/voice_changer/RVC/{ => modelMerger}/MergeModel.py    | 2 +-
 .../RVC/{ => modelMerger}/MergeModelRequest.py              | 0
 .../SynthesizerTrnMs256NSFsid_ONNX.py                       | 0
 .../SynthesizerTrnMs256NSFsid_nono_ONNX.py                  | 0
 .../SynthesizerTrnMsNSFsidNono_webui_ONNX.py                | 0
 .../SynthesizerTrnMsNSFsid_webui_ONNX.py                    | 0
 server/voice_changer/RVC/{ => onnxExporter}/export2onnx.py  | 1 +
 9 files changed, 5 insertions(+), 4 deletions(-)
 rename server/voice_changer/RVC/{custom_vc_infer_pipeline.py => Pipeline.py} (100%)
 rename server/voice_changer/RVC/{ => modelMerger}/MergeModel.py (96%)
 rename server/voice_changer/RVC/{ => modelMerger}/MergeModelRequest.py (100%)
 rename server/voice_changer/RVC/{onnx => onnxExporter}/SynthesizerTrnMs256NSFsid_ONNX.py (100%)
 rename server/voice_changer/RVC/{onnx => onnxExporter}/SynthesizerTrnMs256NSFsid_nono_ONNX.py (100%)
 rename server/voice_changer/RVC/{onnx => onnxExporter}/SynthesizerTrnMsNSFsidNono_webui_ONNX.py (100%)
 rename server/voice_changer/RVC/{onnx => onnxExporter}/SynthesizerTrnMsNSFsid_webui_ONNX.py (100%)
 rename server/voice_changer/RVC/{ => onnxExporter}/export2onnx.py (97%)

diff --git a/server/voice_changer/RVC/custom_vc_infer_pipeline.py b/server/voice_changer/RVC/Pipeline.py
similarity index 100%
rename from server/voice_changer/RVC/custom_vc_infer_pipeline.py
rename to server/voice_changer/RVC/Pipeline.py
diff --git a/server/voice_changer/RVC/RVC.py b/server/voice_changer/RVC/RVC.py
index 87f65b2a..9dd13db3 100644
--- a/server/voice_changer/RVC/RVC.py
+++ b/server/voice_changer/RVC/RVC.py
@@ -21,8 +21,8 @@ else:
     sys.path.append("RVC")
 import json
 import resampy
-from voice_changer.RVC.MergeModel import merge_model
-from voice_changer.RVC.MergeModelRequest import MergeModelRequest
+from voice_changer.RVC.modelMerger.MergeModel import merge_model
+from voice_changer.RVC.modelMerger.MergeModelRequest import MergeModelRequest
 from voice_changer.RVC.ModelSlotGenerator import generateModelSlot
 from voice_changer.RVC.RVCSettings import RVCSettings
 from voice_changer.RVC.embedder.Embedder import Embedder
@@ -393,7 +393,7 @@ class RVC:
             print("[Voice Changer] export2onnx, No pyTorch filepath.")
             return {"status": "ng", "path": ""}
 
-        import voice_changer.RVC.export2onnx as onnxExporter
+        import voice_changer.RVC.onnx.export2onnx as onnxExporter
 
         output_file_simple = onnxExporter.export2onnx(self.settings.gpu, modelSlot)
         return {
diff --git a/server/voice_changer/RVC/MergeModel.py b/server/voice_changer/RVC/modelMerger/MergeModel.py
similarity index 96%
rename from server/voice_changer/RVC/MergeModel.py
rename to server/voice_changer/RVC/modelMerger/MergeModel.py
index c5f489d8..8ad8a9f6 100644
--- a/server/voice_changer/RVC/MergeModel.py
+++ b/server/voice_changer/RVC/modelMerger/MergeModel.py
@@ -1,5 +1,5 @@
 from typing import Dict, Any
-from voice_changer.RVC.MergeModelRequest import MergeModelRequest
+from voice_changer.RVC.modelMerger.MergeModelRequest import MergeModelRequest
 from collections import OrderedDict
 import torch
 import tqdm
diff --git a/server/voice_changer/RVC/MergeModelRequest.py b/server/voice_changer/RVC/modelMerger/MergeModelRequest.py
similarity index 100%
rename from server/voice_changer/RVC/MergeModelRequest.py
rename to server/voice_changer/RVC/modelMerger/MergeModelRequest.py
diff --git a/server/voice_changer/RVC/onnx/SynthesizerTrnMs256NSFsid_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_ONNX.py
similarity index 100%
rename from server/voice_changer/RVC/onnx/SynthesizerTrnMs256NSFsid_ONNX.py
rename to server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_ONNX.py
diff --git a/server/voice_changer/RVC/onnx/SynthesizerTrnMs256NSFsid_nono_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_nono_ONNX.py
similarity index 100%
rename from server/voice_changer/RVC/onnx/SynthesizerTrnMs256NSFsid_nono_ONNX.py
rename to server/voice_changer/RVC/onnxExporter/SynthesizerTrnMs256NSFsid_nono_ONNX.py
diff --git a/server/voice_changer/RVC/onnx/SynthesizerTrnMsNSFsidNono_webui_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsidNono_webui_ONNX.py
similarity index 100%
rename from server/voice_changer/RVC/onnx/SynthesizerTrnMsNSFsidNono_webui_ONNX.py
rename to server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsidNono_webui_ONNX.py
diff --git a/server/voice_changer/RVC/onnx/SynthesizerTrnMsNSFsid_webui_ONNX.py b/server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsid_webui_ONNX.py
similarity index 100%
rename from server/voice_changer/RVC/onnx/SynthesizerTrnMsNSFsid_webui_ONNX.py
rename to server/voice_changer/RVC/onnxExporter/SynthesizerTrnMsNSFsid_webui_ONNX.py
diff --git a/server/voice_changer/RVC/export2onnx.py b/server/voice_changer/RVC/onnxExporter/export2onnx.py
similarity index 97%
rename from server/voice_changer/RVC/export2onnx.py
rename to server/voice_changer/RVC/onnxExporter/export2onnx.py
index 68bde457..11a6e7ae 100644
--- a/server/voice_changer/RVC/export2onnx.py
+++ b/server/voice_changer/RVC/onnxExporter/export2onnx.py
@@ -38,6 +38,7 @@ def export2onnx(gpu: int, modelSlot: ModelSlot):
         "samplingRate": modelSlot.samplingRate,
         "f0": modelSlot.f0,
         "embChannels": modelSlot.embChannels,
+        # ↓EnumEmbedderTypesのままだとシリアライズできないのでテキスト化
         "embedder": modelSlot.embedder.value,
     }
     gpuMomory = DeviceManager.get_instance().getDeviceMemory(gpu)