aboutsummaryrefslogtreecommitdiffstats
path: root/modules
Commit message (Collapse)AuthorAgeFilesLines
* prevent error spam when processing images without txt files for captionsAUTOMATIC2022-10-211-5/+4
|
* Merge branch 'master' into fix/train-preprocess-keep-ratioAUTOMATIC11112022-10-2120-112/+976
|\
| * loading SD VAE, see PR #3303AUTOMATIC2022-10-211-1/+4
| |
| * make aspect ratio overlay work regardless of selected localizationAUTOMATIC2022-10-211-2/+2
| |
| * Change option description of unload_models_when_trainingRcmcpe2022-10-211-1/+1
| |
| * Remove unused variable.timntorres2022-10-211-1/+0
| |
| * Refer to Hypernet's name, sensibly, by its name variable.timntorres2022-10-211-1/+1
| |
| * Match hypernet name with filename in all cases.timntorres2022-10-211-1/+7
| |
| * Sanitize hypernet name input.timntorres2022-10-211-0/+3
| |
| * 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
| |
| * do not load aesthetic clip model until it's neededAUTOMATIC2022-10-217-38/+88
| | | | | | | | | | add refresh button for aesthetic embeddings add aesthetic params to images' infotext
| * Merge branch 'ae'AUTOMATIC2022-10-218-21/+324
| |\
| | * Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-198-29/+254
| | |\
| | * \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-189-69/+103
| | |\ \
| | * \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-187-26/+90
| | |\ \ \
| | * \ \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-162-1/+18
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-167-50/+93
| | |\ \ \ \ \
| | * | | | | | 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-154-16/+24
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | test_resolve_conflicts
| | | * \ \ \ \ \ Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-154-16/+24
| | | |\ \ \ \ \ \
| | * | | | | | | | 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 modules/ui.pyMalumaDev2022-10-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Víctor Gallego <vicgalle@ucm.es>
| | * | | | | | | Merge branch 'master' into test_resolve_conflictsMalumaDev2022-10-1515-233/+649
| | |\ \ \ \ \ \ \
| | * | | | | | | | 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-147-38/+171
| | | | | | | | | |
| * | | | | | | | | 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 branch 'master' into training-help-textAUTOMATIC11112022-10-2111-82/+552
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 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).
| | * | | | | | | | | Merge branch 'master' into masterAUTOMATIC11112022-10-218-36/+493
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | 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-203-9/+11
| | | | |\ \ \ \ \ \ \ \ \ \