Added first_pass_width and height as adjustable inputs to "High Res Fix"

3 files changed, 14 insertions, 3 deletions

diff --git a/modules/processing.py b/modules/processing.py
index d5172f00..abbfdf98 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -506,11 +506,13 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
     firstphase_width_truncated = 0

     firstphase_height_truncated = 0

 

-    def __init__(self, enable_hr=False, scale_latent=True, denoising_strength=0.75, **kwargs):

+    def __init__(self, enable_hr=False, scale_latent=True, denoising_strength=0.75, first_pass_width=512, first_pass_height=512, **kwargs):

         super().__init__(**kwargs)

         self.enable_hr = enable_hr

         self.scale_latent = scale_latent

         self.denoising_strength = denoising_strength

+        self.first_pass_width = first_pass_width

+        self.first_pass_height = first_pass_height

 

     def init(self, all_prompts, all_seeds, all_subseeds):

         if self.enable_hr:

@@ -519,7 +521,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
             else:

                 state.job_count = state.job_count * 2

 

-            desired_pixel_count = 512 * 512

+            desired_pixel_count = self.first_pass_width * self.first_pass_height

             actual_pixel_count = self.width * self.height

             scale = math.sqrt(desired_pixel_count / actual_pixel_count)

 

diff --git a/modules/txt2img.py b/modules/txt2img.py
index e985242b..85cbece4 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -6,7 +6,7 @@ import modules.processing as processing
 from modules.ui import plaintext_to_html

 

 

-def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: str, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, scale_latent: bool, denoising_strength: float, *args):

+def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: str, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, scale_latent: bool, denoising_strength: float, first_pass_width: int, first_pass_height: int, *args):

     p = StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

@@ -32,6 +32,9 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
         enable_hr=enable_hr,

         scale_latent=scale_latent if enable_hr else None,

         denoising_strength=denoising_strength if enable_hr else None,

+		first_pass_width=first_pass_width if enable_hr else None,

+		first_pass_height=first_pass_height if enable_hr else None,

+

     )

 

     if cmd_opts.enable_console_prompts:

diff --git a/modules/ui.py b/modules/ui.py
index 220fb80b..544419b2 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -540,6 +540,8 @@ def create_ui(wrap_gradio_gpu_call):
                     enable_hr = gr.Checkbox(label='Highres. fix', value=False)

 

                 with gr.Row(visible=False) as hr_options:

+                    first_pass_width = gr.Slider(minimum=64, maximum=1024, step=64, label="First pass width", value=512)

+                    first_pass_height = gr.Slider(minimum=64, maximum=1024, step=64, label="First pass height", value=512)

                     scale_latent = gr.Checkbox(label='Scale latent', value=False)

                     denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.7)

 

@@ -604,6 +606,8 @@ def create_ui(wrap_gradio_gpu_call):
                     enable_hr,

                     scale_latent,

                     denoising_strength,

+                    first_pass_width,

+                    first_pass_height,

                 ] + custom_inputs,

                 outputs=[

                     txt2img_gallery,

@@ -668,6 +672,8 @@ def create_ui(wrap_gradio_gpu_call):
                 (denoising_strength, "Denoising strength"),

                 (enable_hr, lambda d: "Denoising strength" in d),

                 (hr_options, lambda d: gr.Row.update(visible="Denoising strength" in d)),

+                (first_pass_width, "First pass width"),

+                (first_pass_height, "First pass height"),

             ]

             modules.generation_parameters_copypaste.connect_paste(paste, txt2img_paste_fields, txt2img_prompt)

             token_button.click(fn=update_token_counter, inputs=[txt2img_prompt, steps], outputs=[token_counter])