Reformat some changes from the previous commit. (31ac0bab) · Commits · github_fork / Stable Diffusion Webui

modules/processing.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
		comments[comment] = 1

		if p.n_iter > 1:
		shared.state.job = f"Image {n+1} out of {p.n_iter}; Batch {(shared.state.job_no // p.n_iter) + 1} of {shared.state.job_count // p.n_iter}"
		shared.state.job = f"Batch {n+1} out of {p.n_iter}"

		samples_ddim = p.sample(conditioning=c, unconditional_conditioning=uc, seeds=seeds, subseeds=subseeds, subseed_strength=p.subseed_strength)
		if state.interrupted:

scripts/xy_grid.py

+8 −11

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ def draw_xy_grid(p, xs, ys, x_labels, y_labels, cell, draw_legend):

		for iy, y in enumerate(ys):
		for ix, x in enumerate(xs):
		state.job = f"Image {ix + iy * len(xs) + 1} out of {state.job_count}"
		state.job = f"{ix + iy * len(xs) + 1} out of {len(xs) * len(ys)}"

		processed = cell(x, y)
		if first_pocessed is None:
		@@ -141,11 +141,11 @@ class Script(scripts.Script):
		y_values = gr.Textbox(label="Y values", visible=False, lines=1)

		draw_legend = gr.Checkbox(label='Draw legend', value=True)
		fixed_seeds = gr.Checkbox(label='Resolve random seeds before plotting (only applies when plotting "-1" seed values for X or Y axis)', value=False)
		no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False)

		return [x_type, x_values, y_type, y_values, draw_legend, fixed_seeds]
		return [x_type, x_values, y_type, y_values, draw_legend, no_fixed_seeds]

		def run(self, p, x_type, x_values, y_type, y_values, draw_legend, fixed_seeds):
		def run(self, p, x_type, x_values, y_type, y_values, draw_legend, no_fixed_seeds):
		modules.processing.fix_seed(p)
		p.batch_size = 1

		@@ -214,7 +214,7 @@ class Script(scripts.Script):
		else:
		return axis_list

		if fixed_seeds == True:
		if not no_fixed_seeds:
		xs = fix_axis_seeds(x_opt, xs)
		ys = fix_axis_seeds(y_opt, ys)

		@@ -225,9 +225,6 @@ class Script(scripts.Script):
		else:
		total_steps = p.steps * len(xs) * len(ys)

		if p.n_iter > 1:
		print(f"Number of seeds/images per prompt is {p.n_iter}.")

		print(f"X/Y plot will create {len(xs) * len(ys) * p.n_iter} images on a {len(xs)}x{len(ys)} grid. (Total steps to process: {total_steps * p.n_iter})")
		shared.total_tqdm.updateTotal(total_steps * p.n_iter)

Admin message