Lincoln Stein
73be58a0b5
fix issue #3293
2023-04-29 11:37:07 -04:00
Lincoln Stein
5a7d11bca8
remove debugging statement
2023-04-27 08:21:26 -04:00
Lincoln Stein
bfb968bbe8
Merge branch 'v2.3' into fix/new_diffusers_names
2023-04-26 23:54:37 +01:00
Sergey Borisov
432e526999
Revert merge changes
2023-04-25 14:49:08 +03:00
Lincoln Stein
830740b93b
remove redundant/buggy restore_default_attention() method
2023-04-25 07:05:07 -04:00
StAlKeR7779
ff3f289342
Merge branch 'v2.3' into fix/new_diffusers_names
2023-04-25 13:21:26 +03:00
Lincoln Stein
34abbb3589
Merge branch 'v2.3' into release/v2.3.5
2023-04-25 04:33:09 +01:00
Lincoln Stein
2ddd0301f4
bump version number to 2.3.5-rc1
2023-04-24 23:24:33 -04:00
Lincoln Stein
ce6629b6f5
Merge branch 'v2.3' into enhance/increase-sha256-chunksize
2023-04-25 03:58:30 +01:00
Lincoln Stein
144dfe4a5b
Merge branch 'v2.3' into bugfix/lora-incompatibility-handling
2023-04-25 03:54:46 +01:00
Lincoln Stein
c6ae1edc82
Revert "improvements to the installation and upgrade processes"
2023-04-24 22:53:43 -04:00
Lincoln Stein
0f3c456d59
merge with v2.3
2023-04-24 22:51:48 -04:00
Lincoln Stein
2cd0e036ac
Merge branch 'v2.3' into bugfix/lora-incompatibility-handling
2023-04-25 03:24:25 +01:00
Lincoln Stein
a45b3387c0
Merge branch 'v2.3' into enhance/increase-sha256-chunksize
2023-04-25 03:22:43 +01:00
Lincoln Stein
264af3c054
fix crash caused by incorrect conflict resolution
2023-04-24 22:20:12 -04:00
Lincoln Stein
b332432a88
Merge branch 'v2.3' into lstein/bugfix/improve-update-handling
2023-04-25 03:09:12 +01:00
Lincoln Stein
7f7d5894fa
Merge branch 'v2.3' into bugfix/lora-incompatibility-handling
2023-04-25 02:51:27 +01:00
Lincoln Stein
40744ed996
Merge branch 'v2.3' into fix_inconsistent_loras
2023-04-22 20:22:32 +01:00
Lincoln Stein
e5188309ec
Merge branch 'v2.3' into bugfix/lora-incompatibility-handling
2023-04-20 17:25:09 +01:00
Lincoln Stein
aabe79686e
Merge branch 'v2.3' into fix/new_diffusers_names
2023-04-20 17:20:33 +01:00
Lincoln Stein
216b1c3a4a
Merge branch 'v2.3' into fix/new_diffusers_names
2023-04-18 19:37:25 -04:00
Lincoln Stein
f49d2619be
Merge branch 'v2.3' into fix_inconsistent_loras
2023-04-18 19:09:35 -04:00
Lincoln Stein
da96ec9dd5
Merge branch 'v2.3' into feat/lokr_support
2023-04-18 19:08:03 -04:00
StAlKeR7779
967d853020
Merge branch 'v2.3' into feat/lokr_support
2023-04-16 23:10:45 +03:00
StAlKeR7779
e91117bc74
Add support for lokr lycoris format
2023-04-16 23:05:13 +03:00
Damian Stewart
4d58444153
fix issues and further cleanup
2023-04-16 17:54:21 +02:00
Damian Stewart
3667eb4d0d
activate LoRAs when generating prompt embeddings; also cleanup attention stuff
2023-04-16 17:03:31 +02:00
Lincoln Stein
203a7157e1
fix the "import from directory" function in console model installer
...
- This was inadvertently broken when we stopped supporting direct
loading of checkpoint models.
- Now fixed.
2023-04-15 21:07:02 -04:00
Lincoln Stein
47883860a6
Merge branch 'v2.3' into enhance/increase-sha256-chunksize
2023-04-13 23:00:34 -04:00
Lincoln Stein
6365a7c790
Merge branch 'v2.3' into lstein/bugfix/improve-update-handling
2023-04-13 22:49:41 -04:00
Lincoln Stein
5fcb3d90e4
fix missing files variable
2023-04-13 22:49:04 -04:00
Lincoln Stein
8f17d17208
Merge branch 'v2.3' into fix/new_diffusers_names
2023-04-13 22:44:05 -04:00
Lincoln Stein
c6ecf3afc5
pin diffusers to 0.15.*, and fix deprecation warning on unet.in_channels
2023-04-13 22:38:50 -04:00
Lincoln Stein
2c449bfb34
Merge branch 'v2.3' into bugfix/lora-incompatibility-handling
2023-04-13 22:23:59 -04:00
Lincoln Stein
4d7289b20f
explicitly set permissions of config files
2023-04-13 22:03:52 -04:00
StAlKeR7779
0bc5dcc663
Refactor
2023-04-13 16:05:04 +03:00
Lincoln Stein
1183bf96ed
hotfix to 2.3.4
...
- Pin diffusers to 0.14
- Small fix to LoRA loading routine that was preventing placement of
LoRA files in subdirectories.
- Bump version to 2.3.4.post1
2023-04-13 08:48:30 -04:00
Lincoln Stein
d81394cda8
fix directory permissions after install
2023-04-13 08:39:47 -04:00
Lincoln Stein
afa3cdce27
add a list_compatible_loras() method
2023-04-13 00:11:26 -04:00
Lincoln Stein
6dfbd1c677
implement caching scheme for vector length
2023-04-12 23:56:52 -04:00
Lincoln Stein
a775c7730e
improvements to the installation and upgrade processes
...
- Moved all postinstallation config file and model munging code out
of the CLI and into a separate script named `invokeai-postinstall`
- Fixed two calls to `shutil.copytree()` so that they don't try to preserve
the file mode of the copied files. This is necessary to run correctly
in a Nix environment
(see thread at https://discord.com/channels/1020123559063990373/1091716696965918732/1095662756738371615 )
- Update the installer so that an existing virtual environment will be
updated, not overwritten.
- Pin npyscreen version to see if this fixes issues people have had with
installing this module.
2023-04-12 22:40:53 -04:00
StAlKeR7779
16c97ca0cb
Fix num_train_timesteps in config
2023-04-12 23:57:45 +03:00
StAlKeR7779
e24dd97b80
Fix that config attributes no longer accessible as object attributes
2023-04-12 23:40:14 +03:00
StAlKeR7779
5a54039dd7
Fix imports for diffusers 0.15.0
...
Imports:
`diffusers.models.cross_attention -> diffusers.models.attention_processor`
Unions:
`AttnProcessor -> AttentionProcessor`
Classes:
| Old name | New name|
| --- | --- |
| CrossAttention | Attention |
| CrossAttnProcessor | AttnProcessor |
| XFormersCrossAttnProcessor | XFormersAttnProcessor |
| CrossAttnAddedKVProcessor | AttnAddedKVProcessor |
| LoRACrossAttnProcessor | LoRAAttnProcessor |
| LoRAXFormersCrossAttnProcessor | LoRAXFormersAttnProcessor |
Same names in this class:
`SlicedAttnProcessor, SlicedAttnAddedKVProcessor`
2023-04-12 22:54:25 +03:00
Lincoln Stein
9385edb453
Merge branch 'v2.3' into enhance/increase-sha256-chunksize
2023-04-11 18:51:44 -04:00
Lincoln Stein
96a5de30e3
Merge branch 'v2.3' into bugfix/pathconf-on-windows
2023-04-11 11:11:20 -04:00
Lincoln Stein
2251d3abfe
fixup relative path to devices module
2023-04-10 23:44:58 -04:00
Lincoln Stein
0b22a3f34d
distinguish LoRA/LyCORIS files based on what SD model they were based on
...
- Attempting to run a prompt with a LoRA based on SD v1.X against a
model based on v2.X will now throw an
`IncompatibleModelException`. To import this exception:
`from ldm.modules.lora_manager import IncompatibleModelException`
(maybe this should be defined in ModelManager?)
- Enhance `LoraManager.list_loras()` to accept an optional integer
argument, `token_vector_length`. This will filter the returned LoRA
models to return only those that match the indicated length. Use:
```
768 => for models based on SD v1.X
1024 => for models based on SD v2.X
```
Note that this filtering requires each LoRA file to be opened
by `torch.safetensors`. It will take ~8s to scan a directory of
40 files.
- Added new static methods to `ldm.modules.kohya_lora_manager`:
- check_model_compatibility()
- vector_length_from_checkpoint()
- vector_length_from_checkpoint_file()
2023-04-10 23:33:28 -04:00
Lincoln Stein
2528e14fe9
raise generation exceptions so that frontend can catch
2023-04-10 14:26:09 -04:00
Lincoln Stein
17de5c7008
Merge branch 'v2.3' into bugfix/pathconf-on-windows
2023-04-09 22:10:24 -04:00