298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-04-20 03:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make minimum_inference_memory() depend on --reserve-vram

Browse Source
This commit is contained in:
comfyanonymous 2024-09-01 01:01:54 -04:00
parent baa6b4dc36
commit b643eae08b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comfy/model_management.py
View File

@ -370,12 +370,9 @@ def offloaded_memory(loaded_models, device):
offloaded_mem += m.model_offloaded_memory() offloaded_mem += m.model_offloaded_memory()
return offloaded_mem return offloaded_mem
def minimum_inference_memory(): EXTRA_RESERVED_VRAM = 400 * 1024 * 1024
return (1024 * 1024 * 1024) * 1.2
EXTRA_RESERVED_VRAM = 200 * 1024 * 1024
if any(platform.win32_ver()): if any(platform.win32_ver()):
EXTRA_RESERVED_VRAM = 500 * 1024 * 1024 #Windows is higher because of the shared vram issue EXTRA_RESERVED_VRAM = 600 * 1024 * 1024 #Windows is higher because of the shared vram issue
if args.reserve_vram is not None: if args.reserve_vram is not None:
EXTRA_RESERVED_VRAM = args.reserve_vram * 1024 * 1024 * 1024 EXTRA_RESERVED_VRAM = args.reserve_vram * 1024 * 1024 * 1024
@ -384,6 +381,9 @@ if args.reserve_vram is not None:
def extra_reserved_memory(): def extra_reserved_memory():
return EXTRA_RESERVED_VRAM return EXTRA_RESERVED_VRAM
def minimum_inference_memory():
return (1024 * 1024 * 1024) * 0.8 + extra_reserved_memory()
def unload_model_clones(model, unload_weights_only=True, force_unload=True): def unload_model_clones(model, unload_weights_only=True, force_unload=True):
to_unload = [] to_unload = []
for i in range(len(current_loaded_models)): for i in range(len(current_loaded_models)):