aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update image_embedding.pyDepFA2022-10-211-2/+2
|
* Use opts in textual_inversion image_embedding.py for dynamic fontsDepFA2022-10-211-0/+1
|
* make aestetic embedding ciompatible with prompts longer than 75 tokensAUTOMATIC2022-10-211-1/+1
|
* Merge remote-tracking branch 'origin/master'AUTOMATIC2022-10-211-0/+5
|\
| * wtf is happeningLeo Mozoloa2022-10-211-0/+5
| |
* | do not load aesthetic clip model until it's neededAUTOMATIC2022-10-218-39/+89
| | | | | | | | | | add refresh button for aesthetic embeddings add aesthetic params to images' infotext
* | Merge branch 'ae'AUTOMATIC2022-10-219-21/+326
|\ \ | |/ |/|
| * Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-1911-45/+296
| |\
| * \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-1815-92/+174
| |\ \
| * \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-1816-60/+287
| |\ \ \
| * \ \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-163-2/+19
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-1610-60/+114
| |\ \ \ \ \
| * | | | | | ui fix, re organization of the codeMalumaDev2022-10-169-157/+233
| | | | | | |
| * | | | | | ui fixMalumaDev2022-10-161-1/+1
| | | | | | |
| * | | | | | ui fixMalumaDev2022-10-164-14/+18
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/test_resolve_conflicts' into ↵MalumaDev2022-10-156-26/+30
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | test_resolve_conflicts
| | * \ \ \ \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-156-26/+30
| | |\ \ \ \ \ \
| * | | | | | | | fixed dropbox updateMalumaDev2022-10-151-2/+2
| |/ / / / / / /
| * | | | | | | Add support to other img format, fixed dropbox updateMalumaDev2022-10-151-5/+5
| | | | | | | |
| * | | | | | | Update modules/ui.pyMalumaDev2022-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
| * | | | | | | Update modules/ui.pyMalumaDev2022-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
| * | | | | | | Update modules/ui.pyMalumaDev2022-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
| * | | | | | | Update modules/aesthetic_clip.pyMalumaDev2022-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
| * | | | | | | Update README.mdMalumaDev2022-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
| * | | | | | | Update modules/ui.pyMalumaDev2022-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
| * | | | | | | Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-1532-293/+1095
| |\ \ \ \ \ \ \
| * | | | | | | | fix to tokens lenght, addend embs generator, add new features to edit the ↵MalumaDev2022-10-156-96/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedding before the generation using text
| * | | | | | | | initMalumaDev2022-10-149-38/+172
| | | | | | | | |
* | | | | | | | | Fix Hypernet infotext string split bug for PR #3283AUTOMATIC2022-10-211-1/+1
| | | | | | | | |
* | | | | | | | | turns out LayerNorm also has weight and bias and needs to be pre-multiplied ↵AUTOMATIC2022-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and trained for hypernets
* | | | | | | | | Merge pull request #3197 from AUTOMATIC1111/training-help-textAUTOMATIC11112022-10-216-23/+50
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Training UI Changes
| * \ \ \ \ \ \ \ \ Merge branch 'master' into training-help-textAUTOMATIC11112022-10-2121-138/+689
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Remove redundant try/except.timntorres2022-10-211-5/+1
| | | | | | | | | |
* | | | | | | | | | Revise comments.timntorres2022-10-212-2/+2
| | | | | | | | | |
* | | | | | | | | | Do nothing if image file already exists.timntorres2022-10-211-1/+5
| | | | | | | | | |
* | | | | | | | | | Issue #2921-Give PNG info to Hypernet previews.timntorres2022-10-211-2/+7
| | | | | | | | | |
* | | | | | | | | | Allow datasets with only 1 image in TIguaneec2022-10-211-2/+2
| | | | | | | | | |
* | | | | | | | | | interrogate: Fix CLIP-interrogation on CPUPatryk Wychowaniec2022-10-211-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, trying to perform CLIP interrogation on a CPU fails, saying: ``` RuntimeError: "slow_conv2d_cpu" not implemented for 'Half' ``` This merge request fixes this issue by detecting whether the target device is CPU and, if so, force-enabling `--no-half` and passing `device="cpu"` to `clip.load()` (which then does some extra tricks to ensure it works correctly on CPU).
* | | | | | | | | | [Bugfix][API] - Fix API arg in launch scriptStephen2022-10-211-2/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #3263 from mezotaken/masterAUTOMATIC11112022-10-211-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix skip and interrupt buttons for Highres. fix option enabled
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into masterAUTOMATIC11112022-10-2110-36/+495
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | a more strict check for activation type and a more reasonable check for type ↵AUTOMATIC2022-10-211-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of layer in hypernets
* | | | | | | | | | | Merge pull request #3199 from discus0434/masterAUTOMATIC11112022-10-213-11/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add features to insert activation functions to hypernetworks
| * | | | | | | | | | | add linear as a act func (option for doin nothing)discus04342022-10-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'AUTOMATIC1111:master' into masterdiscus04342022-10-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | align ui.py imports with upstreamdiscus04342022-10-201-19/+18
| | | | | | | | | | | | |
| * | | | | | | | | | | | updatediscus04342022-10-2010-63/+143
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'AUTOMATIC1111:master' into masterdiscus04342022-10-2010-64/+144
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | updatediscus04342022-10-203-31/+44
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'AUTOMATIC1111:master' into masterdiscus04342022-10-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \