Ryan Dick
db52f5606f
Merge branch 'main' into stalker-modular_freeu
2024-07-23 09:53:32 -04:00
Ryan Dick
de39c5ed21
Modular backend - add rescale cfg ( #6640 )
...
## Summary
Rescale CFG code from #6577 .
## Related Issues / Discussions
#6606
https://invokeai.notion.site/Modular-Stable-Diffusion-Backend-Design-Document-e8952daab5d5472faecdc4a72d377b0d
## QA Instructions
Run with and without set `USE_MODULAR_DENOISE` environment.
~~Note: for some reasons there slightly different output from run to
run, but I able sometimes to get same output on main and this branch.~~
Fix presented in #6641 .
## Merge Plan
~~Nope.~~ Merge #6641 firstly, to be able see output difference
properly.
If you think that there should be some kind of tests - feel free to add.
## Checklist
- [x] _The PR has a short but descriptive title, suitable for a
changelog_
- [ ] _Tests added / updated (if applicable)_
- [ ] _Documentation added / updated (if applicable)_
2024-07-23 09:45:30 -04:00
Ryan Dick
d014dc94fd
Merge branch 'main' into stalker7779/modular_rescale_cfg
2024-07-23 09:34:22 -04:00
Ryan Dick
39e804d0f8
Use consistent param names in patch_extension(...) functions: context -> ctx.
2024-07-23 09:18:04 -04:00
psychedelicious
154e8f6e78
chore(ui): lint
2024-07-23 15:42:16 +10:00
psychedelicious
2d31b82e60
feat(ui): tweak layout for warning message
2024-07-23 15:42:16 +10:00
psychedelicious
8f934747f3
feat(ui): updated upscale tab warnings
2024-07-23 15:42:16 +10:00
psychedelicious
4352341a00
feat(ui): starter models filter matches spandrel models to "upscale" search term
2024-07-23 15:42:16 +10:00
psychedelicious
d7e0ec52ff
feat(ui): make model install tab controlled
...
This lets us navigate directly to eg the Starter Models tab
2024-07-23 15:42:16 +10:00
psychedelicious
1072b74c0e
fix(ui): edge cases in starter models search
2024-07-23 15:42:16 +10:00
psychedelicious
46dc8c6641
chore(ui): lint
2024-07-23 15:42:16 +10:00
psychedelicious
a8bc6ab5b1
fix(ui): typos
2024-07-23 15:42:16 +10:00
Kent Keirsey
bd91bd4a84
Math Updates
2024-07-23 15:42:16 +10:00
psychedelicious
8756a6b8c3
fix(ui): remove sharpness param
2024-07-23 10:55:54 +10:00
psychedelicious
2e0cebb571
fix(ui): bug where viewer would disappear on upscaling tab
2024-07-23 10:55:54 +10:00
psychedelicious
c3a8184431
feat(ui): add number input to scale slider
2024-07-23 10:55:54 +10:00
psychedelicious
ffa39d74b3
feat(ui): remove first unsharp from upscale graph
2024-07-23 10:55:54 +10:00
psychedelicious
f9d3966ea2
feat(ui): add scale param to upscaling tab
2024-07-23 10:55:54 +10:00
psychedelicious
7cee4e42a7
feat(ui): add addEdgeToMetadata graph helper
2024-07-23 10:55:54 +10:00
psychedelicious
071c7c7c7e
chore(ui): typegen
2024-07-23 10:55:54 +10:00
psychedelicious
818045f678
tidy(ui): use × instead of translation string
2024-07-23 10:55:54 +10:00
psychedelicious
7edefbefff
feat(ui): add translation for upscaling tab
2024-07-23 10:55:54 +10:00
psychedelicious
29efab70b7
feat(nodes): spandrel_image_to_image.scale defaults to 4.0
2024-07-23 10:55:54 +10:00
psychedelicious
ac6adc392a
feat(nodes): add scale and fit_to_multiple_of_8 to spandrel node
2024-07-23 10:55:54 +10:00
psychedelicious
a2ef5d56ee
feat(nodes): split out spandrel node upscale logic into utils
2024-07-23 10:55:54 +10:00
Mary Hipp
13f3560e55
more lint fixes
2024-07-23 10:55:54 +10:00
Mary Hipp
c4bd60e00f
knip fix
2024-07-23 10:55:54 +10:00
Mary Hipp
54eda9163c
remove tiledVAE option and make it true
2024-07-23 10:55:54 +10:00
Mary Hipp
582f384fff
lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
a43211e650
math updates for controlnet tiles
2024-07-23 10:55:54 +10:00
Mary Hipp
6cb0581b0d
add description to upscale model dropdown tooltip
2024-07-23 10:55:54 +10:00
Mary Hipp
845d77916e
lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
f18431a999
use fn to get width/height of output image
2024-07-23 10:55:54 +10:00
Mary Hipp
5060bf2f62
lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
7854d913b2
add upscaling data to metadata
2024-07-23 10:55:54 +10:00
Mary Hipp
890a3ce32a
add limited metadata
2024-07-23 10:55:54 +10:00
Mary Hipp
fb4b3f3350
fix creativity/sharpness/structure scales, move where loras are added, get scale const working
2024-07-23 10:55:54 +10:00
Mary Hipp
d166b08b6a
restore scale but hardcode it to 2 regardless of upscale model
2024-07-23 10:55:54 +10:00
psychedelicious
5266e9e682
fix(ui): remove unused scale param
2024-07-23 10:55:54 +10:00
psychedelicious
d0265e21b0
fix(ui): use spandrel node for upscaling
2024-07-23 10:55:54 +10:00
psychedelicious
3126e8e49a
chore(ui): typegen
2024-07-23 10:55:54 +10:00
Mary Hipp
9e3412d776
translations and lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
4a09cc57be
use the tile conttrolnet in graph instad of marys hardcoded key
2024-07-23 10:55:54 +10:00
Mary Hipp
5ab36e0433
add warning if no upscale model or no tile controlnet for base model
2024-07-23 10:55:54 +10:00
Mary Hipp
d2bf3629bf
base scale off of upscale model selected
2024-07-23 10:55:54 +10:00
Mary Hipp
d9b217d908
hook up sharpness, structure, and creativity
2024-07-23 10:55:54 +10:00
Mary Hipp
2847f1b5ac
add vae toggle, lint fix
2024-07-23 10:55:54 +10:00
Mary Hipp
bc30850f3a
hardcode marys tile cnet key
2024-07-23 10:55:54 +10:00
Mary Hipp
7668dc68a0
cleanup, add loras
2024-07-23 10:55:54 +10:00
Mary Hipp
ea449f5a0a
upscale graph built, no multidiffusion yet
2024-07-23 10:55:54 +10:00
