michael/stable-diffusion-webui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

check specifically for skipped

Browse source
This commit is contained in:
Trung Ngo 2022-10-08 05:33:21 -05:00 committed by AUTOMATIC1111
parent 786d9f63aa
commit 00117a07ef
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/img2img.py
View file

@ -34,8 +34,6 @@ def process_batch(p, input_dir, output_dir, args):
state.job = f"{i+1} out of {len(images)}" state.job = f"{i+1} out of {len(images)}"
if state.skipped: if state.skipped:
state.skipped = False state.skipped = False
state.interrupted = False
continue
if state.interrupted: if state.interrupted:
break break

3
modules/processing.py
View file

@ -357,7 +357,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
for n in range(p.n_iter): for n in range(p.n_iter):
if state.skipped: if state.skipped:
state.skipped = False state.skipped = False
state.interrupted = False
if state.interrupted: if state.interrupted:
break break
@ -385,7 +384,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
with devices.autocast(): with devices.autocast():
samples_ddim = p.sample(conditioning=c, unconditional_conditioning=uc, seeds=seeds, subseeds=subseeds, subseed_strength=p.subseed_strength) samples_ddim = p.sample(conditioning=c, unconditional_conditioning=uc, seeds=seeds, subseeds=subseeds, subseed_strength=p.subseed_strength)
if state.interrupted: if state.interrupted or state.skipped:
# if we are interruped, sample returns just noise # if we are interruped, sample returns just noise
# use the image collected previously in sampler loop # use the image collected previously in sampler loop

4
modules/sd_samplers.py
View file

@ -106,7 +106,7 @@ def extended_tdqm(sequence, *args, desc=None, **kwargs):
seq = sequence if cmd_opts.disable_console_progressbars else tqdm.tqdm(sequence, *args, desc=state.job, file=shared.progress_print_out, **kwargs) seq = sequence if cmd_opts.disable_console_progressbars else tqdm.tqdm(sequence, *args, desc=state.job, file=shared.progress_print_out, **kwargs)
for x in seq: for x in seq:
if state.interrupted: if state.interrupted or state.skipped:
break break
yield x yield x
@ -254,7 +254,7 @@ def extended_trange(sampler, count, *args, **kwargs):
seq = range(count) if cmd_opts.disable_console_progressbars else tqdm.trange(count, *args, desc=state.job, file=shared.progress_print_out, **kwargs) seq = range(count) if cmd_opts.disable_console_progressbars else tqdm.trange(count, *args, desc=state.job, file=shared.progress_print_out, **kwargs)
for x in seq: for x in seq:
if state.interrupted: if state.interrupted or state.skipped:
break break
if sampler.stop_at is not None and x > sampler.stop_at: if sampler.stop_at is not None and x > sampler.stop_at:

1
modules/shared.py
View file

@ -99,7 +99,6 @@ class State:
def skip(self): def skip(self):
self.skipped = True self.skipped = True
self.interrupted = True
def interrupt(self): def interrupt(self):
self.interrupted = True self.interrupted = True