From 25639cc3f80f56486308117ab26adee4d15cf19f Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Fri, 16 Dec 2022 14:11:55 +0530 Subject: [PATCH] Tweak Memory Usage setting text; Fix a bug with the memory usage setting comparison --- ui/media/js/parameters.js | 4 ++-- ui/sd_internal/model_manager.py | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ui/media/js/parameters.js b/ui/media/js/parameters.js index 93f1a266..a8bd3b86 100644 --- a/ui/media/js/parameters.js +++ b/ui/media/js/parameters.js @@ -97,8 +97,8 @@ var PARAMETERS = [ id: "vram_usage_level", type: ParameterType.select, label: "GPU Memory Usage", - note: "Faster performance requires more GPU memory

" + - "Balanced: almost as fast as High, significantly lower GPU memory usage
" + + note: "Faster performance requires more GPU memory (VRAM)

" + + "Balanced: nearly as fast as High, much lower VRAM usage
" + "High: fastest, maximum GPU memory usage
" + "Low: slowest, force-used for GPUs with 4 GB (or less) memory", icon: "fa-forward", diff --git a/ui/sd_internal/model_manager.py b/ui/sd_internal/model_manager.py index 56f1d9c0..e7729b81 100644 --- a/ui/sd_internal/model_manager.py +++ b/ui/sd_internal/model_manager.py @@ -125,19 +125,13 @@ def resolve_model_paths(task_data: TaskData): if task_data.use_upscale: task_data.use_upscale = resolve_model_to_use(task_data.use_upscale, 'gfpgan') def set_vram_optimizations(context: Context): - def is_greater(a, b): # is a > b? - if a == "low": # b will be "low", "balanced" or "high" - return False - elif a == "balanced" and b != "low": # b will be "balanced" or "high" - return False - return True - config = app.getConfig() max_usage_level = device_manager.get_max_vram_usage_level(context.device) vram_usage_level = config.get('vram_usage_level', 'balanced') - if is_greater(vram_usage_level, max_usage_level): + v = {'low': 0, 'balanced': 1, 'high': 2} + if v[vram_usage_level] > v[max_usage_level]: log.error(f'Requested GPU Memory Usage level ({vram_usage_level}) is higher than what is ' + \ f'possible ({max_usage_level}) on this device ({context.device}). Using "{max_usage_level}" instead') vram_usage_level = max_usage_level