Merge pull request #236 from Kosinkadink/develop

Fix other ControlNet types after recent ComfyUI controlnet change

Author: Kosinkadink

adv_control/control.py

@@ -333,7 +333,7 @@ def get_control_advanced(self, x_noisy, t, cond, batched_number, transformer_opt
         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 @@ def get_control_advanced(self, x_noisy: Tensor, t, cond, batched_number: int, tr
         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):

adv_control/control_plusplus.py

@@ -343,7 +343,7 @@ def get_control_advanced(self, x_noisy: Tensor, t, cond, batched_number, transfo
         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):

pyproject.toml

@@ -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 = []