From 7e0cd2ed867b8638e42d88d6fc285e27d57b4d45 Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Thu, 25 Jan 2024 16:48:17 -0800 Subject: [PATCH] i --- modules/sd_samplers_common.py | 2 +- modules/sd_samplers_kdiffusion.py | 4 ++-- modules/sd_samplers_timesteps.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py index 91c35b7d..a9190d4c 100644 --- a/modules/sd_samplers_common.py +++ b/modules/sd_samplers_common.py @@ -186,7 +186,7 @@ def apply_refiner(cfg_denoiser, x): cfg_denoiser.p.setup_conds() cfg_denoiser.update_inner_model() - inference_memory = 0 + inference_memory = refiner.current_controlnet_required_memory unet_patcher = refiner.forge_objects.unet model_management.load_models_gpu( [unet_patcher], diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py index cd34bb5a..d0c6b5c6 100644 --- a/modules/sd_samplers_kdiffusion.py +++ b/modules/sd_samplers_kdiffusion.py @@ -141,7 +141,7 @@ class KDiffusionSampler(sd_samplers_common.Sampler): return sigmas def sample_img2img(self, p, x, noise, conditioning, unconditional_conditioning, steps=None, image_conditioning=None): - inference_memory = 0 + inference_memory = self.model_wrap.inner_model.current_controlnet_required_memory unet_patcher = self.model_wrap.inner_model.forge_objects.unet ldm_patched.modules.model_management.load_models_gpu( [unet_patcher], @@ -205,7 +205,7 @@ class KDiffusionSampler(sd_samplers_common.Sampler): return samples def sample(self, p, x, conditioning, unconditional_conditioning, steps=None, image_conditioning=None): - inference_memory = 0 + inference_memory = self.model_wrap.inner_model.current_controlnet_required_memory unet_patcher = self.model_wrap.inner_model.forge_objects.unet ldm_patched.modules.model_management.load_models_gpu( [unet_patcher], diff --git a/modules/sd_samplers_timesteps.py b/modules/sd_samplers_timesteps.py index 467860a4..2785dd73 100644 --- a/modules/sd_samplers_timesteps.py +++ b/modules/sd_samplers_timesteps.py @@ -98,7 +98,7 @@ class CompVisSampler(sd_samplers_common.Sampler): return timesteps def sample_img2img(self, p, x, noise, conditioning, unconditional_conditioning, steps=None, image_conditioning=None): - inference_memory = 0 + inference_memory = self.model_wrap.inner_model.current_controlnet_required_memory unet_patcher = self.model_wrap.inner_model.forge_objects.unet ldm_patched.modules.model_management.load_models_gpu( [unet_patcher], @@ -150,7 +150,7 @@ class CompVisSampler(sd_samplers_common.Sampler): return samples def sample(self, p, x, conditioning, unconditional_conditioning, steps=None, image_conditioning=None): - inference_memory = 0 + inference_memory = self.model_wrap.inner_model.current_controlnet_required_memory unet_patcher = self.model_wrap.inner_model.forge_objects.unet ldm_patched.modules.model_management.load_models_gpu( [unet_patcher],