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

Overall progress incorrect with X/Y plot and batch count > 1 #441

Browse source
This commit is contained in:
AUTOMATIC 2022-09-14 13:08:05 +03:00
parent 4c51752464
commit f6aa0cdb0b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/xy_grid.py
View file

@ -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):
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):
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):
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),