hoelee/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-08-04 03:10:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve merge issues

Browse Source
This commit is contained in:
AUTOMATIC1111
2023-08-10 17:04:59 +03:00
parent 70a01cd444
commit ac8a5d18d3
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/sd_samplers_kdiffusion.py
View File

@@ -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