Merge pull request #12634 from catboxanon/feat/live-preview-fast-interrupt

Improve interrupt speed

Author: AUTOMATIC1111

modules/processing.py

@@ -1155,6 +1155,9 @@ def sample(self, conditioning, unconditional_conditioning, seeds, subseeds, subs
             devices.torch_gc()
 
     def sample_hr_pass(self, samples, decoded_samples, seeds, subseeds, subseed_strength, prompts):
+        if shared.state.interrupted:
+            return samples
+
         self.is_hr_pass = True
 
         target_width = self.hr_upscale_to_x

modules/sd_samplers_common.py

@@ -36,7 +36,7 @@ def setup_img2img_steps(p, steps=None):
 
 def samples_to_images_tensor(sample, approximation=None, model=None):
     '''latents -> images [-1, 1]'''
-    if approximation is None:
+    if approximation is None or (shared.state.interrupted and opts.live_preview_fast_interrupt):
         approximation = approximation_indexes.get(opts.show_progress_type, 0)
 
     if approximation == 2:

modules/shared_options.py

@@ -281,6 +281,7 @@
     "show_progress_type": OptionInfo("Approx NN", "Live preview method", gr.Radio, {"choices": ["Full", "Approx NN", "Approx cheap", "TAESD"]}).info("Full = slow but pretty; Approx NN and TAESD = fast but low quality; Approx cheap = super fast but terrible otherwise"),
     "live_preview_content": OptionInfo("Prompt", "Live preview subject", gr.Radio, {"choices": ["Combined", "Prompt", "Negative prompt"]}),
     "live_preview_refresh_period": OptionInfo(1000, "Progressbar and preview update period").info("in milliseconds"),
+    "live_preview_fast_interrupt": OptionInfo(False, "Return image with chosen live preview method on interrupt").info("makes interrupts faster"),
 }))
 
 options_templates.update(options_section(('sampler-params', "Sampler parameters"), {