aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-08-06 05:55:20 +0300
committerGitHub <noreply@github.com>2023-08-06 05:55:20 +0300
commitf4e4992a4a2d5a8446ffa702eb07eadf014d7d24 (patch)
treef46ed9945382179cf73b780867e4bb018e329d72
parentc6278c15a81bf65efb65ded50368972a920cc198 (diff)
parent85c2c138d2f5f853c79bde3775d69628e86c65ca (diff)
Merge pull request #12357 from catboxanon/s-tmax
Add option for `s_tmax`
-rw-r--r--modules/processing.py2
-rw-r--r--modules/shared.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/processing.py b/modules/processing.py
index a9d66005..2003532d 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -148,7 +148,7 @@ class StableDiffusionProcessing:
self.s_min_uncond = s_min_uncond or opts.s_min_uncond
self.s_churn = s_churn or opts.s_churn
self.s_tmin = s_tmin or opts.s_tmin
- self.s_tmax = s_tmax or float('inf') # not representable as a standard ui option
+ self.s_tmax = opts.data.get('s_tmax', s_tmax or 0) or float('inf') # not representable as a standard ui option
self.s_noise = s_noise or opts.s_noise
self.override_settings = {k: v for k, v in (override_settings or {}).items() if k not in shared.restricted_opts}
self.override_settings_restore_afterwards = override_settings_restore_afterwards
diff --git a/modules/shared.py b/modules/shared.py
index a99b500b..b1c0c0e9 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -608,6 +608,7 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters"
"ddim_discretize": OptionInfo('uniform', "img2img DDIM discretize", gr.Radio, {"choices": ['uniform', 'quad']}),
's_churn': OptionInfo(0.0, "sigma churn", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),
's_tmin': OptionInfo(0.0, "sigma tmin", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),
+ 's_tmax': OptionInfo(0.0, "sigma tmax", gr.Slider, {"minimum": 0.0, "maximum": 999.0, "step": 0.01}).info("0 = inf"),
's_noise': OptionInfo(1.0, "sigma noise", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),
'k_sched_type': OptionInfo("Automatic", "scheduler type", gr.Dropdown, {"choices": ["Automatic", "karras", "exponential", "polyexponential"]}).info("lets you override the noise schedule for k-diffusion samplers; choosing Automatic disables the three parameters below"),
'sigma_min': OptionInfo(0.0, "sigma min", gr.Number).info("0 = default (~0.03); minimum noise strength for k-diffusion noise scheduler"),