From 0695b4afdbcb1bffefb789c3da0129d850dbba82 Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Sat, 27 Jan 2024 22:28:58 -0800 Subject: [PATCH] i --- .../scripts/sd_forge_controlnet_example.py | 5 ++++- modules_forge/controlnet.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py b/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py index aa99fa98..1c56ca37 100644 --- a/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py +++ b/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py @@ -10,6 +10,7 @@ from modules.paths import models_path from modules.modelloader import load_file_from_url from ldm_patched.modules.controlnet import load_controlnet from modules_forge.controlnet import apply_controlnet_advanced +from modules_forge.forge_util import pytorch_to_numpy, numpy_to_pytorch class ControlNetExampleForge(scripts.Script): @@ -76,9 +77,11 @@ class ControlNetExampleForge(scripts.Script): print('Preprocessor Canny finished.') + control_image = numpy_to_pytorch(canny_image) + unet = p.sd_model.forge_objects.unet - unet = apply_controlnet_advanced(unet=unet, controlnet=self.model, image=canny_image, + unet = apply_controlnet_advanced(unet=unet, controlnet=self.model, cond_hint=control_image, strength=1.0, start_percent=0.0, end_percent=1.0, positive_advanced_weighting=None, negative_advanced_weighting=None) diff --git a/modules_forge/controlnet.py b/modules_forge/controlnet.py index 41d664e4..64437a32 100644 --- a/modules_forge/controlnet.py +++ b/modules_forge/controlnet.py @@ -1,14 +1,14 @@ def apply_controlnet_advanced( unet, controlnet, - image, + cond_hint, strength, start_percent, end_percent, positive_advanced_weighting=None, negative_advanced_weighting=None): - cnet = controlnet.copy().set_cond_hint(image, strength, (start_percent, end_percent)) + cnet = controlnet.copy().set_cond_hint(cond_hint, strength, (start_percent, end_percent)) cnet.positive_advanced_weighting = positive_advanced_weighting cnet.negative_advanced_weighting = negative_advanced_weighting