Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for DEIS / DPM++ config clash by setting algorithm type - fixes #6368 #7440

Merged
merged 3 commits into from
Jan 8, 2025
+7 −0
Merged

Fix for DEIS / DPM++ config clash by setting algorithm type - fixes #6368 #7440

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b2f2a
Fix for DEIS / DPM clash
Vargol Dec 12, 2024
4497dec
ruff format changes
Vargol Dec 12, 2024
c18a969
more ruff formating
Vargol Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions invokeai/app/invocations/denoise_latents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
from diffusers.configuration_utils import ConfigMixin
from diffusers.models.adapter import T2IAdapter
from diffusers.models.unets.unet_2d_condition import UNet2DConditionModel
from diffusers.schedulers.scheduling_dpmsolver_multistep import DPMSolverMultistepScheduler
from diffusers.schedulers.scheduling_dpmsolver_sde import DPMSolverSDEScheduler
from diffusers.schedulers.scheduling_dpmsolver_singlestep import DPMSolverSinglestepScheduler
from diffusers.schedulers.scheduling_tcd import TCDScheduler
from diffusers.schedulers.scheduling_utils import SchedulerMixin as Scheduler
from PIL import Image
Expand Down Expand Up @@ -89,6 +91,7 @@ def get_scheduler(
# possible.
scheduler_class, scheduler_extra_config = SCHEDULER_MAP.get(scheduler_name, SCHEDULER_MAP["ddim"])
orig_scheduler_info = context.models.load(scheduler_info)

with orig_scheduler_info as orig_scheduler:
scheduler_config = orig_scheduler.config

Expand All @@ -104,6 +107,10 @@ def get_scheduler(
if scheduler_class is DPMSolverSDEScheduler:
scheduler_config["noise_sampler_seed"] = seed

if scheduler_class is DPMSolverMultistepScheduler or scheduler_class is DPMSolverSinglestepScheduler:
if scheduler_config["_class_name"] == "DEISMultistepScheduler" and scheduler_config["algorithm_type"] == "deis":
scheduler_config["algorithm_type"] = "dpmsolver++"

scheduler = scheduler_class.from_config(scheduler_config)

# hack copied over from generate.py
Expand Down
Loading