From 37feff58bb715dcb239f7fceb87112e66251feef Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Wed, 9 Nov 2022 18:56:22 +0100 Subject: [PATCH 1/5] Reorder Readme sections --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ea7124d..3c0c825 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,15 @@ Run Stable Diffusion on your machine with a nice UI without any hassle! -This repository provides multiple UIs for you to play around with stable diffusion: + +## Setup & Usage + +Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Setup) and [Usage](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Usage) instructions, checkout the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) page if you face any problems, or create a new issue! ## Features +This repository provides multiple UIs for you to play around with stable diffusion: + ### AUTOMATIC1111 [AUTOMATIC1111's fork](https://github.com/AUTOMATIC1111/stable-diffusion-webui) is imho the most feature rich yet elegant UI: @@ -55,10 +60,6 @@ Screenshots: | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | | ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) | -## Setup & Usage - -Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Setup) and [Usage](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Usage) instructions, checkout the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) page if you face any problems, or create a new issue! - ## Contributing Contributions are welcome! From 53ac3601d73ca66ad13ee46788e3888db9363c8d Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Fri, 11 Nov 2022 07:19:47 +0100 Subject: [PATCH 2/5] Update versions (#213) - auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/ac085628540d0ec6a988fad93f5b8f2154209571 - hlky: https://github.com/sd-webui/stable-diffusion-webui/commit/09b64d4f759c44c7c6bc4d433ddd8e964d48b854 - lstein - On hold because of many breaking changes --- docker-compose.yml | 4 ++-- services/AUTOMATIC1111/Dockerfile | 2 +- services/hlky/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 01bd990..f44ea06 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:14 + image: sd-auto:15 environment: - CLI_ARGS=--allow-code --medvram --xformers @@ -42,7 +42,7 @@ services: <<: *base_service profiles: ["hlky"] build: ./services/hlky/ - image: sd-hlky:7 + image: sd-hlky:8 environment: - CLI_ARGS=--optimized-turbo - USE_STREAMLIT=0 diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index f954138..c62f19d 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -65,7 +65,7 @@ RUN [[ "${DEEPDANBOORU:-0}" == "0" ]] && : || pip install tensorflow-cpu==2.10 t # Note: don't update the sha of previous versions because the install will take forever # instead, update the repo state in a later step -ARG SHA=804d9fb83d0c63ca3acd36378707ce47b8f12599 +ARG SHA=ac085628540d0ec6a988fad93f5b8f2154209571 RUN < Date: Sat, 12 Nov 2022 18:33:59 +0100 Subject: [PATCH 3/5] Move contribution to the top --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3c0c825..b441c72 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,10 @@ Run Stable Diffusion on your machine with a nice UI without any hassle! Visit the wiki for [Setup](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Setup) and [Usage](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/Usage) instructions, checkout the [FAQ](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) page if you face any problems, or create a new issue! + +## Contributing + +Contributions are welcome! **Create a discussion first of what the problem is and what you want to contribute (before you implement anything)** ## Features This repository provides multiple UIs for you to play around with stable diffusion: @@ -60,11 +64,6 @@ Screenshots: | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | | ![](https://user-images.githubusercontent.com/24505302/195158552-39f58cb6-cfcc-4141-9995-a626e3760752.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158553-152a0ab8-c0fd-4087-b121-4823bcd8d6b5.jpg) | ![](https://user-images.githubusercontent.com/24505302/195158548-e118206e-c519-4915-85d6-4c248eb10fc0.jpg) | -## Contributing - -Contributions are welcome! - -### **Create an issue first of what you want to contribute (before you implement anything)** ## Disclaimer From 9b6750b2f6680cb5c6d858a6f05b1b5b7b6bc3ed Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Sun, 13 Nov 2022 07:12:17 +0100 Subject: [PATCH 4/5] Use cuda 11.6 for auto (#220) auto: https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/98947d173e3f1667eba29c904f681047dea9de90 Closes #218 #219 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f44ea06..31bd5c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:15 + image: sd-auto:16 environment: - CLI_ARGS=--allow-code --medvram --xformers diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index c62f19d..5ce8e92 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -34,7 +34,7 @@ SHELL ["/bin/bash", "-ceuxo", "pipefail"] ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 PIP_NO_CACHE_DIR=1 -RUN pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113 +RUN pip install torch==1.12.1+cu116 torchvision==0.13.1+cu116 --extra-index-url https://download.pytorch.org/whl/cu116 RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && apt-get clean @@ -42,7 +42,7 @@ RUN apt-get update && apt install fonts-dejavu-core rsync git jq moreutils -y && RUN < Date: Sun, 13 Nov 2022 08:42:27 +0100 Subject: [PATCH 5/5] v1.5 Inpainting (#221) Also remove v1.4 Closes #217 --- docker-compose.yml | 2 +- services/download/checksums.sha256 | 5 +++-- services/download/download.sh | 2 -- services/download/links.txt | 14 ++++---------- services/lstein/entrypoint.sh | 1 + services/lstein/models.yaml | 12 ++++++++++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 31bd5c0..da34f00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: <<: *base_service profiles: ["lstein"] build: ./services/lstein/ - image: sd-lstein:5 + image: sd-lstein:6 environment: - PRELOAD=true - CLI_ARGS=--max_loaded_models=1 diff --git a/services/download/checksums.sha256 b/services/download/checksums.sha256 index 5473ac9..a64d6a4 100644 --- a/services/download/checksums.sha256 +++ b/services/download/checksums.sha256 @@ -1,7 +1,8 @@ -fe4efff1e174c627256e44ec2991ba279b3816e364b49f9be2abc0b3ff3f8556 /data/StableDiffusion/model.ckpt +cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516 /data/StableDiffusion/v1-5-pruned-emaonly.ckpt +c6bbc15e3224e6973459ba78de4998b80b50112b0ae5b5c67113d56b4e366b19 /data/StableDiffusion/sd-v1-5-inpainting.ckpt +c6a580b13a5bc05a5e16e4dbb80608ff2ec251a162311590c1f34c013d7f3dab /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt e2cd4703ab14f4d01fd1383a8a8b266f9a5833dacee8e6a79d3bf21a1b6be5ad /data/GFPGAN/GFPGANv1.4.pth 4fa0d38905f75ac06eb49a7951b426670021be3018265fd191d2125df9d682f1 /data/RealESRGAN/RealESRGAN_x4plus.pth f872d837d3c90ed2e05227bed711af5671a6fd1c9f7d7e91c911a61f155e99da /data/RealESRGAN/RealESRGAN_x4plus_anime_6B.pth c209caecac2f97b4bb8f4d726b70ac2ac9b35904b7fc99801e1f5e61f9210c13 /data/LDSR/model.ckpt 9d6ad53c5dafeb07200fb712db14b813b527edd262bc80ea136777bdb41be2ba /data/LDSR/project.yaml -c6a580b13a5bc05a5e16e4dbb80608ff2ec251a162311590c1f34c013d7f3dab /data/VAE/vae-ft-mse-840000-ema-pruned.ckpt diff --git a/services/download/download.sh b/services/download/download.sh index 5c8b2b1..c140551 100755 --- a/services/download/download.sh +++ b/services/download/download.sh @@ -13,8 +13,6 @@ echo "Checking SHAs..." parallel --will-cite -a /docker/checksums.sha256 "echo -n {} | sha256sum -c" -# aria2c already does hash check -# cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516 /data/StableDiffusion/v1-5-pruned-emaonly.ckpt cat <