From 47bd6dc6b8e8c0df99bc2a775508d312bade3107 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 16 Nov 2022 12:14:06 +0530 Subject: [PATCH 1/3] Fix render devices auto --- ui/server.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/server.py b/ui/server.py index a142925c..b650673a 100644 --- a/ui/server.py +++ b/ui/server.py @@ -376,7 +376,10 @@ task_manager.default_vae_to_load = resolve_vae_to_use() def update_render_threads(): config = getConfig() - render_devices = config.get('render_devices', "auto") + if 'render_devices' in config: + render_devices = config['render_devices'] + else: + render_devices = 'auto' active_devices = task_manager.get_devices()['active'].keys() print('requesting for render_devices', render_devices) From d04aeb55adbfc22f961a4ae026bc5c5da0031d2b Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 16 Nov 2022 12:16:46 +0530 Subject: [PATCH 2/3] Fix default render device --- ui/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/server.py b/ui/server.py index b650673a..f47d9227 100644 --- a/ui/server.py +++ b/ui/server.py @@ -22,7 +22,7 @@ OUTPUT_DIRNAME = "Stable Diffusion UI" # in the user's home folder TASK_TTL = 15 * 60 # Discard last session's task timeout APP_CONFIG_DEFAULTS = { # auto: selects the cuda device with the most free memory, cuda: use the currently active cuda device. - 'render_devices': ['auto'], # valid entries: 'auto', 'cpu' or 'cuda:N' (where N is a GPU index) + 'render_devices': 'auto', # valid entries: 'auto', 'cpu' or 'cuda:N' (where N is a GPU index) 'update_branch': 'main', } APP_CONFIG_DEFAULT_MODELS = [ From 75724797f74a82ce3a55053c9272f930836fcee3 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 16 Nov 2022 12:20:25 +0530 Subject: [PATCH 3/3] Don't show a 500 error when the config json file doesn't exist --- ui/server.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ui/server.py b/ui/server.py index f47d9227..bcbcf038 100644 --- a/ui/server.py +++ b/ui/server.py @@ -228,7 +228,7 @@ def read_web_data(key:str=None): elif key == 'app_config': config = getConfig(default_val=None) if config is None: - raise HTTPException(status_code=500, detail="Config file is missing or unreadable") + config = APP_CONFIG_DEFAULTS return JSONResponse(config, headers=NOCACHE_HEADERS) elif key == 'devices': config = getConfig() @@ -376,10 +376,7 @@ task_manager.default_vae_to_load = resolve_vae_to_use() def update_render_threads(): config = getConfig() - if 'render_devices' in config: - render_devices = config['render_devices'] - else: - render_devices = 'auto' + render_devices = config.get('render_devices', 'auto') active_devices = task_manager.get_devices()['active'].keys() print('requesting for render_devices', render_devices)