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

👍️[Update] Controller : CUDAが使用できない場合にデバイス設定をcudaからcpuに変更する処理を追加

Browse Source
This commit is contained in:
misyaguziya
2024-10-30 17:57:29 +09:00
parent c57fcff7db
commit 7d38b13a39
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src-python/webui_controller.py
View File

@@ -398,10 +398,6 @@ class Controller:
def getTransparencyRange(*args, **kwargs) -> dict: def getTransparencyRange(*args, **kwargs) -> dict:
return {"status":200, "result":config.TRANSPARENCY_RANGE} return {"status":200, "result":config.TRANSPARENCY_RANGE}
@staticmethod
def getAppearanceThemesList(*args, **kwargs) -> dict:
return {"status":200, "result":config.APPEARANCE_THEME_LIST}
@staticmethod @staticmethod
def getUiScalingRange(*args, **kwargs) -> dict: def getUiScalingRange(*args, **kwargs) -> dict:
return {"status":200, "result":config.UI_SCALING_RANGE} return {"status":200, "result":config.UI_SCALING_RANGE}
@@ -416,8 +412,11 @@ class Controller:
@staticmethod @staticmethod
def getComputeDeviceList(*args, **kwargs) -> dict: def getComputeDeviceList(*args, **kwargs) -> dict:
device_list = [{"type":"cuda", "device_index": i, "name": torch.cuda.get_device_name(i)} for i in range(torch.cuda.device_count())] device_list = []
device_list.append({"type":"cpu", "device_index": 0, "name": "cpu"}) if torch.cuda.is_available():
for i in range(torch.cuda.device_count()):
device_list.append({"device":"cuda", "device_index": i, "name": torch.cuda.get_device_name(i)})
device_list.append({"device":"cpu", "device_index": 0, "name": "cpu"})
return {"status":200, "result":device_list} return {"status":200, "result":device_list}
@staticmethod @staticmethod
@@ -615,15 +614,6 @@ class Controller:
config.TRANSPARENCY = int(data) config.TRANSPARENCY = int(data)
return {"status":200, "result":config.TRANSPARENCY} return {"status":200, "result":config.TRANSPARENCY}
@staticmethod
def getAppearanceTheme(*args, **kwargs) -> dict:
return {"status":200, "result":config.APPEARANCE_THEME}
@staticmethod
def setAppearanceTheme(data, *args, **kwargs) -> dict:
config.APPEARANCE_THEME = data
return {"status":200, "result":config.APPEARANCE_THEME}
@staticmethod @staticmethod
def getUiScaling(*args, **kwargs) -> dict: def getUiScaling(*args, **kwargs) -> dict:
return {"status":200, "result":config.UI_SCALING} return {"status":200, "result":config.UI_SCALING}
@@ -1639,6 +1629,14 @@ class Controller:
th_download.daemon = True th_download.daemon = True
th_download.start() th_download.start()
@staticmethod
def updateComputeDeviceSettings() -> None:
if torch.cuda.is_available() is False:
if config.SELECTED_TRANSLATION_COMPUTE_DEVICE["device"] != "cpu":
config.SELECTED_TRANSLATION_COMPUTE_DEVICE = {"device":"cpu", "device_id":0, "device_name":"cpu"}
if config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE["device"] != "cpu":
config.SELECTED_TRANSCRIPTION_COMPUTE_DEVICE = {"device":"cpu", "device_id":0, "device_name":"cpu"}
@staticmethod @staticmethod
def startWatchdog(*args, **kwargs) -> dict: def startWatchdog(*args, **kwargs) -> dict:
model.startWatchdog() model.startWatchdog()
@@ -1689,6 +1687,10 @@ class Controller:
self.updateDownloadedWhisperModelWeight() self.updateDownloadedWhisperModelWeight()
self.updateTranscriptionEngine() self.updateTranscriptionEngine()
# 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()