Skip to content

[pull] master from comfyanonymous:master #208

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Aug 2, 2025
Merged

[pull] master from comfyanonymous:master #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbcc239
Update template to 0.1.47 (#9153)
comfyui-wiki Aug 2, 2025
5f582a9
Make sure all the conds are on the right device. (#9151)
comfyanonymous Aug 2, 2025
13aaa66
Make sure context is on the right device. (#9154)
comfyanonymous Aug 2, 2025
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
13 changes: 8 additions & 5 deletions comfy/model_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,12 @@ class ModelSampling(s, c):
return ModelSampling(model_config)


def convert_tensor(extra, dtype):
def convert_tensor(extra, dtype, device):
if hasattr(extra, "dtype"):
if extra.dtype != torch.int and extra.dtype != torch.long:
extra = extra.to(dtype)
extra = extra.to(dtype=dtype, device=device)
else:
extra = extra.to(device=device)
return extra


Expand Down Expand Up @@ -169,20 +171,21 @@ def _apply_model(self, x, t, c_concat=None, c_crossattn=None, control=None, tran
dtype = self.manual_cast_dtype

xc = xc.to(dtype)
device = xc.device
t = self.model_sampling.timestep(t).float()
if context is not None:
context = context.to(dtype)
context = context.to(dtype=dtype, device=device)

extra_conds = {}
for o in kwargs:
extra = kwargs[o]

if hasattr(extra, "dtype"):
extra = convert_tensor(extra, dtype)
extra = convert_tensor(extra, dtype, device)
elif isinstance(extra, list):
ex = []
for ext in extra:
ex.append(convert_tensor(ext, dtype))
ex.append(convert_tensor(ext, dtype, device))
extra = ex
extra_conds[o] = extra

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
comfyui-frontend-package==1.23.4
comfyui-workflow-templates==0.1.45
comfyui-workflow-templates==0.1.47
comfyui-embedded-docs==0.2.4
torch
torchsde
Expand Down
Loading