Skip to content

[pull] master from Comfy-Org:master #881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jun 9, 2026
Merged

[pull] master from Comfy-Org:master #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f01b24
mm: dont reset cast buffers in cleanup_models_gc() (#14372)
rattus128 Jun 9, 2026
ad56489
Ensure conditions are not trainable to avoid bugs (#14368)
KohakuBlueleaf Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions comfy/model_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,8 +958,6 @@ def loaded_models(only_currently_used=False):
def cleanup_models_gc():
do_gc = False

reset_cast_buffers()

for i in range(len(current_loaded_models)):
cur = current_loaded_models[i]
if cur.is_dead():
Expand Down
6 changes: 6 additions & 0 deletions comfy_extras/nodes_train.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import comfy.sd
import comfy.utils
import comfy.model_management
from comfy.conds import CONDRegular, CONDList
from comfy.cli_args import args, PerformanceFeature
import comfy_extras.nodes_custom_sampler
import folder_paths
Expand Down Expand Up @@ -120,6 +121,11 @@ def process_cond_list(d, prefix=""):
process_cond_list(v, f"{prefix}.{k}")
elif isinstance(v, torch.Tensor):
d[k] = v.clone()
elif isinstance(v, CONDList):
v.cond = [t.detach() if isinstance(t, torch.Tensor) else t for t in v.cond]
elif isinstance(v, CONDRegular):
if isinstance(v.cond, torch.Tensor):
v.cond = v.cond.detach()
elif isinstance(v, (list, tuple)):
for index, item in enumerate(v):
process_cond_list(item, f"{prefix}.{k}.{index}")
Expand Down
Loading