holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #484 from cmdr2/main

Browse Source 
Merge main
This commit is contained in:
cmdr2 2022-11-16 12:29:09 +05:30 committed by GitHub
commit cf214bf367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/server.py
View File

@ -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 TASK_TTL = 15 * 60 # Discard last session's task timeout
APP_CONFIG_DEFAULTS = { APP_CONFIG_DEFAULTS = {
# auto: selects the cuda device with the most free memory, cuda: use the currently active cuda device. # 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', 'update_branch': 'main',
} }
APP_CONFIG_DEFAULT_MODELS = [ APP_CONFIG_DEFAULT_MODELS = [
@ -228,7 +228,7 @@ def read_web_data(key:str=None):
elif key == 'app_config': elif key == 'app_config':
config = getConfig(default_val=None) config = getConfig(default_val=None)
if config is 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) return JSONResponse(config, headers=NOCACHE_HEADERS)
elif key == 'devices': elif key == 'devices':
config = getConfig() config = getConfig()
@ -376,7 +376,7 @@ task_manager.default_vae_to_load = resolve_vae_to_use()
def update_render_threads(): def update_render_threads():
config = getConfig() config = getConfig()
render_devices = config.get('render_devices', "auto") render_devices = config.get('render_devices', 'auto')
active_devices = task_manager.get_devices()['active'].keys() active_devices = task_manager.get_devices()['active'].keys()
print('requesting for render_devices', render_devices) print('requesting for render_devices', render_devices)