Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
f6aa0cdb
Commit
f6aa0cdb
authored
Sep 14, 2022
by
AUTOMATIC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Overall progress incorrect with X/Y plot and batch count > 1 #441
parent
4c517524
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
xy_grid.py
scripts/xy_grid.py
+3
-3
No files found.
scripts/xy_grid.py
View file @
f6aa0cdb
...
@@ -78,7 +78,7 @@ axis_options = [
...
@@ -78,7 +78,7 @@ axis_options = [
]
]
def
draw_xy_grid
(
xs
,
ys
,
x_label
,
y_label
,
cell
):
def
draw_xy_grid
(
p
,
xs
,
ys
,
x_label
,
y_label
,
cell
):
res
=
[]
res
=
[]
ver_texts
=
[[
images
.
GridAnnotation
(
y_label
(
y
))]
for
y
in
ys
]
ver_texts
=
[[
images
.
GridAnnotation
(
y_label
(
y
))]
for
y
in
ys
]
...
@@ -86,7 +86,7 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
...
@@ -86,7 +86,7 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
first_pocessed
=
None
first_pocessed
=
None
state
.
job_count
=
len
(
xs
)
*
len
(
ys
)
state
.
job_count
=
len
(
xs
)
*
len
(
ys
)
*
p
.
n_iter
for
iy
,
y
in
enumerate
(
ys
):
for
iy
,
y
in
enumerate
(
ys
):
for
ix
,
x
in
enumerate
(
xs
):
for
ix
,
x
in
enumerate
(
xs
):
...
@@ -129,7 +129,6 @@ class Script(scripts.Script):
...
@@ -129,7 +129,6 @@ class Script(scripts.Script):
def
run
(
self
,
p
,
x_type
,
x_values
,
y_type
,
y_values
):
def
run
(
self
,
p
,
x_type
,
x_values
,
y_type
,
y_values
):
modules
.
processing
.
fix_seed
(
p
)
modules
.
processing
.
fix_seed
(
p
)
p
.
batch_size
=
1
p
.
batch_size
=
1
p
.
batch_count
=
1
def
process_axis
(
opt
,
vals
):
def
process_axis
(
opt
,
vals
):
valslist
=
[
x
.
strip
()
for
x
in
vals
.
split
(
","
)]
valslist
=
[
x
.
strip
()
for
x
in
vals
.
split
(
","
)]
...
@@ -184,6 +183,7 @@ class Script(scripts.Script):
...
@@ -184,6 +183,7 @@ class Script(scripts.Script):
return
process_images
(
pc
)
return
process_images
(
pc
)
processed
=
draw_xy_grid
(
processed
=
draw_xy_grid
(
p
,
xs
=
xs
,
xs
=
xs
,
ys
=
ys
,
ys
=
ys
,
x_label
=
lambda
x
:
x_opt
.
format_value
(
p
,
x_opt
,
x
),
x_label
=
lambda
x
:
x_opt
.
format_value
(
p
,
x_opt
,
x
),
...
...
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