diff --git a/modules/control/proc/midas/midas/transforms.py b/modules/control/proc/midas/midas/transforms.py index 350cbc116..57f3cb371 100644 --- a/modules/control/proc/midas/midas/transforms.py +++ b/modules/control/proc/midas/midas/transforms.py @@ -1,6 +1,6 @@ +import math import numpy as np import cv2 -import math def apply_min_size(sample, size, image_interpolation_method=cv2.INTER_AREA): diff --git a/modules/processing_diffusers.py b/modules/processing_diffusers.py index 3673d5952..18bbbce9b 100644 --- a/modules/processing_diffusers.py +++ b/modules/processing_diffusers.py @@ -397,7 +397,7 @@ def process_diffusers(p: processing.StableDiffusionProcessing): update_sampler(shared.sd_model) supported = ['DDIMScheduler', 'PNDMScheduler', 'DDPMScheduler', 'DEISMultistepScheduler', 'UniPCMultistepScheduler', 'DPMSolverMultistepScheduler', 'DPMSolverSinlgestepScheduler'] if sd_model.scheduler.__class__.__name__ in supported: - sd_model = sd_models.switch_pipe(sd_model, diffusers.StableDiffusionSAGPipeline) + sd_model = sd_models.switch_pipe(diffusers.StableDiffusionSAGPipeline, sd_model) p.extra_generation_params["SAG scale"] = p.sag_scale p.task_args['sag_scale'] = p.sag_scale else: diff --git a/modules/sd_models.py b/modules/sd_models.py index 4cb9c726f..7fc92be8f 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -1008,7 +1008,7 @@ def switch_pipe(cls: diffusers.DiffusionPipeline, pipeline: diffusers.DiffusionP else: components_skipped.append(item) for item in possible: - if item == 'self': # skip + if item in ['self', 'args', 'kwargs']: # skip continue if signature.parameters[item].default != inspect._empty: # has default value so we dont have to worry about it # pylint: disable=protected-access continue