diff options
| author | catboxanon <122327233+catboxanon@users.noreply.github.com> | 2023-08-04 04:10:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-04 04:10:14 +0000 |
| commit | 8b37734244088eb3c5b6390c5c3f23f577c5136a (patch) | |
| tree | 3b762b64671b5cbc2647051b0d333d6394d2f0bb | |
| parent | 09c1be96748584b08b6299024bb7b64bafb09d09 (diff) | |
| download | stable-diffusion-webui-gfx803-8b37734244088eb3c5b6390c5c3f23f577c5136a.tar.gz stable-diffusion-webui-gfx803-8b37734244088eb3c5b6390c5c3f23f577c5136a.tar.bz2 stable-diffusion-webui-gfx803-8b37734244088eb3c5b6390c5c3f23f577c5136a.zip | |
XYZ: Support hires sampler, cleanup
| -rw-r--r-- | scripts/xyz_grid.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index 103bf104..2b2504b3 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -67,14 +67,6 @@ def apply_order(p, x, xs): p.prompt = prompt_tmp + p.prompt
-def apply_sampler(p, x, xs):
- sampler_name = sd_samplers.samplers_map.get(x.lower(), None)
- if sampler_name is None:
- raise RuntimeError(f"Unknown sampler: {x}")
-
- p.sampler_name = sampler_name
-
-
def confirm_samplers(p, xs):
for x in xs:
if x.lower() not in sd_samplers.samplers_map:
@@ -224,8 +216,9 @@ axis_options = [ AxisOptionImg2Img("Image CFG Scale", float, apply_field("image_cfg_scale")),
AxisOption("Prompt S/R", str, apply_prompt, format_value=format_value),
AxisOption("Prompt order", str_permutations, apply_order, format_value=format_value_join_list),
- AxisOptionTxt2Img("Sampler", str, apply_sampler, format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers]),
- AxisOptionImg2Img("Sampler", str, apply_sampler, format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers_for_img2img]),
+ AxisOptionTxt2Img("Sampler", str, apply_field("sampler_name"), format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers]),
+ AxisOptionTxt2Img("Hires sampler", str, apply_field("hr_sampler_name"), format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers]),
+ AxisOptionImg2Img("Sampler", str, apply_field("sampler_name"), format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers_for_img2img]),
AxisOption("Checkpoint name", str, apply_checkpoint, format_value=format_remove_path, confirm=confirm_checkpoints, cost=1.0, choices=lambda: sorted(sd_models.checkpoints_list, key=str.casefold)),
AxisOption("Negative Guidance minimum sigma", float, apply_field("s_min_uncond")),
AxisOption("Sigma Churn", float, apply_field("s_churn")),
|