From abb96b822ce46d422f1575826013e33e5029f4d5 Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Mon, 29 Jan 2024 18:17:23 -0800 Subject: [PATCH] Update controlnet.py --- .../sd_forge_controlnet/scripts/controlnet.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py b/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py index ef53365a..f3619d68 100644 --- a/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py +++ b/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py @@ -428,29 +428,32 @@ class ControlNetForForgeOfficial(scripts.Script): preprocessor = global_state.get_preprocessor(unit.module) - detected_map = preprocessor( + preprocessor_output = preprocessor( input_image=input_image, resolution=unit.processor_res, slider_1=unit.threshold_a, slider_2=unit.threshold_b, ) - detected_map_is_image = detected_map.ndim == 3 and detected_map.shape[2] < 5 + preprocessor_output_is_image = \ + isinstance(preprocessor_output, np.ndarray) \ + and preprocessor_output.ndim == 3 \ + and preprocessor_output.shape[2] < 5 - if detected_map_is_image: - params.control_cond = crop_and_resize_image(detected_map, resize_mode, h, w) + if preprocessor_output_is_image: + params.control_cond = crop_and_resize_image(preprocessor_output, resize_mode, h, w) p.extra_result_images.append(params.control_cond) params.control_cond = numpy_to_pytorch(params.control_cond).movedim(-1, 1) if has_high_res_fix: - params.control_cond_for_hr_fix = crop_and_resize_image(detected_map, resize_mode, hr_y, hr_x) + params.control_cond_for_hr_fix = crop_and_resize_image(preprocessor_output, resize_mode, hr_y, hr_x) p.extra_result_images.append(params.control_cond_for_hr_fix) params.control_cond_for_hr_fix = numpy_to_pytorch(params.control_cond_for_hr_fix).movedim(-1, 1) else: params.control_cond_for_hr_fix = params.control_cond else: - params.control_cond = detected_map - params.control_cond_for_hr_fix = detected_map + params.control_cond = preprocessor_output + params.control_cond_for_hr_fix = preprocessor_output p.extra_result_images.append(input_image) params.preprocessor = preprocessor