Unverified Commit 9182dd7e authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

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

Improve interrupt speed
parents f739e3e0 9d1d63af

modules/processing.py

+3 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,9 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing): 
            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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ approximation_indexes = {"Full": 0, "Approx NN": 1, "Approx cheap": 2, "TAESD": 


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

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ options_templates.update(options_section(('ui', "Live previews"), { 
    "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"), {

CRA Git | Maintained and supported by SUSTech CRA and CCSE