wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-24 13:20:19 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'comfyanonymous:master' into master

Browse Source
This commit is contained in:
patientx 2025-08-03 00:17:56 +03:00 committed by GitHub
commit da4fc8189a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
comfy/model_base.py
View File

@ -106,10 +106,12 @@ def model_sampling(model_config, model_type):
return ModelSampling(model_config) return ModelSampling(model_config)
def convert_tensor(extra, dtype): def convert_tensor(extra, dtype, device):
if hasattr(extra, "dtype"): if hasattr(extra, "dtype"):
if extra.dtype != torch.int and extra.dtype != torch.long: 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 return extra
@ -169,20 +171,21 @@ class BaseModel(torch.nn.Module):
dtype = self.manual_cast_dtype dtype = self.manual_cast_dtype
xc = xc.to(dtype) xc = xc.to(dtype)
device = xc.device
t = self.model_sampling.timestep(t).float() t = self.model_sampling.timestep(t).float()
if context is not None: if context is not None:
context = context.to(dtype) context = context.to(dtype=dtype, device=device)
extra_conds = {} extra_conds = {}
for o in kwargs: for o in kwargs:
extra = kwargs[o] extra = kwargs[o]
if hasattr(extra, "dtype"): if hasattr(extra, "dtype"):
extra = convert_tensor(extra, dtype) extra = convert_tensor(extra, dtype, device)
elif isinstance(extra, list): elif isinstance(extra, list):
ex = [] ex = []
for ext in extra: for ext in extra:
ex.append(convert_tensor(ext, dtype)) ex.append(convert_tensor(ext, dtype, device))
extra = ex extra = ex
extra_conds[o] = extra extra_conds[o] = extra

2
requirements.txt
View File

@ -1,5 +1,5 @@
comfyui-frontend-package==1.23.4 comfyui-frontend-package==1.23.4
comfyui-workflow-templates==0.1.45 comfyui-workflow-templates==0.1.47
comfyui-embedded-docs==0.2.4 comfyui-embedded-docs==0.2.4
torch torch
torchsde torchsde