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

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

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ __pycache__ 
/venv

/tmp

/model.ckpt

/models/*.ckpt

/models/**/*.ckpt

/GFPGANv1.3.pth

/gfpgan/weights/*.pth

/ui-config.json

modules/ui.py

+1 −1
Original line number Diff line number Diff line
@@ -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")

CRA Git | Maintained and supported by SUSTech CRA and CCSE