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: diffusionsvc sample

Browse Source
This commit is contained in:
w-okada 2023-08-06 07:09:32 +09:00
parent 38d7ec8c4f
commit ff21c8130e
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/MMVCServerSIO.py
View File

@ -9,6 +9,7 @@ import argparse
from Exceptions import WeightDownladException from Exceptions import WeightDownladException
from downloader.SampleDownloader import downloadInitialSamples from downloader.SampleDownloader import downloadInitialSamples
from downloader.WeightDownloader import downloadWeight from downloader.WeightDownloader import downloadWeight
from voice_changer.VoiceChangerParamsManager import VoiceChangerParamsManager
from voice_changer.utils.VoiceChangerParams import VoiceChangerParams from voice_changer.utils.VoiceChangerParams import VoiceChangerParams
@ -96,6 +97,8 @@ voiceChangerParams = VoiceChangerParams(
rmvpe=args.rmvpe, rmvpe=args.rmvpe,
sample_mode=args.sample_mode, sample_mode=args.sample_mode,
) )
vcparams = VoiceChangerParamsManager.get_instance()
vcparams.setParams(voiceChangerParams)
printMessage(f"Booting PHASE :{__name__}", level=2) printMessage(f"Booting PHASE :{__name__}", level=2)

6
server/voice_changer/DiffusionSVC/DiffusionSVCModelSlotGenerator.py
View File

@ -1,8 +1,6 @@
import os import os
from const import EnumInferenceTypes
from dataclasses import asdict from dataclasses import asdict
import onnxruntime
import json
from data.ModelSlot import DiffusionSVCModelSlot, ModelSlot, RVCModelSlot from data.ModelSlot import DiffusionSVCModelSlot, ModelSlot, RVCModelSlot
from voice_changer.DiffusionSVC.inferencer.diffusion_svc_model.diffusion.unit2mel import load_model_vocoder_from_combo from voice_changer.DiffusionSVC.inferencer.diffusion_svc_model.diffusion.unit2mel import load_model_vocoder_from_combo
@ -45,7 +43,7 @@ class DiffusionSVCModelSlotGenerator(ModelSlotGenerator):
def _setInfoByPytorch(cls, slot: DiffusionSVCModelSlot): def _setInfoByPytorch(cls, slot: DiffusionSVCModelSlot):
vcparams = VoiceChangerParamsManager.get_instance().params vcparams = VoiceChangerParamsManager.get_instance().params
modelPath = os.path.join(vcparams.model_dir, str(slot.slotIndex), os.path.basename(slot.modelFile)) modelPath = os.path.join(vcparams.model_dir, str(slot.slotIndex), os.path.basename(slot.modelFile))
diff_model, diff_args, naive_model, naive_args = load_model_vocoder_from_combo(modelPath, device="cpu") diff_model, diff_args, naive_model, naive_args = load_model_vocoder_from_combo(modelPath, device="cpu")
slot.kStepMax = diff_args.model.k_step_max slot.kStepMax = diff_args.model.k_step_max
slot.nLayers = diff_args.model.n_layers slot.nLayers = diff_args.model.n_layers

1
server/voice_changer/DiffusionSVC/inferencer/DiffusionSVCInferencer.py
View File

@ -133,7 +133,6 @@ class DiffusionSVCInferencer(Inferencer):
out_wav *= mask out_wav *= mask
else: else:
out_wav = self.vocoder_onnx.infer(gt_spec, pitch, silence_front, mask) out_wav = self.vocoder_onnx.infer(gt_spec, pitch, silence_front, mask)
# out_wav = self.vocoder_onnx.infer(gt_spec, pitch, 0, mask)
# print("[ ----Timer::3: ]", t.secs) # print("[ ----Timer::3: ]", t.secs)
return out_wav.squeeze() return out_wav.squeeze()

2
server/voice_changer/VoiceChangerManager.py
View File

@ -121,8 +121,6 @@ class VoiceChangerManager(ServerDeviceCallbacks):
@classmethod @classmethod
def get_instance(cls, params: VoiceChangerParams): def get_instance(cls, params: VoiceChangerParams):
if cls._instance is None: if cls._instance is None:
vcparams = VoiceChangerParamsManager.get_instance()
vcparams.setParams(params)
cls._instance = cls(params) cls._instance = cls(params)
return cls._instance return cls._instance