From 71fa046c1708a235853c359ef95b363a20c762d3 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 16 May 2025 17:38:08 -0700 Subject: [PATCH] Minor changes after 1c549d176b27233daf0ef6992bf5b5d8215784f9 --- modules/models_settings.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/models_settings.py b/modules/models_settings.py index 76bce7a9..3a2400d4 100644 --- a/modules/models_settings.py +++ b/modules/models_settings.py @@ -457,17 +457,20 @@ def update_gpu_layers_and_vram(loader, model, gpu_layers, ctx_size, cache_type, # Get model settings including user preferences model_settings = get_model_metadata(model) - # Check if the value is from user config-user.yaml + # Get the true maximum layers + max_layers = model_settings.get('max_gpu_layers', model_settings.get('gpu_layers', gpu_layers)) + + # Check if this is a user-saved setting user_config = shared.user_config model_regex = Path(model).name + '$' has_user_setting = model_regex in user_config and 'gpu_layers' in user_config[model_regex] if has_user_setting: - # Just return the current user value without adjustment - max_layers = model_settings.get('max_gpu_layers', 256) + # For user settings, just use the current value (which already has user pref) + # but ensure the slider maximum is correct + current_layers = gpu_layers # Already has user setting else: - # No user setting, use model's max and auto-adjust - max_layers = model_settings.get('max_gpu_layers', model_settings.get('gpu_layers', gpu_layers)) + # No user setting, auto-adjust from the maximum current_layers = max_layers # Start from max # Auto-adjust based on available VRAM