Lincoln Stein
b815aa2130
Merge branch 'development' into outpaint
2022-10-27 17:17:34 -04:00
Lincoln Stein
9b7159720f
resolve conflicts between PR #1108 and #1243
2022-10-26 15:37:24 -04:00
Kyle Schouviller
d05373d35a
Force RGB for img2img
2022-10-26 12:12:08 -07:00
Lincoln Stein
906dafe3cd
make variations work with inpainting model
2022-10-26 00:18:31 -04:00
Lincoln Stein
aaf7a4f1d3
inpaint and txt2img working with ddim sampler
2022-10-25 10:00:28 -04:00
Damian at mba
194c8e1c2e
Merge branch 'development' into fix-prompts
2022-10-24 11:28:37 +02:00
Damian at mba
cc2042bd4c
keep the effect of _start and _end arguments consistent across k* and other samplers
2022-10-24 01:43:35 +02:00
Lincoln Stein
9472945299
ported code refactor changes from PR #1221
...
- pass a PIL.Image to img2img and inpaint rather than tensor
- To support clipseg, inpaint needs to accept an "L" or "1" format
mask. Made the appropriate change.
2022-10-23 09:33:15 -04:00
Damian at mba
7d677a63b8
cross attention control options
2022-10-23 14:58:25 +02:00
Damian at mba
64051d081c
cleanup
2022-10-21 15:07:11 +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
582880b314
add cross-attention support to im2img; prevent inpainting from crashing
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