Ryan Dick
388554448a
Add CLIP Vision model to IP-Adapter info and use this to infer which model to use.
2023-09-14 11:57:53 -04:00
Ryan Dick
d5160648d0
Add support for downloading IP-Adapter models from HF.
2023-09-14 11:18:43 -04:00
Ryan Dick
6d0ea42a94
Get CLIPVision model download from HF working.
2023-09-14 09:54:10 -04:00
Ryan Dick
2c1100509f
Add BaseModelType.Any to be used by CLIPVisionModel.
2023-09-14 08:19:55 -04:00
Ryan Dick
c34b359c36
(minor) Remove duplicate TODO.
2023-09-13 21:25:20 -04:00
Ryan Dick
77d135967f
Update IPAdapterModel to respect requested torch_dtype.
2023-09-13 21:06:42 -04:00
Ryan Dick
ebf26687cb
(minor) Remove unnecessary TODO.
2023-09-13 21:03:42 -04:00
Ryan
2f5e923008
Removed duplicate import in model_cache.py
2023-09-13 19:33:43 -04:00
Ryan
b7296000e4
made MPS calls conditional on MPS actually being the chosen device with backend available
2023-09-13 19:33:43 -04:00
Ryan
fab055995e
Add empty_cache() for MPS hardware.
2023-09-13 19:33:43 -04:00
Ryan Dick
1c8991a3df
Use CLIPVisionModel under model management for IP-Adapter.
2023-09-13 19:10:02 -04:00
Ryan Dick
3d52656176
Add CLIPVisionModel to model management.
2023-09-13 17:14:20 -04:00
Kevin Turner
090db1ab3a
Merge remote-tracking branch 'origin/main' into feat/taesd
2023-09-13 09:17:53 -07:00
Ryan Dick
3ee9a21647
Initial (barely) working version of IP-Adapter model management.
2023-09-13 08:27:24 -04:00
Ryan Dick
0d823901ef
Add IPAdapter to model_management __init__.py
2023-09-13 08:27:24 -04:00
Ryan Dick
7ee55489bb
Improve model search warning messages.
2023-09-13 08:27:24 -04:00
Ryan Dick
163ece9aee
Initial skeleton for IPAdapter model management.
2023-09-13 08:27:24 -04:00
Martin Kristiansen
e467ca7f1b
Apply black, isort, flake8
2023-09-12 13:01:58 -04:00
Martin Kristiansen
e88d7c242f
isort wip 3
2023-09-12 13:01:58 -04:00
Martin Kristiansen
caea6d11c6
isort wip 2
2023-09-12 13:01:58 -04:00
Millun Atluri
88db094cf2
Merge branch 'main' into feat/taesd
2023-09-11 22:11:25 +10:00
Ryan Dick
50a0691514
flake8
2023-09-08 18:05:31 -04:00
Ryan Dick
a255624984
black
2023-09-08 17:55:23 -04:00
Ryan Dick
2630fe3608
Remove unused ip_adapter/utils.py file.
2023-09-08 16:25:34 -04:00
Ryan Dick
6ca6cf713c
Tidy IPAdapter. Add types, improve field/method naming.
2023-09-08 16:00:58 -04:00
Ryan Dick
3f7d5b4e0f
Remove redundant IPAdapterXL class.
2023-09-08 15:46:10 -04:00
Ryan Dick
91596d9527
Re-factor IPAdapter to patch UNet in a context manager.
2023-09-08 15:39:22 -04:00
Ryan Dick
d669f0855d
Comment unused IPAdapter generate(...) methods.
2023-09-08 13:12:42 -04:00
Ryan Dick
b2d5b53b5f
Pass IP-Adapter conditioning via cross_attention_kwargs instead of concatenating to the text embedding. This avoids interference with other features that manipulate the text embedding (e.g. long prompts).
2023-09-08 11:47:36 -04:00
Ryan Dick
ddc148b70b
Move ConditioningData and its field classes to their own file. This will allow new conditioning types to be added more cleanly without introducing circular dependencies.
2023-09-08 11:00:11 -04:00
Ryan Dick
c2d43f007b
Specify the image_embedding_len in the IPAttnProcessor rather than the text embedding length. This enables the IPAttnProcessor to handle text embeddings of varying lengths.
2023-09-07 18:20:21 -04:00
Ryan Dick
7703bf2ca1
Delete IP-Adapter copies of AttnProcessor and AttnProcessor2_0, which were unmodified from diffusers.
2023-09-07 15:00:13 -04:00
Millun Atluri
b5e1ba34b3
Merge branch 'main' into refactor/rename-get-logger
2023-09-07 23:19:59 +10:00
Ryan Dick
23fdf0156f
Clean up IP-Adapter in diffusers_pipeline.py - WIP
2023-09-06 20:42:20 -04:00
Ryan Dick
d776e0a0a9
Split ControlField and IpAdapterField.
2023-09-06 17:03:37 -04:00
Lincoln Stein
c54c1f603b
Merge branch 'main' into bugfix/set-vram-on-macs
2023-09-05 07:09:39 -04:00
blessedcoolant
f44496a579
Merge branch 'main' into feat/ip-adapter
2023-09-05 15:22:15 +12:00
psychedelicious
95ecb1a0c1
fix(ip_adapter): add None to types
2023-09-05 12:30:00 +10:00
blessedcoolant
a9fafad5b5
chore: sync, lint & update
2023-09-05 14:17:23 +12:00
Lincoln Stein
d2e327add9
install models/core/misc/lama/lama.pt
2023-09-04 21:54:40 -04:00
psychedelicious
58aa159a50
fix(backend): fix remaining instances of getLogger()
2023-09-05 10:43:30 +10:00
psychedelicious
d8f7c19030
Merge branch 'main' into refactor/rename-get-logger
2023-09-05 10:37:53 +10:00
blessedcoolant
3ac68cde66
chore: flake8 cleanup
2023-09-05 12:07:12 +12:00
blessedcoolant
65a76a086b
cleanup: Some basic cleanup
2023-09-05 11:54:28 +12:00
blessedcoolant
07381e5a26
cleanup: merge conflicts
2023-09-05 11:37:12 +12:00
blessedcoolant
6bb378a101
Merge branch 'main' into feat/ip-adapter
2023-09-05 11:35:19 +12:00
blessedcoolant
917c2c480e
Merge branch 'main' into lama-infill
2023-09-03 23:16:34 +12:00
blessedcoolant
f1f7778e73
Merge branch 'main' into chore/clean-up-unused-files
2023-09-03 02:59:31 +12:00
Lincoln Stein
c965d3eb6b
Merge branch 'main' into bugfix/set-vram-on-macs
2023-09-02 10:08:13 -04:00
blessedcoolant
ec09e21fc2
Merge branch 'main' into lama-infill
2023-09-02 23:02:38 +12:00
Kevin Turner
7df67d077a
Merge branch 'main' into feat/taesd
2023-09-01 22:18:40 -07:00
Lincoln Stein
6f6d920686
[Feature] Support the XL inpainting model ( #4431 )
...
* add StableDiffusionXLInpaintPipeline to probe list
* add StableDiffusionXLInpaintPipeline to probe list
* Blackified (?)
---------
Authored-by: Lincoln Stein <lstein@gmail.com>
Mucked about with to get it merged by: Kent Keirsey <31807370+hipsterusername@users.noreply.github.com>
2023-09-01 22:58:14 -04:00
psychedelicious
4b78deba92
Merge branch 'main' into bugfix/set-vram-on-macs
2023-09-02 11:33:20 +10:00
psychedelicious
b761807219
Merge branch 'main' into feat/ip-adapter
2023-09-02 11:31:08 +10:00
psychedelicious
9cb04f6f80
chore: remove unused files
2023-09-02 11:12:19 +10:00
blessedcoolant
48484e9fc8
Merge branch 'main' into lama-infill
2023-09-02 11:08:31 +12:00
blessedcoolant
a12fbc7406
chore: black fix
2023-09-02 10:51:53 +12:00
Sergey Borisov
5151798a16
Cleanup memory after model run
2023-09-01 20:50:39 +03:00
blessedcoolant
1a9f552a75
experimental: Add CV2 Infill
2023-09-02 04:48:18 +12:00
user1
fb1b03960e
Added IP-Adapter SDXL support. Added IP-Adapter "Plus" (more detail) model support.
2023-09-01 04:40:30 -07:00
user1
74bfb5e1f9
First commit of separate node for IP-Adapter.
...
And it own dataclasses for passing info.
2023-08-31 23:07:15 -07:00
Kevin Turner
bc1bce18b0
Merge branch 'main' into feat/taesd
2023-08-31 20:26:10 -07:00
Lincoln Stein
44b49c7f2d
fixed true source of problem
2023-08-31 22:55:17 -04:00
Lincoln Stein
52a5f1f56f
prevent from trying to set vram on macs
2023-08-31 22:50:53 -04:00
blessedcoolant
b94ec14853
chore: Black lint fix
2023-09-01 09:19:10 +12:00
blessedcoolant
54cda8ea42
chore: Change LaMA log statement to use InvokeAI Logger
2023-09-01 09:17:41 +12:00
Lincoln Stein
b567d65032
blackify and rerun frontend build
2023-08-31 10:35:17 -04:00
user1
5a9993772d
Added ip_adapter_strength parameter to adjust weighting of IP-Adapter's added cross-attention layers
2023-08-30 17:28:30 -07:00
user1
9f86cfa471
Working POC of IP-Adapters. Not fully nodified yet.
2023-08-30 17:28:30 -07:00
user1
8c1390166f
Modifying code from https://github.com/tencent-ailab/IP-Adapter . Also adding license notice at top.
2023-08-30 17:28:30 -07:00
user1
1ad98ce999
Core ip_adapter files from https://github.com/tencent-ailab/IP-Adapter
...
Copied into InvokeAI since IP-Adapter repo is not a package. Is there a better way to do this for non-packaged Python code while still keeping InvokeAI install easy?
2023-08-30 17:28:30 -07:00
Lincoln Stein
83163ddd9a
fix migrate script to work when autoimport directories are None
2023-08-30 18:46:17 -04:00
Sergey Borisov
8562dbaaa8
Hotfix to make second order schedulers work with mask
2023-08-30 02:18:08 +03:00
blessedcoolant
cfee8d9804
chore: seamless print statement cleanup
2023-08-29 13:09:30 +12:00
blessedcoolant
4196c669a0
chore: black / flake lint errors
2023-08-29 12:57:26 +12:00
blessedcoolant
a1398dec91
Merge branch 'main' into pr/4112
2023-08-29 12:56:59 +12:00
blessedcoolant
605e13eac0
chore: black fix
2023-08-29 07:50:17 +12:00
Kent Keirsey
2a1d7342a7
Seamless Patch from Stalker
2023-08-28 15:48:05 -04:00
blessedcoolant
99475ab800
chore: pyflake lint fixes
2023-08-29 05:16:23 +12:00
Sergey Borisov
2bf747caf6
Blackify
2023-08-28 18:36:27 +03:00
StAlKeR7779
cd548f73fd
Merge branch 'main' into feat_compel_and
2023-08-28 18:31:41 +03:00
Sergey Borisov
bb085c5fba
Move monkeypatch for diffusers/torch bug to hotfixes.py
2023-08-28 18:29:49 +03:00
Kent Keirsey
421f5b7d75
Seamless Updates
2023-08-28 08:43:08 -04:00
blessedcoolant
3ef36707a8
chore: Black lint
2023-08-28 23:10:00 +12:00
Kent Keirsey
b9731cb434
Merge branch 'main' into Seamless
2023-08-28 00:12:23 -04:00
Kent Keirsey
1f476692da
Seamless fixes
2023-08-28 00:10:46 -04:00
Kent Keirsey
5fdd25501b
updates per stalkers comments
2023-08-27 22:54:53 -04:00
Sergey Borisov
b65c9ad612
Add monkeypatch for xformers to align unaligned attention_mask
2023-08-28 04:50:58 +03:00
Millun Atluri
24132a7950
Merge branch 'main' into refactor/rename-get-logger
2023-08-28 11:38:37 +10:00
StAlKeR7779
3e6c49001c
Change antialias to True as input - image
...
Co-authored-by: Lincoln Stein <lincoln.stein@gmail.com>
2023-08-28 02:54:39 +03:00
Kent Keirsey
ea40a7844a
add VAE
2023-08-27 14:53:57 -04:00
Kent Keirsey
0d2e194213
Fixed dict error
2023-08-27 14:21:56 -04:00
Kent Keirsey
3de45af734
updates
2023-08-27 14:13:00 -04:00
Sergey Borisov
526c7e7737
Provide antialias argument as behaviour will be changed in future(deprecation warning)
2023-08-27 20:04:55 +03:00
blessedcoolant
e9633a3adb
Merge branch 'main' into fix/inpaint_gen
2023-08-27 02:54:19 +12:00
Kevin Turner
dff466244d
Merge remote-tracking branch 'origin/main' into feat/taesd
...
# Conflicts:
# invokeai/app/invocations/latent.py
2023-08-25 15:21:47 -07:00
Lincoln Stein
0bf5fee1b2
correct solution to crash
2023-08-24 23:16:03 -04:00
Lincoln Stein
8114fc7bc2
UI tweak to column select
2023-08-24 23:16:03 -04:00
Lincoln Stein
f9d2bcce04
blackify
2023-08-24 23:16:03 -04:00
Lincoln Stein
84bf2a03e9
fix crash that occurs when no invokeai.yaml is present
2023-08-24 23:16:03 -04:00
blessedcoolant
fa3fcd7820
cleanup: Lama
2023-08-23 23:05:29 -04:00
blessedcoolant
5eb6148336
chore: black fix
2023-08-23 23:05:29 -04:00
blessedcoolant
49892faee4
experimental: LaMa Infill
2023-08-23 23:05:29 -04:00
Lincoln Stein
45d172d5a8
Merge branch 'main' into refactor/rename-get-logger
2023-08-20 16:08:32 -04:00
Lincoln Stein
ef317be1f9
blackify (again)
2023-08-20 15:46:12 -04:00
Lincoln Stein
027b84d1aa
add noqa comments to util/__init__
2023-08-20 15:43:17 -04:00
Lincoln Stein
11b670755d
fix flake8 error
2023-08-20 15:39:45 -04:00
Lincoln Stein
a536719fc3
blackify
2023-08-20 15:27:51 -04:00
Lincoln Stein
8e6d88e98c
resolve merge conflicts
2023-08-20 15:26:52 -04:00
Kevin Turner
6f9c1c6d4e
Merge remote-tracking branch 'origin/dep/diffusers020' into feat/taesd
...
# Conflicts:
# invokeai/app/invocations/latent.py
2023-08-18 14:19:27 -07:00
Kevin Turner
2fef478497
fix(convert_ckpt): Removed is_safetensors_available
as safetensors is now a required dependency.
2023-08-18 11:05:59 -07:00
Kevin Turner
6df6abf6f6
Merge branch 'main' into dep/diffusers020
2023-08-18 11:02:52 -07:00
psychedelicious
3c43594c26
Merge branch 'main' into fix/inpaint_gen
2023-08-18 15:57:48 +10:00
Martin Kristiansen
ce465acf04
Fixed OnnxRuntimeModel import
2023-08-18 15:52:04 +10:00
Martin Kristiansen
33ee418d8c
Fixing class level import
2023-08-18 15:52:04 +10:00
Martin Kristiansen
537ae2f901
Resolving merge conflicts for flake8
2023-08-18 15:52:04 +10:00
Kevin Turner
26a7b7b66d
feat(model_probe): provide more clues when we fail to load a model.
2023-08-17 20:08:53 -07:00
Kevin Turner
8611ffe32d
feat(TAESD): support TAESD — Tiny Autoencoder for Stable Diffusion
2023-08-17 20:08:53 -07:00
Kevin Turner
98a4cc20a9
Merge branch 'main' into dep/diffusers020
2023-08-17 20:04:11 -07:00
Lincoln Stein
e2bdcc0271
Merge branch 'main' into refactor/rename-performance-options
2023-08-17 22:36:08 -04:00
Lincoln Stein
ffd0f5924b
pass lazy_offload to model cache
2023-08-17 22:35:16 -04:00
Sergey Borisov
cfd827cfad
Added node for creating mask inpaint
2023-08-18 04:07:40 +03:00
Lincoln Stein
3cb6d333f6
Merge branch 'main' into refactor/rename-get-logger
2023-08-17 20:31:30 -04:00
Lincoln Stein
1d107f30e5
remove getLogger() completely
2023-08-17 19:17:38 -04:00
Lincoln Stein
79084e9e20
Merge branch 'main' into refactor/rename-get-logger
2023-08-17 19:01:17 -04:00
Lincoln Stein
4ebe839d54
Merge branch 'main' into bugfix/enable-links-in-autoimport
2023-08-17 18:55:45 -04:00
Lincoln Stein
bc16b50302
add followlinks to all os.walk() calls
2023-08-17 18:54:18 -04:00
Kevin Turner
4267132926
dep(diffusers): upgrade diffusers to 0.20
...
Removed `is_safetensors_available` as safetensors is now a required dependency of diffusers.
2023-08-17 13:42:29 -07:00
Lincoln Stein
e9a294f733
Merge branch 'main' into fix/inpaint_gen
2023-08-17 16:13:33 -04:00
Lincoln Stein
b69f26c85c
add support for "balanced" attention slice size
2023-08-17 16:11:09 -04:00
Lincoln Stein
1102c12084
Merge branch 'main' into fix/sdxl_controlnet
2023-08-17 15:40:51 -04:00
Lincoln Stein
b5cee7d20c
blackify chore
2023-08-17 15:40:15 -04:00
Lincoln Stein
23b4e1cea0
Merge branch 'main' into refactor/rename-performance-options
2023-08-17 14:43:00 -04:00
Lincoln Stein
c19835c2d0
wired attention configuration into backend
2023-08-17 14:20:45 -04:00
Lincoln Stein
ed38eaa10c
refactor InvokeAIAppConfig
2023-08-17 13:47:26 -04:00
Lincoln Stein
842eb4bb0a
Merge branch 'main' into bugfix/enable-links-in-autoimport
2023-08-17 07:20:26 -04:00
Sergey Borisov
5aa7bfebd4
Fix masked generation with inpaint models
2023-08-16 20:28:33 +03:00
Lincoln Stein
fc9b4539a3
Merge branch 'main' into refactor/rename-get-logger
2023-08-16 09:19:52 -04:00
Lincoln Stein
bb1b8ceaa8
Update invokeai/backend/model_management/model_cache.py
...
Co-authored-by: StAlKeR7779 <stalkek7779@yandex.ru>
2023-08-16 08:48:44 -04:00
Lincoln Stein
f9958de6be
added memory used to load models
2023-08-15 21:56:19 -04:00
Lincoln Stein
ec10aca91e
report RAM and RAM cache statistics
2023-08-15 21:00:30 -04:00
Lincoln Stein
d6c9bf5b38
added sdxl controlnet detection
2023-08-15 12:51:15 -04:00
Sergey Borisov
4f82273fc4
Update 'monkeypatched' controlnet class
2023-08-15 11:07:43 -04:00
Lincoln Stein
b2934be6ba
use as_posix() instead of str()
2023-08-14 22:59:26 -04:00
Lincoln Stein
eab67b6a01
fixed actual bug
2023-08-14 22:59:26 -04:00
Lincoln Stein
5190a4c282
further removal of Paths
2023-08-14 22:59:26 -04:00
Lincoln Stein
141d438517
prevent windows from crashing with a WindowsPath serialization error on merge
2023-08-14 22:59:26 -04:00
psychedelicious
549d2e0485
chore: remove old web server code and python deps
2023-08-15 10:54:57 +10:00
Lincoln Stein
09ef57718e
fix docs
2023-08-14 20:20:35 -04:00
Lincoln Stein
cab8239ba8
add get_logger() as alias for getLogger()
2023-08-14 20:18:09 -04:00