Skip to content

GitLab

"...composable_kernel_onnxruntime.git" did not exist on "7acbf104df333f80910731949789518a14f2be08"
Commit dfb397e0 authored by comfyanonymous's avatar comfyanonymous
Browse files

Fix multiple controlnets not working.

parent 6de6246d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
comfy/sd.py
View file @ dfb397e0
...@@ -393,7 +393,7 @@ class ControlNet: ...@@ -393,7 +393,7 @@ class ControlNet:
def get_control(self, x_noisy, t, cond_txt, batched_number): def get_control(self, x_noisy, t, cond_txt, batched_number):
control_prev = None control_prev = None
if self.previous_controlnet is not None: if self.previous_controlnet is not None:
control_prev = self.previous_controlnet.get_control(x_noisy, t, cond_txt) control_prev = self.previous_controlnet.get_control(x_noisy, t, cond_txt, batched_number)
output_dtype = x_noisy.dtype output_dtype = x_noisy.dtype
if self.cond_hint is None or x_noisy.shape[2] * 8 != self.cond_hint.shape[2] or x_noisy.shape[3] * 8 != self.cond_hint.shape[3]: if self.cond_hint is None or x_noisy.shape[2] * 8 != self.cond_hint.shape[2] or x_noisy.shape[3] * 8 != self.cond_hint.shape[3]:
...@@ -541,7 +541,7 @@ class T2IAdapter: ...@@ -541,7 +541,7 @@ class T2IAdapter:
def get_control(self, x_noisy, t, cond_txt, batched_number): def get_control(self, x_noisy, t, cond_txt, batched_number):
control_prev = None control_prev = None
if self.previous_controlnet is not None: if self.previous_controlnet is not None:
control_prev = self.previous_controlnet.get_control(x_noisy, t, cond_txt) control_prev = self.previous_controlnet.get_control(x_noisy, t, cond_txt, batched_number)
if self.cond_hint is None or x_noisy.shape[2] * 8 != self.cond_hint.shape[2] or x_noisy.shape[3] * 8 != self.cond_hint.shape[3]: if self.cond_hint is None or x_noisy.shape[2] * 8 != self.cond_hint.shape[2] or x_noisy.shape[3] * 8 != self.cond_hint.shape[3]:
if self.cond_hint is not None: if self.cond_hint is not None:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment