mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2025-12-22 07:10:51 -08:00
emergency fix for #1199
This commit is contained in:
@@ -3,6 +3,7 @@ import numpy as np
|
|||||||
import torch
|
import torch
|
||||||
import tqdm
|
import tqdm
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
|
import inspect
|
||||||
|
|
||||||
import k_diffusion.sampling
|
import k_diffusion.sampling
|
||||||
import ldm.models.diffusion.ddim
|
import ldm.models.diffusion.ddim
|
||||||
@@ -278,9 +279,9 @@ class KDiffusionSampler:
|
|||||||
k_diffusion.sampling.torch = TorchHijack(self)
|
k_diffusion.sampling.torch = TorchHijack(self)
|
||||||
|
|
||||||
extra_params_kwargs = {}
|
extra_params_kwargs = {}
|
||||||
for val in self.extra_params:
|
for param_name in self.extra_params:
|
||||||
if hasattr(p,val):
|
if hasattr(p, param_name) and param_name in inspect.signature(self.func).parameters:
|
||||||
extra_params_kwargs[val] = getattr(p,val)
|
extra_params_kwargs[param_name] = getattr(p, param_name)
|
||||||
|
|
||||||
return self.func(self.model_wrap_cfg, xi, sigma_sched, extra_args={'cond': conditioning, 'uncond': unconditional_conditioning, 'cond_scale': p.cfg_scale}, disable=False, callback=self.callback_state, **extra_params_kwargs)
|
return self.func(self.model_wrap_cfg, xi, sigma_sched, extra_args={'cond': conditioning, 'uncond': unconditional_conditioning, 'cond_scale': p.cfg_scale}, disable=False, callback=self.callback_state, **extra_params_kwargs)
|
||||||
|
|
||||||
@@ -300,9 +301,9 @@ class KDiffusionSampler:
|
|||||||
k_diffusion.sampling.torch = TorchHijack(self)
|
k_diffusion.sampling.torch = TorchHijack(self)
|
||||||
|
|
||||||
extra_params_kwargs = {}
|
extra_params_kwargs = {}
|
||||||
for val in self.extra_params:
|
for param_name in self.extra_params:
|
||||||
if hasattr(p,val):
|
if hasattr(p, param_name) and param_name in inspect.signature(self.func).parameters:
|
||||||
extra_params_kwargs[val] = getattr(p,val)
|
extra_params_kwargs[param_name] = getattr(p, param_name)
|
||||||
|
|
||||||
samples = self.func(self.model_wrap_cfg, x, sigmas, extra_args={'cond': conditioning, 'uncond': unconditional_conditioning, 'cond_scale': p.cfg_scale}, disable=False, callback=self.callback_state, **extra_params_kwargs)
|
samples = self.func(self.model_wrap_cfg, x, sigmas, extra_args={'cond': conditioning, 'uncond': unconditional_conditioning, 'cond_scale': p.cfg_scale}, disable=False, callback=self.callback_state, **extra_params_kwargs)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user