Restore Trellis2 clip vision image_size state

This commit is contained in:
John Pollock 2026-04-19 19:53:30 -05:00
parent f4ae7b8391
commit 04099ef605

View File

@ -256,6 +256,7 @@ def run_conditioning(model, cropped_img_tensor, include_1024=True):
model_internal = model.model model_internal = model.model
device = comfy.model_management.intermediate_device() device = comfy.model_management.intermediate_device()
torch_device = comfy.model_management.get_torch_device() torch_device = comfy.model_management.get_torch_device()
original_image_size = getattr(model_internal, "image_size", None)
def prepare_tensor(pil_img, size): def prepare_tensor(pil_img, size):
resized_pil = pil_img.resize((size, size), Image.Resampling.LANCZOS) resized_pil = pil_img.resize((size, size), Image.Resampling.LANCZOS)
@ -268,10 +269,13 @@ def run_conditioning(model, cropped_img_tensor, include_1024=True):
cond_512 = model_internal(input_512, skip_norm_elementwise=True)[0] cond_512 = model_internal(input_512, skip_norm_elementwise=True)[0]
cond_1024 = None cond_1024 = None
if include_1024: try:
model_internal.image_size = 1024 if include_1024:
input_1024 = prepare_tensor(cropped_img_tensor, 1024) model_internal.image_size = 1024
cond_1024 = model_internal(input_1024, skip_norm_elementwise=True)[0] input_1024 = prepare_tensor(cropped_img_tensor, 1024)
cond_1024 = model_internal(input_1024, skip_norm_elementwise=True)[0]
finally:
model_internal.image_size = original_image_size
conditioning = { conditioning = {
'cond_512': cond_512.to(device), 'cond_512': cond_512.to(device),