From 8a9f6090bc589096b9941c08e2d6366fc2e04d69 Mon Sep 17 00:00:00 2001 From: cantor-set Date: Thu, 21 Mar 2024 10:34:29 -0400 Subject: [PATCH] Fixed merge --- modules/async_worker.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/modules/async_worker.py b/modules/async_worker.py index 8f5beca8..17455053 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -46,22 +46,9 @@ def worker(): from modules.sdxl_styles import apply_style, apply_wildcards, fooocus_expansion, apply_arrays from modules.private_logger import log from extras.expansion import safe_str -<<<<<<< HEAD - from modules.util import ( - remove_empty_str, - HWC3, resize_image, - get_image_shape_ceil, - set_image_shape_ceil, - get_shape_ceil, - resample_image, - erode_or_dilate, - ordinal_suffix, - parse_lora_references_from_prompt - ) -======= from modules.util import remove_empty_str, HWC3, resize_image, get_image_shape_ceil, set_image_shape_ceil, \ get_shape_ceil, resample_image, erode_or_dilate, ordinal_suffix, get_enabled_loras ->>>>>>> 978267f461e204c6c4359a79ed818ee2e3e1af39 + from modules.upscaler import perform_upscale from modules.flags import Performance from modules.meta_parser import get_metadata_parser, MetadataScheme @@ -161,13 +148,7 @@ def worker(): base_model_name = args.pop() refiner_model_name = args.pop() refiner_switch = args.pop() -<<<<<<< HEAD - - loras = apply_enabled_loras([[bool(args.pop()), str(args.pop()), float(args.pop()), ] for _ in range(modules.config.default_max_lora_number)]) - -======= loras = get_enabled_loras([[bool(args.pop()), str(args.pop()), float(args.pop())] for _ in range(modules.config.default_max_lora_number)]) ->>>>>>> 978267f461e204c6c4359a79ed818ee2e3e1af39 input_image_checkbox = args.pop() current_tab = args.pop() uov_method = args.pop()