diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-08 19:09:40 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-08 19:09:51 +0000 |
| commit | f8ff8c0638997fd0aef217db1505598846f14782 (patch) | |
| tree | e94ba153369a657df92857b7c342d5d245a0a8b4 /modules/sd_samplers_common.py | |
| parent | 54c3e5c913b17622bed4ff4d03df488b80611e21 (diff) | |
| download | stable-diffusion-webui-gfx803-f8ff8c0638997fd0aef217db1505598846f14782.tar.gz stable-diffusion-webui-gfx803-f8ff8c0638997fd0aef217db1505598846f14782.tar.bz2 stable-diffusion-webui-gfx803-f8ff8c0638997fd0aef217db1505598846f14782.zip | |
merge errors
Diffstat (limited to 'modules/sd_samplers_common.py')
| -rw-r--r-- | modules/sd_samplers_common.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py index 15f27970..fa3614ff 100644 --- a/modules/sd_samplers_common.py +++ b/modules/sd_samplers_common.py @@ -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
|