every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix_cuda' into for_webui

Browse Source
This commit is contained in:
misyaguziya
2024-12-03 08:22:45 +09:00
parent 37c53a9c36 ddf7fadc91
commit e6a7ff03aa
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-python/config.py
View File

@@ -930,8 +930,8 @@ class Config:
self._SELECTABLE_COMPUTE_DEVICE_LIST = [] self._SELECTABLE_COMPUTE_DEVICE_LIST = []
if torch.cuda.is_available(): if torch.cuda.is_available():
for i in range(torch.cuda.device_count()): for i in range(torch.cuda.device_count()):
self._SELECTABLE_COMPUTE_DEVICE_LIST.append({"device":"cuda", "device_index": i, "name": torch.cuda.get_device_name(i)}) self._SELECTABLE_COMPUTE_DEVICE_LIST.append({"device":"cuda", "device_index": i, "device_name": torch.cuda.get_device_name(i)})
self._SELECTABLE_COMPUTE_DEVICE_LIST.append({"device":"cpu", "device_index": 0, "name": "cpu"}) self._SELECTABLE_COMPUTE_DEVICE_LIST.append({"device":"cpu", "device_index": 0, "device_name": "cpu"})
self._SEND_MESSAGE_BUTTON_TYPE_LIST = ["show", "hide", "show_and_disable_enter_key"] self._SEND_MESSAGE_BUTTON_TYPE_LIST = ["show", "hide", "show_and_disable_enter_key"]
self._SEND_MESSAGE_FORMAT = "[message]" self._SEND_MESSAGE_FORMAT = "[message]"
self._SEND_MESSAGE_FORMAT_WITH_T = "[message]([translation])" self._SEND_MESSAGE_FORMAT_WITH_T = "[message]([translation])"
@@ -1078,8 +1078,10 @@ class Config:
for key, value in self._config_data.items(): for key, value in self._config_data.items():
try: try:
setattr(self, key, value) setattr(self, key, value)
except: except Exception:
pass import traceback
with open('error.log', 'a') as f:
traceback.print_exc(file=f)
with open(self.PATH_CONFIG, 'w', encoding="utf-8") as fp: with open(self.PATH_CONFIG, 'w', encoding="utf-8") as fp:
for var_name, var_func in json_serializable_vars.items(): for var_name, var_func in json_serializable_vars.items():

12
src-python/webui_controller.py
View File

@@ -1606,14 +1606,6 @@ class Controller:
th_download.daemon = True th_download.daemon = True
th_download.start() th_download.start()
@staticmethod
def updateComputeDeviceSettings() -> None:
if config.COMPUTE_MODE == "cpu":
if config.SELECTED_TRANSLATION_COMPUTE_DEVICE["device"] != "cpu":
config.SELECTED_TRANSLATION_COMPUTE_DEVICE = {"device":"cpu", "device_index":0, "device_name":"cpu"}
if config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device"] != "cpu":
config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = {"device":"cpu", "device_index":0, "device_name":"cpu"}
@staticmethod @staticmethod
def startWatchdog(*args, **kwargs) -> dict: def startWatchdog(*args, **kwargs) -> dict:
model.startWatchdog() model.startWatchdog()
@@ -1687,10 +1679,6 @@ class Controller:
self.initializationProgress(3) self.initializationProgress(3)
# set Compute CPU or CUDA
printLog("Set Compute CPU or CUDA")
self.updateComputeDeviceSettings()
# set word filter # set word filter
printLog("Set Word Filter") printLog("Set Word Filter")
model.addKeywords() model.addKeywords()