Commit Graph

3207 Commits

Author SHA1 Message Date
Damian at mba
135c62f1a4 fix issue with hot-dog, improve () suppression 2022-10-27 07:37:48 -04:00
Lincoln Stein
582e19056a Merge branch 'development' of github.com:invoke-ai/InvokeAI into development 2022-10-27 02:06:25 -04:00
Lincoln Stein
52de5c8b33 documentation fix 2022-10-27 01:58:20 -04:00
Lincoln Stein
799dc6d0df acceptable integration of new prompting system and inpainting
This was a difficult merge because both PR #1108 and #1243 made
changes to obscure parts of the diffusion code.

- prompt weighting, merging and cross-attention working
  - cross-attention does not work with runwayML inpainting
    model, but weighting and merging are tested and working
- CLI command parsing code rewritten in order to get embedded
  quotes right
- --hires now works with runwayML inpainting
- --embiggen does not work with runwayML and will give an error
- Added an --invert option to invert masks applied to inpainting
- Updated documentation
2022-10-27 01:51:35 -04:00
Damian at mba
79689e87ce fix crash making embeddings from too-long prompts with attention weights 2022-10-26 22:42:17 -04:00
Lincoln Stein
0d0481ce75 inpaint model progress
- working with plain prompts, weighted prompts and merge prompts
- not tested with prompt2prompt
2022-10-26 22:40:01 -04:00
Lincoln Stein
869d9e22c7 documentation fix 2022-10-26 22:37:30 -04:00
Lincoln Stein
3f77b68a9d fix mishandling of embedded quotes in prompt 2022-10-26 18:27:35 -04:00
Lincoln Stein
2daf187bdb working with 1.4, 1.5, not with inpainting 1.5 2022-10-26 18:25:48 -04:00
cmdr2
e73a2d68b5 Add Library\usr\bin to the PATH 2022-10-26 15:38:08 -04:00
cmdr2
2dd5c0696d Repo URL constant 2022-10-26 15:38:08 -04:00
cmdr2
f25ad03011 header 2022-10-26 15:38:08 -04:00
cmdr2
c00da1702f Single-file installer script, micromamba will now be downloaded automatically on the first run; Activate the base environment before running the rest of the conda commands; Don't download conda/git again if it's already been installed by the installer 2022-10-26 15:38:08 -04:00
cmdr2
83f20c23aa Use the correct conda os arch for mac x64 2022-10-26 15:38:08 -04:00
cmdr2
0050176d57 Don't continue if micromamba was required but didn't initialize properly 2022-10-26 15:38:08 -04:00
cmdr2
f7bb90234d Fix line endings for mac 2022-10-26 15:38:08 -04:00
cmdr2
1d3c43b67f Add a pause before the script ends 2022-10-26 15:38:08 -04:00
cmdr2
ef505d2bc5 Update How to create the installers.md 2022-10-26 15:38:08 -04:00
cmdr2
a9a59a3046 Prefer the locally installed conda over any global conda installation 2022-10-26 15:38:08 -04:00
cmdr2
da012e1bfd Prefer the locally installed conda over any global conda installation; activate the env before updating 2022-10-26 15:38:08 -04:00
cmdr2
90c8aa716d Typo in bash path 2022-10-26 15:38:08 -04:00
cmdr2
94cd20de05 Typo in the bash script 2022-10-26 15:38:08 -04:00
cmdr2
14725f9d59 Initialize conda for the shell before running the activate 2022-10-26 15:38:08 -04:00
cmdr2
c6c146f54f Remove -y in linux script 2022-10-26 15:38:08 -04:00
cmdr2
90d9d6ea00 Typo in install.sh 2022-10-26 15:38:08 -04:00
cmdr2
1f62517636 Don't close after updating 2022-10-26 15:38:08 -04:00
cmdr2
29eea93592 Fix the tmp file used for checking the existence of git and conda commands 2022-10-26 15:38:08 -04:00
cmdr2
7179cc7f25 Remove unnecessary quotes while checking if git and conda exist 2022-10-26 15:38:08 -04:00
cmdr2
b12c8a28d7 Updated the installer to simplify the use of micromamba, and use conda for the actual installation; Update conda during the update script 2022-10-26 15:38:08 -04:00
cmdr2
8c2e82cc54 Make the linux/mac scripts executable 2022-10-26 15:38:08 -04:00
cmdr2
3ae094b673 Create the env using -y 2022-10-26 15:38:08 -04:00
cmdr2
74e6ce3e6a Check for missing python/git before activating micromamba 2022-10-26 15:38:08 -04:00
cmdr2
71426d200e 1-click installer using micromamba to install git and python into a contained environment (if necessary) before running the normal installation script 2022-10-26 15:38:08 -04:00
Lincoln Stein
9b7159720f resolve conflicts between PR #1108 and #1243 2022-10-26 15:37:24 -04:00
Kyle Schouviller
e7c2b90bd1 Merge branch 'outpaint' of https://github.com/Kyle0654/InvokeAI into outpaint 2022-10-26 12:12:17 -07:00
Kyle Schouviller
d05373d35a Force RGB for img2img 2022-10-26 12:12:08 -07:00
Kyle Schouviller
bd8bb8c80b Adding outpainting implementation (as part of inpaint). 2022-10-26 12:12:08 -07:00
Kyle Schouviller
dac1ab0a05 Better inpainting color-correction 2022-10-26 12:12:08 -07:00
Kyle Schouviller
2a44411f5b Force RGB for img2img 2022-10-26 12:09:38 -07:00
Lincoln Stein
2f1c1e7695 Merge branch 'fix-prompts' of https://github.com/damian0815/InvokeAI into merge-prompt-and-inpaint-model 2022-10-26 08:50:55 -04:00
Lincoln Stein
2b6d78e436 minor cleanups
- remove --fnformat from canonicalized dream prompt arguments
  (not needed for image reproducibility)
- add -tm to canonicalized dream prompt arguments
  (definitely needed for image reproducibility)
2022-10-26 08:32:54 -04:00
Lincoln Stein
b1da13a984 minor cleanups
- change default model back to 1.4
- remove --fnformat from canonicalized dream prompt arguments
  (not needed for image reproducibility)
- add -tm to canonicalized dream prompt arguments
  (definitely needed for image reproducibility)
2022-10-26 08:29:56 -04:00
cmdr2
d03947a6ee Add Library\usr\bin to the PATH 2022-10-26 16:39:21 +05:30
cmdr2
422f2ecc91 Repo URL constant 2022-10-26 15:38:49 +05:30
cmdr2
f73a116f43 header 2022-10-26 15:35:42 +05:30
cmdr2
8aa40714e3 Single-file installer script, micromamba will now be downloaded automatically on the first run; Activate the base environment before running the rest of the conda commands; Don't download conda/git again if it's already been installed by the installer 2022-10-26 15:30:48 +05:30
Kyle Schouviller
eaf6d46a7b Adding outpainting implementation (as part of inpaint). 2022-10-26 00:39:36 -07:00
Lincoln Stein
906dafe3cd make variations work with inpainting model 2022-10-26 00:18:31 -04:00
Lincoln Stein
d3047c7cb0 do not encode init image in starting latent 2022-10-25 22:44:42 -04:00
tyler
62412f8398 fixing aspect ratio on hires 2022-10-25 21:28:50 -05:00