Unverified Commit 041d2aef authored by William Moorehouse's avatar William Moorehouse Committed by GitHub

Respect --ckpt-dir command-line argument when merging models (#1261)

* Update .gitignore to ignore *all* checkpoint files in /models
* Fixed typo in UI
parent 7acfaca0
...@@ -4,7 +4,7 @@ __pycache__ ...@@ -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): ...@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment