diff options
| author | 不会画画的中医不是好程序员 <yfszzx@gmail.com> | 2022-10-14 06:43:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 06:43:44 +0000 |
| commit | f7712e28e5d87e90cde36b841ccfda3e549398de (patch) | |
| tree | 5a94f123ea44030f4cda5b4609280261f05dd29f /modules/ui.py | |
| parent | d48f3470c8a86f22dce106e7d3c1803e5ba92085 (diff) | |
| parent | fdecb636855748e03efc40c846a0043800aadfcc (diff) | |
| download | stable-diffusion-webui-gfx803-f7712e28e5d87e90cde36b841ccfda3e549398de.tar.gz stable-diffusion-webui-gfx803-f7712e28e5d87e90cde36b841ccfda3e549398de.tar.bz2 stable-diffusion-webui-gfx803-f7712e28e5d87e90cde36b841ccfda3e549398de.zip | |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/ui.py')
| -rw-r--r-- | modules/ui.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/ui.py b/modules/ui.py index d8d886fa..d2cbfe50 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -1032,11 +1032,12 @@ def create_ui(wrap_gradio_gpu_call): gr.HTML(value="<p>A merger of the two checkpoints will be generated in your <b>checkpoint</b> directory.</p>")
with gr.Row():
- primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary Model Name")
- secondary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_secondary_model_name", label="Secondary Model Name")
+ primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary model (A)")
+ secondary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_secondary_model_name", label="Secondary model (B)")
+ tertiary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_tertiary_model_name", label="Tertiary model (C)")
custom_name = gr.Textbox(label="Custom Name (Optional)")
- interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Interpolation Amount', value=0.3)
- interp_method = gr.Radio(choices=["Weighted Sum", "Sigmoid", "Inverse Sigmoid"], value="Weighted Sum", label="Interpolation Method")
+ interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Interpolation amount (1 - M)', value=0.3)
+ interp_method = gr.Radio(choices=["Weighted Sum", "Sigmoid", "Inverse Sigmoid", "Add difference"], value="Weighted Sum", label="Interpolation Method")
save_as_half = gr.Checkbox(value=False, label="Save as float16")
modelmerger_merge = gr.Button(elem_id="modelmerger_merge", label="Merge", variant='primary')
@@ -1482,6 +1483,7 @@ Requested path was: {f} inputs=[
primary_model_name,
secondary_model_name,
+ tertiary_model_name,
interp_method,
interp_amount,
save_as_half,
@@ -1491,6 +1493,7 @@ Requested path was: {f} submit_result,
primary_model_name,
secondary_model_name,
+ tertiary_model_name,
component_dict['sd_model_checkpoint'],
]
)
|