Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
00117a07
Commit
00117a07
authored
Oct 08, 2022
by
Trung Ngo
Committed by
AUTOMATIC1111
Oct 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check specifically for skipped
parent
786d9f63
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
7 deletions
+3
-7
modules/img2img.py
modules/img2img.py
+0
-2
modules/processing.py
modules/processing.py
+1
-2
modules/sd_samplers.py
modules/sd_samplers.py
+2
-2
modules/shared.py
modules/shared.py
+0
-1
No files found.
modules/img2img.py
View file @
00117a07
...
@@ -34,8 +34,6 @@ def process_batch(p, input_dir, output_dir, args):
...
@@ -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
...
...
modules/processing.py
View file @
00117a07
...
@@ -357,7 +357,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
...
@@ -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:
...
@@ -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
...
...
modules/sd_samplers.py
View file @
00117a07
...
@@ -106,7 +106,7 @@ def extended_tdqm(sequence, *args, desc=None, **kwargs):
...
@@ -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):
...
@@ -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
:
...
...
modules/shared.py
View file @
00117a07
...
@@ -99,7 +99,6 @@ class State:
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment