xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-09-30 12:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed models not being unloaded properly due to current_patcher reference; the current ComfyUI model cleanup code requires that nothing else has a reference to the ModelPatcher instances

Browse Source
This commit is contained in:
Jedrzej Kosinski 2024-10-11 06:50:55 -05:00
parent 1e2777bab1
commit 1f8d9c040b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comfy/model_patcher.py
View File

@ -793,6 +793,8 @@ class ModelPatcher:
def cleanup(self): def cleanup(self):
self.clean_hooks() self.clean_hooks()
if hasattr(self.model, "current_patcher"):
self.model.current_patcher = None
for callback in self.get_all_callbacks(CallbacksMP.ON_CLEANUP): for callback in self.get_all_callbacks(CallbacksMP.ON_CLEANUP):
callback(self) callback(self)
@ -897,6 +899,8 @@ class ModelPatcher:
callback(self) callback(self)
def pre_run(self): def pre_run(self):
if hasattr(self.model, "current_patcher"):
self.model.current_patcher = self
for callback in self.get_all_callbacks(CallbacksMP.ON_PRE_RUN): for callback in self.get_all_callbacks(CallbacksMP.ON_PRE_RUN):
callback(self) callback(self)

1
comfy/sampler_helpers.py
View File

@ -93,7 +93,6 @@ def prepare_sampling(model: 'ModelPatcher', noise_shape, conds):
minimum_memory_required = model.memory_required([noise_shape[0]] + list(noise_shape[1:])) + inference_memory minimum_memory_required = model.memory_required([noise_shape[0]] + list(noise_shape[1:])) + inference_memory
comfy.model_management.load_models_gpu([model] + models, memory_required=memory_required, minimum_memory_required=minimum_memory_required) comfy.model_management.load_models_gpu([model] + models, memory_required=memory_required, minimum_memory_required=minimum_memory_required)
real_model = model.model real_model = model.model
real_model.current_patcher = model
return real_model, conds, models return real_model, conds, models