Skip to content

Commit

Permalink
fix Sampler Scheduler autocorrection warning
Browse files Browse the repository at this point in the history
  • Loading branch information
w-e-w committed Jun 21, 2024
1 parent 9e0f6d2 commit 0f40c4b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions modules/sd_samplers.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def get_hr_scheduler_from_infotext(d: dict):


@functools.cache
def get_sampler_and_scheduler(sampler_name, scheduler_name):
def get_sampler_and_scheduler(sampler_name, scheduler_name, *, convert_automatic=True):
default_sampler = samplers[0]
found_scheduler = sd_schedulers.schedulers_map.get(scheduler_name, sd_schedulers.schedulers[0])

Expand All @@ -116,15 +116,15 @@ def get_sampler_and_scheduler(sampler_name, scheduler_name):
sampler = all_samplers_map.get(name, default_sampler)

# revert back to Automatic if it's the default scheduler for the selected sampler
if sampler.options.get('scheduler', None) == found_scheduler.name:
if convert_automatic and sampler.options.get('scheduler', None) == found_scheduler.name:
found_scheduler = sd_schedulers.schedulers[0]

return sampler.name, found_scheduler.label


def fix_p_invalid_sampler_and_scheduler(p):
i_sampler_name, i_scheduler = p.sampler_name, p.scheduler
p.sampler_name, p.scheduler = get_sampler_and_scheduler(p.sampler_name, p.scheduler)
p.sampler_name, p.scheduler = get_sampler_and_scheduler(p.sampler_name, p.scheduler, convert_automatic=False)
if p.sampler_name != i_sampler_name or i_scheduler != p.scheduler:
logging.warning(f'Sampler Scheduler autocorrection: "{i_sampler_name}" -> "{p.sampler_name}", "{i_scheduler}" -> "{p.scheduler}"')

Expand Down

0 comments on commit 0f40c4b

Please sign in to comment.