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

Merge pull request #6044 from hentailord85ez/discard-penultimate-sigma 

Allow always discarding of penultimate sigma and fix doing 1 less step than specified
parents 24e21c07 03f486a2

modules/sd_samplers.py

+4 −1
Original line number Diff line number Diff line
@@ -463,6 +463,9 @@ class KDiffusionSampler: 
        return extra_params_kwargs



    def get_sigmas(self, p, steps):

        disc = opts.always_discard_next_to_last_sigma or (self.config is not None and self.config.options.get('discard_next_to_last_sigma', False))

        steps += 1 if disc else 0



        if p.sampler_noise_scheduler_override:

            sigmas = p.sampler_noise_scheduler_override(steps)

        elif self.config is not None and self.config.options.get('scheduler', None) == 'karras':
@@ -472,7 +475,7 @@ class KDiffusionSampler: 
        else:

            sigmas = self.model_wrap.get_sigmas(steps)



        if self.config is not None and self.config.options.get('discard_next_to_last_sigma', False):

        if disc:

            sigmas = torch.cat([sigmas[:-2], sigmas[-1:]])



        return sigmas

modules/shared.py

+1 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters" 
    's_tmin':  OptionInfo(0.0, "sigma tmin",  gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),

    's_noise': OptionInfo(1.0, "sigma noise", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),

    'eta_noise_seed_delta': OptionInfo(0, "Eta noise seed delta", gr.Number, {"precision": 0}),

    'always_discard_next_to_last_sigma': OptionInfo(False, "Always discard next-to-last sigma"),

}))



options_templates.update(options_section((None, "Hidden options"), {

CRA Git | Maintained and supported by SUSTech CRA and CCSE