10 Commits

Author	SHA1	Message	Date
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	5e8d1ca19f	resolve conflicts	2022-10-25 07:17:54 -04:00
Damian at mba	63902f3d34	also apply conditioing during hires fix upscale	2022-10-24 02:08:55 +02:00
Damian at mba	1fb15d5c81	fix hires fix	2022-10-24 02:02:42 +02:00
Damian at mba	7d677a63b8	cross attention control options	2022-10-23 14:58:25 +02:00
Damian at mba	2bf9f1f0d8	rename StrcuturedConditioning to ExtraConditioningInfo	2022-10-21 12:18:40 +02:00
Damian at mba	c9d27634b4	bring in prompt parser from fix-prompts branch ... attention is parsed but ignored, blends old syntax doesn't work, conjunctions are parsed but ignored, the only part that's used here is the new .blend() syntax and cross-attention control using .swap()	2022-10-20 12:01:48 +02:00
Damian at mba	1ffd4a9e06	refactored single diffusion path seems to be working for all samplers	2022-10-19 21:08:03 +02:00
Damian at mba	2b79a716aa	wip hi-res fix	2022-10-19 21:08:03 +02:00
Lincoln Stein	2b1aaf4ee7	rename all modules from ldm.dream to ldm.invoke ... - scripts and documentation updated to match - ran preflight checks on both web and CLI and seems to be working	2022-10-08 11:37:23 -04:00