diff --git a/server/voice_changer/DDSP_SVC/DDSP_SVCSetting.py b/server/voice_changer/DDSP_SVC/DDSP_SVCSetting.py index d97dd262..42177a8e 100644 --- a/server/voice_changer/DDSP_SVC/DDSP_SVCSetting.py +++ b/server/voice_changer/DDSP_SVC/DDSP_SVCSetting.py @@ -3,7 +3,7 @@ from dataclasses import dataclass, field @dataclass class DDSP_SVCSettings: - gpu: int = 0 + gpu: int = -9999 dstId: int = 1 f0Detector: str = "dio" # dio or harvest or crepe # parselmouth diff --git a/server/voice_changer/DiffusionSVC/DiffusionSVCSettings.py b/server/voice_changer/DiffusionSVC/DiffusionSVCSettings.py index 4c256a4f..f790e2e0 100644 --- a/server/voice_changer/DiffusionSVC/DiffusionSVCSettings.py +++ b/server/voice_changer/DiffusionSVC/DiffusionSVCSettings.py @@ -3,7 +3,7 @@ from dataclasses import dataclass, field @dataclass class DiffusionSVCSettings: - gpu: int = 0 + gpu: int = -9999 dstId: int = 0 f0Detector: str = "harvest" # dio or harvest diff --git a/server/voice_changer/MMVCv13/MMVCv13.py b/server/voice_changer/MMVCv13/MMVCv13.py index 10f5144e..014f1c9a 100644 --- a/server/voice_changer/MMVCv13/MMVCv13.py +++ b/server/voice_changer/MMVCv13/MMVCv13.py @@ -37,7 +37,7 @@ from Exceptions import NoModeLoadedException @dataclass class MMVCv13Settings: - gpu: int = 0 + gpu: int = -9999 srcId: int = 0 dstId: int = 101 @@ -247,5 +247,5 @@ class MMVCv13: if file_path.find(remove_path + os.path.sep) >= 0: # print("remove", key, file_path) sys.modules.pop(key) - except: # type:ignore + except: # NOQA pass diff --git a/server/voice_changer/MMVCv15/MMVCv15.py b/server/voice_changer/MMVCv15/MMVCv15.py index 6839af12..6fbb58b6 100644 --- a/server/voice_changer/MMVCv15/MMVCv15.py +++ b/server/voice_changer/MMVCv15/MMVCv15.py @@ -40,7 +40,7 @@ providers = [ @dataclass class MMVCv15Settings: - gpu: int = 0 + gpu: int = -9999 srcId: int = 0 dstId: int = 101 diff --git a/server/voice_changer/RVC/RVC.py b/server/voice_changer/RVC/RVC.py index 25411146..c06c25c2 100644 --- a/server/voice_changer/RVC/RVC.py +++ b/server/voice_changer/RVC/RVC.py @@ -51,7 +51,7 @@ class RVC(VoiceChangerModel): self.feature_buffer: FeatureInOut | None = None self.prevVol = 0.0 self.slotInfo = slotInfo - self.initialize() + # self.initialize() def initialize(self): print("[Voice Changer] [RVC] Initializing... ") @@ -231,7 +231,7 @@ class RVC(VoiceChangerModel): torch.cuda.empty_cache() self.initialize() - + output_file_simple = export2onnx(self.settings.gpu, modelSlot) return { diff --git a/server/voice_changer/RVC/RVCSettings.py b/server/voice_changer/RVC/RVCSettings.py index 49549670..6b89fa54 100644 --- a/server/voice_changer/RVC/RVCSettings.py +++ b/server/voice_changer/RVC/RVCSettings.py @@ -3,7 +3,7 @@ from dataclasses import dataclass, field @dataclass class RVCSettings: - gpu: int = 0 + gpu: int = -9999 dstId: int = 0 f0Detector: str = "harvest" # dio or harvest diff --git a/server/voice_changer/SoVitsSvc40/SoVitsSvc40.py b/server/voice_changer/SoVitsSvc40/SoVitsSvc40.py index a70f1646..03da58de 100644 --- a/server/voice_changer/SoVitsSvc40/SoVitsSvc40.py +++ b/server/voice_changer/SoVitsSvc40/SoVitsSvc40.py @@ -44,7 +44,7 @@ providers = [ @dataclass class SoVitsSvc40Settings: - gpu: int = 0 + gpu: int = -9999 dstId: int = 0 f0Detector: str = "harvest" # dio or harvest diff --git a/server/voice_changer/VoiceChangerManager.py b/server/voice_changer/VoiceChangerManager.py index a48a849c..c4013083 100644 --- a/server/voice_changer/VoiceChangerManager.py +++ b/server/voice_changer/VoiceChangerManager.py @@ -79,8 +79,10 @@ class VoiceChangerManager(ServerDeviceCallbacks): self.stored_setting: dict[str, str | int | float] = {} if os.path.exists(STORED_SETTING_FILE): self.stored_setting = json.load(open(STORED_SETTING_FILE, "r", encoding="utf-8")) - for key, val in self.stored_setting.items(): - self.update_settings(key, val) + if "modelSlotIndex" in self.stored_setting: + self.update_settings("modelSlotIndex", self.stored_setting["modelSlotIndex"]) + # for key, val in self.stored_setting.items(): + # self.update_settings(key, val) def store_setting(self, key: str, val: str | int | float): saveItemForServerDevice = ["enableServerAudio", "serverAudioSampleRate", "serverInputDeviceId", "serverOutputDeviceId", "serverMonitorDeviceId", "serverReadChunkSize", "serverInputAudioGain", "serverOutputAudioGain"] diff --git a/tutorials/tutorial_rvc_en_latest.md b/tutorials/tutorial_rvc_en_latest.md index 1764394d..df39184e 100644 --- a/tutorials/tutorial_rvc_en_latest.md +++ b/tutorials/tutorial_rvc_en_latest.md @@ -104,6 +104,10 @@ Q6. My AMD GPU isn't being used. A6. Please use the DirectML version. Additionally, AMD GPUs are only enabled for ONNX models. You can judge this by the GPU utilization rate going up in the Performance Monitor.([see here](https://github.com/w-okada/voice-changer/issues/383)) +Q7. onxxruntime is not launching and it's producing an error. + +A7. It appears that an error occurs if the folder path contains unicode. Please extract to a path that does not use unicode (just alphanumeric characters). (Reference: https://github.com/w-okada/voice-changer/issues/528) + ## Configurable items ## Title diff --git a/tutorials/tutorial_rvc_ja_latest.md b/tutorials/tutorial_rvc_ja_latest.md index 6bdd5289..5175dce2 100644 --- a/tutorials/tutorial_rvc_ja_latest.md +++ b/tutorials/tutorial_rvc_ja_latest.md @@ -105,6 +105,10 @@ Q6. (AMD ユーザ) GPU が使用されていないような気がする。 A6. DirectML 版を使用してください。また、AMD の GPU は ONNX モデルでのみ有効になります。パフォーマンスモニターで GPU の使用率が上がっていることで判断できます。([see here](https://github.com/w-okada/voice-changer/issues/383)) +Q7. onxxruntime がエラーを出力して起動しない。 + +A7. フォルダのパスに unicode が含まれるとエラーが出るようです。unicode を使わないパス(英数字のみ)に解凍してください。（参考：https://github.com/w-okada/voice-changer/issues/528） + # GUI の詳細 ## タイトルエリア