Skip to content

Commit 521fe42

Browse files
committed
More MultiControlNetModel
1 parent b327a26 commit 521fe42

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,11 +1243,7 @@ def __call__(
12431243

12441244
device = self._execution_device
12451245

1246-
global_pool_conditions = (
1247-
controlnet.config.global_pool_conditions
1248-
if isinstance(controlnet, ControlNetModel)
1249-
else controlnet.nets[0].config.global_pool_conditions
1250-
)
1246+
global_pool_conditions = controlnet.config.global_pool_conditions
12511247
guess_mode = guess_mode or global_pool_conditions
12521248

12531249
# 3.1 Encode input prompt

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,11 +1334,7 @@ def __call__(
13341334

13351335
device = self._execution_device
13361336

1337-
global_pool_conditions = (
1338-
controlnet.config.global_pool_conditions
1339-
if isinstance(controlnet, (ControlNetModel, ControlNetUnionModel))
1340-
else controlnet.nets[0].config.global_pool_conditions
1341-
)
1337+
global_pool_conditions = controlnet.config.global_pool_conditions
13421338
guess_mode = guess_mode or global_pool_conditions
13431339

13441340
# 3.1. Encode input prompt

0 commit comments

Comments
 (0)