Commit e9607815 authored by papuSpartan's avatar papuSpartan
Browse files

fix maximum downsampling option

parent f08ae961

modules/generation_parameters_copypaste.py

+3 −1
Original line number Diff line number Diff line
@@ -306,6 +306,8 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model 
            res["Token merging stride x"] = '2'

        if res.get("Token merging stride y", None) is None:

            res["Token merging stride y"] = '2'

        if res.get("Token merging maximum down sampling", None) is None:

            res["Token merging maximum down sampling"] = '1'



    restore_old_hires_fix_params(res)
@@ -341,7 +343,7 @@ infotext_to_setting_name_mapping = [ 
    ('Token merging merge attention', 'token_merging_merge_attention'),

    ('Token merging merge cross attention', 'token_merging_merge_cross_attention'),

    ('Token merging merge mlp', 'token_merging_merge_mlp'),

    ('Token merging maximum downsampling', 'token_merging_maximum_downsampling'),

    ('Token merging maximum down sampling', 'token_merging_maximum_down_sampling'),

    ('Token merging stride x', 'token_merging_stride_x'),

    ('Token merging stride y', 'token_merging_stride_y'),

    ('RNG', 'randn_source'),

modules/processing.py

+1 −0
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter 
        "Token merging merge mlp": None if opts.token_merging_merge_mlp is False else opts.token_merging_merge_mlp,

        "Token merging stride x": None if opts.token_merging_stride_x == 2 else opts.token_merging_stride_x,

        "Token merging stride y": None if opts.token_merging_stride_y == 2 else opts.token_merging_stride_y,

        "Token merging maximum down sampling": None if opts.token_merging_maximum_down_sampling == 1 else opts.token_merging_maximum_down_sampling,

        "Init image hash": getattr(p, 'init_img_hash', None),

        "RNG": opts.randn_source if opts.randn_source != "GPU" else None,

        "NGMS": None if p.s_min_uncond == 0 else p.s_min_uncond,

modules/shared.py

+1 −4
Original line number Diff line number Diff line
@@ -488,10 +488,7 @@ options_templates.update(options_section(('token_merging', 'Token Merging'), { 
        False, "Merge mlp",

        gr.Checkbox

    ),

    "token_merging_maximum_down_sampling": OptionInfo(

        1, "Maximum down sampling",

        gr.Dropdown, lambda: {"choices": ["1", "2", "4", "8"]}

    ),

    "token_merging_maximum_down_sampling": OptionInfo(1, "Maximum down sampling", gr.Radio, lambda: {"choices": ['1', '2', '4', '8']}),

    "token_merging_stride_x": OptionInfo(

        2, "Stride - X",

        gr.Slider, {"minimum": 2, "maximum": 8, "step": 2}

CRA Git | Maintained and supported by SUSTech CRA and CCSE