From c371ec91b47100165f7ca062d951ea8d803e75b7 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 15 May 2025 15:26:53 -0400 Subject: [PATCH] fix nncf with controlnet Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 1 + modules/control/run.py | 1 - modules/face/instantid.py | 1 - scripts/example.py | 1 - wiki | 2 +- 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f969659ae..91683cc5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ Btw, last few releases have been smaller, but more regular so do check posts abo - Gradio: major cleanup and fixing defaults and ranges - Pydantic: update to api types - UI defaults: match correct prompt components + - NNCF with ControlNet ## Update for 2025-05-12 diff --git a/modules/control/run.py b/modules/control/run.py index 712838666..8b504bf13 100644 --- a/modules/control/run.py +++ b/modules/control/run.py @@ -433,7 +433,6 @@ def control_run(state: str = '', original_pipeline = shared.sd_model shared.sd_model = pipe sd_models.move_model(shared.sd_model, shared.device) - shared.sd_model.to(dtype=devices.dtype) debug_log(f'Control device={devices.device} dtype={devices.dtype}') sd_models.copy_diffuser_options(shared.sd_model, original_pipeline) # copy options from original pipeline sd_models.set_diffuser_options(shared.sd_model) diff --git a/modules/face/instantid.py b/modules/face/instantid.py index 662d17c7d..3cc613b3d 100644 --- a/modules/face/instantid.py +++ b/modules/face/instantid.py @@ -61,7 +61,6 @@ def instant_id(p: processing.StableDiffusionProcessing, app, source_images, stre shared.sd_model.load_ip_adapter_instantid(face_adapter, scale=strength) shared.sd_model.set_ip_adapter_scale(strength) sd_models.move_model(shared.sd_model, devices.device) # move pipeline to device - shared.sd_model.to(dtype=devices.dtype) # pipeline specific args if p.all_prompts is None or len(p.all_prompts) == 0: diff --git a/scripts/example.py b/scripts/example.py index aba1fba5c..d62d65461 100644 --- a/scripts/example.py +++ b/scripts/example.py @@ -110,7 +110,6 @@ class Script(scripts.Script): sd_models.copy_diffuser_options(shared.sd_model, orig_pipeline) # copy options from original pipeline sd_models.set_diffuser_options(shared.sd_model) # set all model options such as fp16, offload, etc. sd_models.move_model(shared.sd_model, devices.device) # move pipeline to device - shared.sd_model.to(dtype=devices.dtype) # if pipeline also needs a specific type, you can set it here, but not commonly needed # shared.sd_model = sd_models.set_diffuser_pipe(shared.sd_model, sd_models.DiffusersTaskType.IMAGE_2_IMAGE) diff --git a/wiki b/wiki index 6192bb85f..25c8a39ad 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 6192bb85f10693bf632f751c0935ed57969ce7fe +Subproject commit 25c8a39adecd2a9683aace950599330b72031032