mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-10 05:22:34 +08:00
mp: only count the offload cost of math once
This was previously bundling the combined weight storage and computation cost
This commit is contained in:
parent
73f5649196
commit
e0595fc83e
@ -704,7 +704,7 @@ class ModelPatcher:
|
|||||||
|
|
||||||
lowvram_weight = False
|
lowvram_weight = False
|
||||||
|
|
||||||
potential_offload = max(offload_buffer, module_offload_mem * (comfy.model_management.NUM_STREAMS + 1))
|
potential_offload = max(offload_buffer, module_offload_mem + (comfy.model_management.NUM_STREAMS * module_mem))
|
||||||
lowvram_fits = mem_counter + module_mem + potential_offload < lowvram_model_memory
|
lowvram_fits = mem_counter + module_mem + potential_offload < lowvram_model_memory
|
||||||
|
|
||||||
weight_key = "{}.weight".format(n)
|
weight_key = "{}.weight".format(n)
|
||||||
@ -883,7 +883,7 @@ class ModelPatcher:
|
|||||||
break
|
break
|
||||||
module_offload_mem, module_mem, n, m, params = unload
|
module_offload_mem, module_mem, n, m, params = unload
|
||||||
|
|
||||||
potential_offload = (comfy.model_management.NUM_STREAMS + 1) * module_offload_mem
|
potential_offload = module_offload_mem + (comfy.model_management.NUM_STREAMS * module_mem)
|
||||||
|
|
||||||
lowvram_possible = hasattr(m, "comfy_cast_weights")
|
lowvram_possible = hasattr(m, "comfy_cast_weights")
|
||||||
if hasattr(m, "comfy_patched_weights") and m.comfy_patched_weights == True:
|
if hasattr(m, "comfy_patched_weights") and m.comfy_patched_weights == True:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user