Respect --ckpt-dir command-line argument when merging models

[moorehousew]

--ckpt-dir is now respected by the checkpoint merging code, and subdirectories are supported. Fixes #1224.

[moorehousew]

Also fixed .gitignore again- checkpoint files in subdirectories of /models will now be ignored.

[AUTOMATIC1111]

you're meant to be able to input absolute filename (including extension) in there - this is what os.path.exists is checking for. If the absolute filename does not exist, then you should check cmd_opts.ckpt_dir instead of 'models/'

[AUTOMATIC1111]

and cmd_opts.ckpt_dir should be just assumed to exist

[moorehousew]

Could you clarify? The current UI behavior seems to prevent someone from ever entering an absolute filename for a checkpoint. Can assume ckpt_dir exists though.

[AUTOMATIC1111]

oh, now i get it; it has been updated to use the dropdown and I forgot about that

[moorehousew]

Let me test if it still works as expected with your changes- better to leave that functionality in for later, I'd imagine.

EDIT: It did not work, the model output name got garbled. This should do for now.

[moorehousew]

Alright, it works as expected now with the assumption that ckpt_dir always exists.

[moorehousew]

Looks like you added most of the changes to master already- don't forget the .gitignore and UI fixes.