mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2025-01-01 20:35:06 +08:00
Respect --ckpt-dir command-line argument when merging models (#1261)
* Update .gitignore to ignore *all* checkpoint files in /models * Fixed typo in UI
This commit is contained in:
parent
7acfaca05a
commit
041d2aefc0
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,7 +4,7 @@ __pycache__
|
|||||||
/venv
|
/venv
|
||||||
/tmp
|
/tmp
|
||||||
/model.ckpt
|
/model.ckpt
|
||||||
/models/*.ckpt
|
/models/**/*.ckpt
|
||||||
/GFPGANv1.3.pth
|
/GFPGANv1.3.pth
|
||||||
/gfpgan/weights/*.pth
|
/gfpgan/weights/*.pth
|
||||||
/ui-config.json
|
/ui-config.json
|
||||||
|
@ -869,7 +869,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
|
|||||||
with gr.Blocks() as modelmerger_interface:
|
with gr.Blocks() as modelmerger_interface:
|
||||||
with gr.Row().style(equal_height=False):
|
with gr.Row().style(equal_height=False):
|
||||||
with gr.Column(variant='panel'):
|
with gr.Column(variant='panel'):
|
||||||
gr.HTML(value="<p>A merger of the two checkpoints will be generated in your <b>/models</b> directory.</p>")
|
gr.HTML(value="<p>A merger of the two checkpoints will be generated in your <b>checkpoint</b> directory.</p>")
|
||||||
|
|
||||||
with gr.Row():
|
with gr.Row():
|
||||||
primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary Model Name")
|
primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary Model Name")
|
||||||
|
Loading…
Reference in New Issue
Block a user