diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-05-17 09:26:26 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-17 09:26:26 +0300 |
commit | 85232a5b26666854deae59cf950f744740dd5c37 (patch) | |
tree | 3af76d8c6ba3173ffd925336d902da058df4e02d /scripts/xyz_grid.py | |
parent | 56a2672831751480f94a018f861f0143a8234ae8 (diff) | |
parent | 4b07f2f584596604c4499efb0b0295e96985080f (diff) |
Merge branch 'dev' into taesd-a
Diffstat (limited to 'scripts/xyz_grid.py')
-rw-r--r-- | scripts/xyz_grid.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index a725d74a..5672267d 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -10,15 +10,13 @@ import numpy as np import modules.scripts as scripts
import gradio as gr
-from modules import images, paths, sd_samplers, processing, sd_models, sd_vae
+from modules import images, sd_samplers, processing, sd_models, sd_vae
from modules.processing import process_images, Processed, StableDiffusionProcessingTxt2Img
-from modules.shared import opts, cmd_opts, state
+from modules.shared import opts, state
import modules.shared as shared
import modules.sd_samplers
import modules.sd_models
import modules.sd_vae
-import glob
-import os
import re
from modules.ui_components import ToolButton
@@ -86,7 +84,7 @@ def apply_checkpoint(p, x, xs): info = modules.sd_models.get_closet_checkpoint_match(x)
if info is None:
raise RuntimeError(f"Unknown checkpoint: {x}")
- p.override_settings['sd_model_checkpoint'] = info.hash
+ p.override_settings['sd_model_checkpoint'] = info.name
def confirm_checkpoints(p, xs):
@@ -316,7 +314,7 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend return Processed(p, [])
z_count = len(zs)
- sub_grids = [None] * z_count
+
for i in range(z_count):
start_index = (i * len(xs) * len(ys)) + i
end_index = start_index + len(xs) * len(ys)
@@ -706,7 +704,7 @@ class Script(scripts.Script): if not include_sub_grids:
# Done with sub-grids, drop all related information:
- for sg in range(z_count):
+ for _ in range(z_count):
del processed.images[1]
del processed.all_prompts[1]
del processed.all_seeds[1]
|