298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-02-28 22:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove comfy.samplers self-import (#6506)

Browse Source
This commit is contained in:
catboxanon 2025-01-18 17:49:51 -05:00 committed by GitHub
parent 3a3910f91d
commit b1a02131c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
comfy/samplers.py
View File

@ -12,7 +12,6 @@ import collections
from comfy import model_management from comfy import model_management
import math import math
import logging import logging
import comfy.samplers
import comfy.sampler_helpers import comfy.sampler_helpers
import comfy.model_patcher import comfy.model_patcher
import comfy.patcher_extension import comfy.patcher_extension
@ -178,7 +177,7 @@ def finalize_default_conds(model: 'BaseModel', hooked_to_run: dict[comfy.hooks.H
cond = default_conds[i] cond = default_conds[i]
for x in cond: for x in cond:
# do get_area_and_mult to get all the expected values # do get_area_and_mult to get all the expected values
p = comfy.samplers.get_area_and_mult(x, x_in, timestep) p = get_area_and_mult(x, x_in, timestep)
if p is None: if p is None:
continue continue
# replace p's mult with calculated mult # replace p's mult with calculated mult
@ -215,7 +214,7 @@ def _calc_cond_batch(model: 'BaseModel', conds: list[list[dict]], x_in: torch.Te
default_c.append(x) default_c.append(x)
has_default_conds = True has_default_conds = True
continue continue
p = comfy.samplers.get_area_and_mult(x, x_in, timestep) p = get_area_and_mult(x, x_in, timestep)
if p is None: if p is None:
continue continue
if p.hooks is not None: if p.hooks is not None: