Kevin Turner 63532226a5 Merge remote-tracking branch 'origin/main' into dev/diffusers ...

# Conflicts:
#	backend/invoke_ai_web_server.py
#	ldm/generate.py
#	ldm/invoke/CLI.py
#	ldm/invoke/generator/base.py
#	ldm/invoke/generator/txt2img.py
#	ldm/models/diffusion/cross_attention_control.py
#	ldm/modules/attention.py

2022-12-10 08:43:37 -08:00

..

diffusionmodules

cleanup

2022-10-21 15:07:11 +02:00

distributions

prettified all the code using "blue" at the urging of @tildebyte

2022-08-26 03:15:42 -04:00

encoders

model_cache: let offload_model work with DiffusionPipeline, sorta.

2022-11-30 15:03:20 -08:00

image_degradation

prevent crash that occurs when changing models.yaml on windows systems

2022-11-25 16:59:31 -05:00

losses

prettified all the code using "blue" at the urging of @tildebyte

2022-08-26 03:15:42 -04:00

__init__.py

Merge dev into main for 2.2.0 (#1642)

2022-11-30 16:12:23 -05:00

attention.py

Merge remote-tracking branch 'origin/main' into dev/diffusers

2022-12-10 08:43:37 -08:00

ema.py

prettified all the code using "blue" at the urging of @tildebyte

2022-08-26 03:15:42 -04:00

embedding_manager.py

Merge dev into main for 2.2.0 (#1642)

2022-11-30 16:12:23 -05:00

x_transformer.py

prettified all the code using "blue" at the urging of @tildebyte

2022-08-26 03:15:42 -04:00