diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-10 14:04:59 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-10 14:04:59 +0000 |
| commit | ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d (patch) | |
| tree | 523e3f7ce97481751c255b46628fed659b175daf /modules/sd_samplers_kdiffusion.py | |
| parent | 70a01cd4440d708bf25cc50393c0430935a8ebc2 (diff) | |
| download | stable-diffusion-webui-gfx803-ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d.tar.gz stable-diffusion-webui-gfx803-ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d.tar.bz2 stable-diffusion-webui-gfx803-ac8a5d18d3ede6bcb8fa5a3da1c7c28e064cd65d.zip | |
resolve merge issues
Diffstat (limited to 'modules/sd_samplers_kdiffusion.py')
| -rw-r--r-- | modules/sd_samplers_kdiffusion.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py index e1854980..95a43cef 100644 --- a/modules/sd_samplers_kdiffusion.py +++ b/modules/sd_samplers_kdiffusion.py @@ -1,8 +1,7 @@ import torch
import inspect
import k_diffusion.sampling
-from modules import sd_samplers_common, sd_samplers_extra
-from modules.sd_samplers_cfg_denoiser import CFGDenoiser
+from modules import sd_samplers_common, sd_samplers_extra, sd_samplers_cfg_denoiser
from modules.shared import opts
import modules.shared as shared
|