From 3c9a4d55bb6650dedf4b03cbd965a9c9c5d01526 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 11 Feb 2024 17:23:47 -0500 Subject: [PATCH] init values for ip --- TODO.md | 1 + modules/processing_class.py | 6 +++--- modules/sd_models.py | 2 -- wiki | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/TODO.md b/TODO.md index 81f34ab89..655e6dce2 100644 --- a/TODO.md +++ b/TODO.md @@ -12,3 +12,4 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma - masking api - preprocess api - bind panZoom to control input +- onediff: diff --git a/modules/processing_class.py b/modules/processing_class.py index 63e082091..fb228b2fe 100644 --- a/modules/processing_class.py +++ b/modules/processing_class.py @@ -115,9 +115,9 @@ class StableDiffusionProcessing: self.script_args_value: list = field(default=None, init=False) self.scripts_setup_complete: bool = field(default=False, init=False) # ip adapter - self.ip_adapter_names = None - self.ip_adapter_scales = 0.0 - self.ip_adapter_images = None + self.ip_adapter_names = [] + self.ip_adapter_scales = [0.0] + self.ip_adapter_images = [] # hdr self.hdr_mode=hdr_mode self.hdr_brightness=hdr_brightness diff --git a/modules/sd_models.py b/modules/sd_models.py index 44c20d3cf..28992fe5e 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -901,8 +901,6 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No else: modules.sd_hijack_accelerate.restore_accelerate() sd_model = pipeline.from_single_file(checkpoint_info.path, **diffusers_load_config) - if shared.opts.diffusers_to_gpu: - shared.log.debug(f'Model load: move={modules.sd_hijack_accelerate.tensor_to_timer:.2f}') if sd_model is not None and hasattr(sd_model, 'unet') and hasattr(sd_model.unet, 'config') and 'inpainting' in checkpoint_info.path.lower(): shared.log.debug('Model patch: type=inpaint') sd_model.unet.config.in_channels = 9 diff --git a/wiki b/wiki index f294ce941..102ab490f 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit f294ce94114ef3663dcf0a09e5d4de1065d46bf0 +Subproject commit 102ab490f3bfd443e8c9f8e74a86612e699e313a