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:
William Moorehouse 2022-09-28 18:00:48 -04:00 committed by GitHub
parent 7acfaca05a
commit 041d2aefc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View File

@ -4,7 +4,7 @@ __pycache__
/venv
/tmp
/model.ckpt
/models/*.ckpt
/models/**/*.ckpt
/GFPGANv1.3.pth
/gfpgan/weights/*.pth
/ui-config.json

View File

@ -869,7 +869,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
with gr.Blocks() as modelmerger_interface:
with gr.Row().style(equal_height=False):
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():
primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary Model Name")