wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-14 23:42:35 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into group-nodes

Browse Source
This commit is contained in:
pythongosssss 2023-10-23 16:35:44 +01:00
commit a92409c0ec
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
comfy/model_management.py
View File

@ -339,7 +339,11 @@ def free_memory(memory_required, device, keep_loaded=[]):
if unloaded_model: if unloaded_model:
soft_empty_cache() soft_empty_cache()
else:
if vram_state != VRAMState.HIGH_VRAM:
mem_free_total, mem_free_torch = get_free_memory(device, torch_free_too=True)
if mem_free_torch > mem_free_total * 0.25:
soft_empty_cache()
def load_models_gpu(models, memory_required=0): def load_models_gpu(models, memory_required=0):
global vram_state global vram_state

4
web/scripts/widgets.js
View File

@ -95,7 +95,9 @@ export function addValueControlWidget(node, targetWidget, defaultValue = "random
* ranges and set them to min or max.*/ * ranges and set them to min or max.*/
if (targetWidget.value < min) targetWidget.value = min; if (targetWidget.value < min) targetWidget.value = min;
if (targetWidget.value > max) targetWidget.value = max; if (targetWidget.value > max)
targetWidget.value = max;
targetWidget.callback(targetWidget.value);
} }
}; };
return valueControl; return valueControl;