mirror of
https://github.com/w-okada/voice-changer.git
synced 2025-02-03 00:33:57 +03:00
bugfix: DDSP SVC initail update
This commit is contained in:
parent
e4ac5e74db
commit
2d19b5ff65
@ -73,7 +73,7 @@ class DDSP_SVC:
|
|||||||
return torch.device("cpu")
|
return torch.device("cpu")
|
||||||
|
|
||||||
def loadModel(self, props):
|
def loadModel(self, props):
|
||||||
self.settings.configFile = props["files"]["configFilename"]
|
# self.settings.configFile = props["files"]["configFilename"] # 同じフォルダにあるyamlを使う
|
||||||
self.settings.pyTorchModelFile = props["files"]["pyTorchModelFilename"]
|
self.settings.pyTorchModelFile = props["files"]["pyTorchModelFilename"]
|
||||||
# model
|
# model
|
||||||
model, args = vo.load_model(self.settings.pyTorchModelFile, device=self.useDevice())
|
model, args = vo.load_model(self.settings.pyTorchModelFile, device=self.useDevice())
|
||||||
@ -136,7 +136,7 @@ class DDSP_SVC:
|
|||||||
if "CUDAExecutionProvider" in providers:
|
if "CUDAExecutionProvider" in providers:
|
||||||
provider_options = [{'device_id': self.settings.gpu}]
|
provider_options = [{'device_id': self.settings.gpu}]
|
||||||
self.onnx_session.set_providers(providers=["CUDAExecutionProvider"], provider_options=provider_options)
|
self.onnx_session.set_providers(providers=["CUDAExecutionProvider"], provider_options=provider_options)
|
||||||
if key == "gpu":
|
if key == "gpu" and len(self.settings.pyTorchModelFile) > 0:
|
||||||
model, _args = vo.load_model(self.settings.pyTorchModelFile, device=self.useDevice())
|
model, _args = vo.load_model(self.settings.pyTorchModelFile, device=self.useDevice())
|
||||||
self.model = model
|
self.model = model
|
||||||
self.enhancer = Enhancer(self.args.enhancer.type, self.enhancer_path, device=self.useDevice())
|
self.enhancer = Enhancer(self.args.enhancer.type, self.enhancer_path, device=self.useDevice())
|
||||||
|
Loading…
Reference in New Issue
Block a user