From 2a5b98c3c6f5df4ed9d3a4a01e1da2d8ddd599ef Mon Sep 17 00:00:00 2001 From: vladmandic Date: Mon, 29 Jan 2024 01:01:37 +0000 Subject: [PATCH 1/4] =?UTF-8?q?Deploying=20to=20master=20from=20@=20vladma?= =?UTF-8?q?ndic/automatic@5fb290f443d5f38a5c9f6e6095aabeab8e3a991d=20?= =?UTF-8?q?=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f92c753b6..7c3c49add 100644 --- a/README.md +++ b/README.md @@ -229,7 +229,7 @@ check [ChangeLog](CHANGELOG.md) for when feature was first introduced as it will ### **Sponsors**
-Allan GrantBrent OzarMatthew RunoHELLO WORLD SASSalad Technologiesa.v.mantzarisToby Worth +Allan GrantBrent OzarMatthew RunoHELLO WORLD SASSalad Technologiesa.v.mantzaris

From 9aa9f1c337cbc8f8cd045dd77c5480615227e54c Mon Sep 17 00:00:00 2001 From: QuantumSoul Date: Mon, 29 Jan 2024 21:45:33 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 7c3c49add..f79d53d92 100644 --- a/README.md +++ b/README.md @@ -209,6 +209,16 @@ General goals: - Up-to-Date - Keep code up to date with latest advanced in text-to-image generation +### Star History + + + + + + Star History Chart + + + ## Credits - Main credit goes to [Automatic1111 WebUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) From 9bf08c5493925b6ddb3451f6a6e00460ca92aedd Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 30 Jan 2024 09:29:51 -0500 Subject: [PATCH 3/4] Revert "Update README.md" This reverts commit 9aa9f1c337cbc8f8cd045dd77c5480615227e54c. --- README.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.md b/README.md index f79d53d92..7c3c49add 100644 --- a/README.md +++ b/README.md @@ -209,16 +209,6 @@ General goals: - Up-to-Date - Keep code up to date with latest advanced in text-to-image generation -### Star History - - - - - - Star History Chart - - - ## Credits - Main credit goes to [Automatic1111 WebUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) From 1dc8e939a3e728772677c7bedf7a6395f2b4dc14 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 7 Feb 2024 12:23:13 -0500 Subject: [PATCH 4/4] update master before merge --- README.md | 88 ++++++++++--------- extensions-builtin/sd-extension-chainner | 2 +- extensions-builtin/sd-extension-system-info | 2 +- extensions-builtin/sd-webui-agent-scheduler | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- .../stable-diffusion-webui-images-browser | 2 +- .../stable-diffusion-webui-rembg | 2 +- modules/k-diffusion | 2 +- modules/lora | 2 +- wiki | 2 +- 10 files changed, 57 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 7c3c49add..4b1ec5b6d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ All individual features are not listed here, instead check [ChangeLog](CHANGELOG.md) for full list of changes - Multiple backends! - ▹ **Original | Diffusers** + ▹ **Diffusers | Original** - Multiple diffusion models! ▹ **Stable Diffusion 1.5/2.1 | SD-XL | LCM | Segmind | Kandinsky | Pixart-α | Würstchen | aMUSEd | DeepFloyd IF | UniDiffusion | SD-Distilled | BLiP Diffusion | etc.** - Built-in Control for Text, Image, Batch and video processing! @@ -38,23 +38,38 @@ All individual features are not listed here, instead check [ChangeLog](CHANGELOG
-![Screenshot-Dark](html/xmas-default.jpg) -![Screenshot-Control](html/xmas-control.jpg) -![Screenshot-Light](html/light-teal.jpg) +*Main text2image interface*: +![Screenshot-Dark](html/screenshot-text2image.jpg) + +For screenshots and informations on other available themes, see [Themes Wiki](https://github.com/vladmandic/automatic/wiki/Themes)
## Backend support -**SD.Next** supports two main backends: *Original* and *Diffusers*: +**SD.Next** supports two main backends: *Diffusers* and *Original*: -- **Original**: Based on [LDM](https://github.com/Stability-AI/stablediffusion) reference implementation and significantly expanded on by [A1111](https://github.com/AUTOMATIC1111/stable-diffusion-webui) - This is the default backend and it is fully compatible with all existing functionality and extensions - Supports **SD 1.x** and **SD 2.x** models - All other model types such as *SD-XL, LCM, PixArt, Segmind, Kandinsky, etc.* require backend **Diffusers** - **Diffusers**: Based on new [Huggingface Diffusers](https://huggingface.co/docs/diffusers/index) implementation Supports *original* SD models as well as *all* models listed below + This backend is set as default for new installations See [wiki article](https://github.com/vladmandic/automatic/wiki/Diffusers) for more information +- **Original**: Based on [LDM](https://github.com/Stability-AI/stablediffusion) reference implementation and significantly expanded on by [A1111](https://github.com/AUTOMATIC1111/stable-diffusion-webui) + This backend and is fully compatible with most existing functionality and extensions written for *A1111 SDWebUI* + Supports **SD 1.x** and **SD 2.x** models + All other model types such as *SD-XL, LCM, PixArt, Segmind, Kandinsky, etc.* require backend **Diffusers** + +## Control + +**SD.Next** comes with built-in control for all types of text2image, image2image, video2video and batch processing + +*Control interface*: +![Screenshot-Control](html/screenshot-control.jpg) + +*Control processors*: +![Screenshot-Process](html/screenshot-processors.jpg) + +*Masking*: +![Screenshot-Mask](html/screenshot-mask.jpg) ## Model support @@ -67,6 +82,7 @@ Additional models will be added as they become available and there is public int - [aMUSEd 256](https://huggingface.co/amused/amused-256) 256 and 512 - [Segmind Vega](https://huggingface.co/segmind/Segmind-Vega) - [Segmind SSD-1B](https://huggingface.co/segmind/SSD-1B) +- [Segmind SegMoE](https://github.com/segmind/segmoe) *SD and SD-XL* - [Kandinsky](https://github.com/ai-forever/Kandinsky-2) *2.1 and 2.2 and latest 3.0* - [PixArt-α XL 2](https://github.com/PixArt-alpha/PixArt-alpha) *Medium and Large* - [Warp Wuerstchen](https://huggingface.co/blog/wuertschen) @@ -79,10 +95,18 @@ Additional models will be added as they become available and there is public int Also supported are modifiers such as: -- **LCM** and **Turbo** (Adversarial Diffusion Distillation) networks +- **LCM** and **Turbo** (*adversarial diffusion distillation*) networks - All **LoRA** types such as LoCon, LyCORIS, HADA, IA3, Lokr, OFT -- **AnimateDiff** for SD 1.5 - **IP-Adapters** for SD 1.5 and SD-XL +- **InstantID**, **FaceSwap**, **FaceID**, **PhotoMerge** +- **AnimateDiff** for SD 1.5 + +*Color grading*: +![Screenshot-Color](html/screenshot-color.jpg) + +*InstantID*: +![Screenshot-InstantID](html/screenshot-instantid.jpg) + > [!IMPORTANT] > - Loading any model other than standard SD 1.x / SD 2.x requires use of backend **Diffusers** @@ -101,7 +125,7 @@ Also supported are modifiers such as: This includes support for AMD GPUs that are not supported by native ROCm libraries - Any GPU or device compatible with **OpenVINO** libraries on both *Windows and Linux* - *Apple M1/M2* on *OSX* using built-in support in Torch with **MPS** optimizations -- *ONNX/Olive* (experimental) +- *ONNX/Olive* ## Install @@ -143,7 +167,6 @@ Below is partial list of all available parameters, run `webui --help` for the fu --docs Mount Gradio docs at /docs, default: False --no-hashing Disable hashing of checkpoints, default: False --no-metadata Disable reading of metadata from models, default: False - --no-download Disable download of default model, default: False --backend {original,diffusers} force model pipeline type Setup options: @@ -184,37 +207,22 @@ SD.Next comes with several extensions pre-installed: - In addition to general cross-platform code, desire is to have a lead for each of the main platforms. This should be fully cross-platform, but we'd really love to have additional contributors and/or maintainers to join and help lead the efforts on different platforms. -### **Goals** - -This project started as a fork from [Automatic1111 WebUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui/) and it grew significantly since then, -but although it diverged considerably, any substantial features to original work is ported to this repository as well. - -The idea behind the fork is to enable latest technologies and advances in text-to-image generation. - -*Sometimes this is not the same as "as simple as possible to use".* - -General goals: - -- Multi-model - - Enable usage of as many as possible txt2img and img2img generative models -- Cross-platform - - Create uniform experience while automatically managing any platform specific differences -- Performance - - Enable best possible performance on all platforms -- Ease-of-Use - - Automatically handle all requirements, dependencies, flags regardless of platform - - Integrate all best options for uniform out-of-the-box experience without the need to tweak anything manually -- Look-and-Feel - - Create modern, intuitive and clean UI -- Up-to-Date - - Keep code up to date with latest advanced in text-to-image generation - -## Credits +### **Credits** - Main credit goes to [Automatic1111 WebUI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) - Additional credits are listed in [Credits](https://github.com/AUTOMATIC1111/stable-diffusion-webui/#credits) - Licenses for modules are listed in [Licenses](html/licenses.html) +### **Evolution** + + + + + + Star History Chart + + + ### **Docs** If you're unsure how to use a feature, best place to start is [Wiki](https://github.com/vladmandic/automatic/wiki) and if its not there, @@ -229,7 +237,7 @@ check [ChangeLog](CHANGELOG.md) for when feature was first introduced as it will ### **Sponsors**
-Allan GrantBrent OzarMatthew RunoHELLO WORLD SASSalad Technologiesa.v.mantzaris +Allan GrantBrent OzarMatthew RunoHELLO WORLD SASSalad Technologiesa.v.mantzarisToby Worth

diff --git a/extensions-builtin/sd-extension-chainner b/extensions-builtin/sd-extension-chainner index e48020d03..425d9cd15 160000 --- a/extensions-builtin/sd-extension-chainner +++ b/extensions-builtin/sd-extension-chainner @@ -1 +1 @@ -Subproject commit e48020d035b0d4daffec37a2bbce61c3ea04798c +Subproject commit 425d9cd15e5e0696550e63263c5a1c6843073db9 diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index f93480869..363d44174 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit f934808698523465e7abb2d1fb0d290065def776 +Subproject commit 363d44174782a67a345ddbfee87dcaf1ba947f79 diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index 435dd9bde..39159f2d5 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit 435dd9bdec0fdb22f73f645de76b55684ed16e67 +Subproject commit 39159f2d52f53a5cf7ba0dfd1a0f085cff3e71e5 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index dc0d590fa..416c34507 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit dc0d590faf3240746212477a95c3026aa7e9584f +Subproject commit 416c345072c9c2066101e225964e3986abe6945e diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index 27fe4a713..3d2d0f4c7 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit 27fe4a713d883436049ed1ed9e1642f8eb4fd924 +Subproject commit 3d2d0f4c7b0599f88df99a9ea66c21bcbec49bda diff --git a/extensions-builtin/stable-diffusion-webui-rembg b/extensions-builtin/stable-diffusion-webui-rembg index b73dee3f3..4d6b4fd70 160000 --- a/extensions-builtin/stable-diffusion-webui-rembg +++ b/extensions-builtin/stable-diffusion-webui-rembg @@ -1 +1 @@ -Subproject commit b73dee3f3fa99b1e7c7ee8dc6dad0176cb74e24c +Subproject commit 4d6b4fd70b00f0ffb4a66a381c85e74e88e04752 diff --git a/modules/k-diffusion b/modules/k-diffusion index cc49cf618..6ab5146d4 160000 --- a/modules/k-diffusion +++ b/modules/k-diffusion @@ -1 +1 @@ -Subproject commit cc49cf6182284e577e896943f8e29c7c9d1a7f2c +Subproject commit 6ab5146d4a5ef63901326489f31f1d8e7dd36b48 diff --git a/modules/lora b/modules/lora index 1a36f9dc6..cd19df49c 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit 1a36f9dc65fb3be8baa9dcbde832048cc5644efa +Subproject commit cd19df49cd512e13ac90db115c424d19c0e8868a diff --git a/wiki b/wiki index 9a9713ecb..c44eeed91 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 9a9713ecbbebaeebe9b15f895d6cab566d3a79a7 +Subproject commit c44eeed913f772b8a2c9fb9ed56b42606588c425