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

merge errors

Browse Source
This commit is contained in:
AUTOMATIC1111
2023-08-08 22:09:40 +03:00
parent 54c3e5c913
commit f8ff8c0638
4 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/sd_samplers_common.py
View File

@@ -202,8 +202,9 @@ class Sampler:
self.conditioning_key = shared.sd_model.model.conditioning_key
self.model_wrap = None
self.p = None
self.model_wrap_cfg = None
self.sampler_extra_args = None
def callback_state(self, d):
step = d['i']
@@ -215,6 +216,7 @@ class Sampler:
shared.total_tqdm.update()
def launch_sampling(self, steps, func):
self.model_wrap_cfg.steps = steps
state.sampling_steps = steps
state.sampling_step = 0
@@ -234,6 +236,8 @@ class Sampler:
return p.steps
def initialize(self, p) -> dict:
self.p = p
self.model_wrap_cfg.p = p
self.model_wrap_cfg.mask = p.mask if hasattr(p, 'mask') else None
self.model_wrap_cfg.nmask = p.nmask if hasattr(p, 'nmask') else None
self.model_wrap_cfg.step = 0