Merge pull request #236 from Kosinkadink/develop

Fix other ControlNet types after recent ComfyUI controlnet change
This commit is contained in:
Jedrzej Kosinski
2025-08-05 13:45:35 -07:00
committed by GitHub
3 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -333,7 +333,7 @@ class SVDControlNetAdvanced(ControlNetAdvanced):
if cond.get('c_concat', None) is not None:
x_noisy = torch.cat([x_noisy] + [cond['c_concat']], dim=1)
control = self.control_model(x=x_noisy.to(dtype), hint=self.cond_hint, timesteps=timestep.float(), context=context.to(dtype), y=y, cond=cond)
control = self.control_model(x=x_noisy.to(dtype), hint=self.cond_hint, timesteps=timestep.float(), context=comfy.model_management.cast_to_device(context, x_noisy.device, dtype), y=y, cond=cond)
return self.control_merge(control, control_prev, output_dtype)
def copy(self):
@@ -463,7 +463,7 @@ class SparseCtrlAdvanced(ControlNetAdvanced):
timestep = self.model_sampling_current.timestep(t)
x_noisy = self.model_sampling_current.calculate_input(t, x_noisy)
control = self.control_model(x=x_noisy.to(dtype), hint=self.cond_hint, timesteps=timestep.float(), context=context.to(dtype), y=y)
control = self.control_model(x=x_noisy.to(dtype), hint=self.cond_hint, timesteps=timestep.float(), context=comfy.model_management.cast_to_device(context, x_noisy.device, dtype), y=y)
return self.control_merge(control, control_prev, output_dtype)
def apply_advanced_strengths_and_masks(self, x: Tensor, batched_number: int, *args, **kwargs):
+1 -1
View File
@@ -343,7 +343,7 @@ class ControlNetPlusPlusAdvanced(ControlNet, AdvancedControlBase):
timestep = self.model_sampling_current.timestep(t)
x_noisy = self.model_sampling_current.calculate_input(t, x_noisy)
control = self.control_model(x=x_noisy.to(dtype), hint=self.cond_hint, timesteps=timestep.float(), context=context.to(dtype), y=y, control_type=self.cond_hint_types)
control = self.control_model(x=x_noisy.to(dtype), hint=self.cond_hint, timesteps=timestep.float(), context=comfy.model_management.cast_to_device(context, x_noisy.device, dtype), y=y, control_type=self.cond_hint_types)
return self.control_merge(control, control_prev, output_dtype)
def copy(self):
+1 -1
View File
@@ -1,7 +1,7 @@
[project]
name = "comfyui-advanced-controlnet"
description = "Nodes for scheduling ControlNet strength across timesteps and batched latents, as well as applying custom weights and attention masks."
version = "1.5.4"
version = "1.5.5"
license = { file = "LICENSE" }
dependencies = []