From a3ecd4a79c5c3c30b4feccfc827d822184439a7c Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Mon, 29 May 2023 15:17:06 +0200 Subject: [PATCH 1/3] Update auto to 1.3.0 (#490) https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/20ae71faa8ef035c31aa3a410b707d792c8203a3 Pytorch 2.0.1 #489 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 19 +++++++++---------- services/AUTOMATIC1111/entrypoint.sh | 1 + 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2f1a83a..8f34fe3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:57 + image: sd-auto:58 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 6bfcda0..173b356 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -18,7 +18,7 @@ RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interr FROM alpine:3.17 as xformers RUN apk add --no-cache aria2 -RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/5.0.3/xformers-0.0.20.dev528-cp310-cp310-manylinux2014_x86_64-pytorch2.whl' +RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl' FROM python:3.10.9-slim @@ -32,22 +32,23 @@ RUN --mount=type=cache,target=/var/cache/apt \ # extensions needs those ffmpeg libglfw3-dev libgles2-mesa-dev pkg-config libcairo2 libcairo2-dev + RUN --mount=type=cache,target=/cache --mount=type=cache,target=/root/.cache/pip \ - aria2c -x 5 --dir /cache --out torch-2.0.0-cp310-cp310-linux_x86_64.whl -c \ - https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp310-cp310-linux_x86_64.whl && \ - pip install /cache/torch-2.0.0-cp310-cp310-linux_x86_64.whl torchvision --index-url https://download.pytorch.org/whl/cu118 + aria2c -x 5 --dir /cache --out torch-2.0.1-cp310-cp310-linux_x86_64.whl -c \ + https://download.pytorch.org/whl/cu118/torch-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl && \ + pip install /cache/torch-2.0.1-cp310-cp310-linux_x86_64.whl torchvision --index-url https://download.pytorch.org/whl/cu118 RUN --mount=type=cache,target=/root/.cache/pip \ git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git && \ cd stable-diffusion-webui && \ - git reset --hard d7aec59c4eb02f723b3d55c6f927a42e97acd679 && \ + git reset --hard 20ae71faa8ef035c31aa3a410b707d792c8203a3 && \ pip install -r requirements_versions.txt RUN --mount=type=cache,target=/root/.cache/pip \ - --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.20.dev528-cp310-cp310-manylinux2014_x86_64.whl \ - pip install /xformers-0.0.20.dev528-cp310-cp310-manylinux2014_x86_64.whl + --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64.whl \ + pip install /xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64.whl ENV ROOT=/stable-diffusion-webui @@ -70,15 +71,13 @@ RUN --mount=type=cache,target=/root/.cache/pip \ RUN apt-get -y install libgoogle-perftools-dev && apt-get clean ENV LD_PRELOAD=libtcmalloc.so -ARG SHA=89f9faa63388756314e8a1d96cf86bf5e0663045 +ARG SHA=20ae71faa8ef035c31aa3a410b707d792c8203a3 RUN --mount=type=cache,target=/root/.cache/pip \ cd stable-diffusion-webui && \ git fetch && \ git reset --hard ${SHA} && \ pip install -r requirements_versions.txt -RUN --mount=type=cache,target=/root/.cache/pip pip install -U opencv-python-headless - COPY . /docker RUN \ diff --git a/services/AUTOMATIC1111/entrypoint.sh b/services/AUTOMATIC1111/entrypoint.sh index 54e709c..337a4d6 100755 --- a/services/AUTOMATIC1111/entrypoint.sh +++ b/services/AUTOMATIC1111/entrypoint.sh @@ -49,6 +49,7 @@ MOUNTS["${ROOT}/config.json"]="/data/config/auto/config.json" MOUNTS["${ROOT}/ui-config.json"]="/data/config/auto/ui-config.json" MOUNTS["${ROOT}/styles.csv"]="/data/config/auto/styles.csv" MOUNTS["${ROOT}/extensions"]="/data/config/auto/extensions" +MOUNTS["${ROOT}/config_states"]="/data/config/auto/config_states" # extra hacks MOUNTS["${ROOT}/repositories/CodeFormer/weights/facelib"]="/data/.cache" From 6695c2315000915203f843c80a4b8fa163e83cf8 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Mon, 29 May 2023 19:07:01 +0200 Subject: [PATCH 2/3] InvokeAI 2.3.5.post2 (#491) https://github.com/invoke-ai/InvokeAI/commit/f3b2e02921927d9317255b1c3811f47bd40a2bf9 #489 --- README.md | 2 +- docker-compose.yml | 2 +- services/invoke/Dockerfile | 22 ++++++++-------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 659d510..95e10c3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This repository provides multiple UIs for you to play around with stable diffusi | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | | ![](https://user-images.githubusercontent.com/24505302/189541954-46afd772-d0c8-4005-874c-e2eca40c02f2.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541956-5b528de7-1b5d-479f-a1db-d3f5a53afc59.jpg) | ![](https://user-images.githubusercontent.com/24505302/189541957-cf78b352-a071-486d-8889-f26952779a61.jpg) | -### [InvokeAI (lstein)](https://github.com/invoke-ai/InvokeAI) +### [InvokeAI](https://github.com/invoke-ai/InvokeAI) [Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots: diff --git a/docker-compose.yml b/docker-compose.yml index 8f34fe3..ab5bf8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: <<: *base_service profiles: ["invoke"] build: ./services/invoke/ - image: sd-invoke:28 + image: sd-invoke:29 environment: - PRELOAD=true - CLI_ARGS=--xformers diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile index 5568ac0..e3466d1 100644 --- a/services/invoke/Dockerfile +++ b/services/invoke/Dockerfile @@ -1,16 +1,11 @@ FROM alpine:3.17 as xformers RUN apk add --no-cache aria2 -RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/5.0.3/xformers-0.0.20.dev528-cp310-cp310-manylinux2014_x86_64-pytorch1.13.whl' +RUN aria2c -x 5 --dir / --out wheel.whl 'https://github.com/AbdBarho/stable-diffusion-webui-docker/releases/download/6.0.0/xformers-0.0.21.dev544-cp310-cp310-manylinux2014_x86_64-pytorch201.whl' +FROM pytorch/pytorch:2.0.1-cuda11.7-cudnn8-runtime -FROM python:3.10-slim - -ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w PIP_PREFER_BINARY=1 - - -RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.1+cu117 torchvision --extra-index-url https://download.pytorch.org/whl/cu117 - +ENV DEBIAN_FRONTEND=noninteractive PIP_EXISTS_ACTION=w PIP_PREFER_BINARY=1 # patch match: # https://github.com/invoke-ai/InvokeAI/blob/main/docs/installation/INSTALL_PATCHMATCH.md @@ -27,11 +22,11 @@ RUN git clone https://github.com/invoke-ai/InvokeAI.git ${ROOT} WORKDIR ${ROOT} RUN --mount=type=cache,target=/root/.cache/pip \ - git reset --hard 4463124bddd221c333d4c70e73aa2949ad35453d && \ + git reset --hard f3b2e02921927d9317255b1c3811f47bd40a2bf9 && \ pip install -e . -ARG BRANCH=main SHA=d73f1c363c3f2fe00f14ed34e276b4366b32a886 +ARG BRANCH=main SHA=f3b2e02921927d9317255b1c3811f47bd40a2bf9 RUN --mount=type=cache,target=/root/.cache/pip \ git fetch && \ git reset --hard && \ @@ -40,15 +35,14 @@ RUN --mount=type=cache,target=/root/.cache/pip \ pip install -U -e . RUN --mount=type=cache,target=/root/.cache/pip \ - --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.20-cp310-cp310-linux_x86_64.whl \ - pip install -U opencv-python-headless triton /xformers-0.0.20-cp310-cp310-linux_x86_64.whl && \ + --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \ + pip install -U opencv-python-headless triton /xformers-0.0.21-cp310-cp310-linux_x86_64.whl && \ python3 -c "from patchmatch import patch_match" COPY . /docker/ -ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility -ENV NVIDIA_VISIBLE_DEVICES=all +ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility NVIDIA_VISIBLE_DEVICES=all ENV PYTHONUNBUFFERED=1 PRELOAD=false HF_HOME=/root/.cache/huggingface CONFIG_DIR=/data/config/invoke CLI_ARGS="" EXPOSE 7860 From 660c098da05dd24febee45111b9117c7a75c2ed2 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Fri, 2 Jun 2023 21:29:00 +0200 Subject: [PATCH 3/3] Change capabilities in docker-compose (#497) #479 --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 1 - services/comfy/Dockerfile | 2 +- services/invoke/Dockerfile | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ab5bf8c..20e98f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ x-base_service: &base_service devices: - driver: nvidia device_ids: ['0'] - capabilities: [gpu] + capabilities: [compute, utility] name: webui-docker diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 173b356..6ef8fda 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -88,7 +88,6 @@ RUN \ git config --global --add safe.directory '*' WORKDIR ${ROOT} -ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility ENV NVIDIA_VISIBLE_DEVICES=all ENV CLI_ARGS="" EXPOSE 7860 diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index ac0556f..ddf60fb 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -38,7 +38,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ COPY . /docker/ RUN cp /docker/extra_model_paths.yaml ${ROOT} -ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility NVIDIA_VISIBLE_DEVICES=all +ENV NVIDIA_VISIBLE_DEVICES=all ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS="" EXPOSE 7860 ENTRYPOINT ["/docker/entrypoint.sh"] diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile index e3466d1..3bc90b1 100644 --- a/services/invoke/Dockerfile +++ b/services/invoke/Dockerfile @@ -42,7 +42,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ COPY . /docker/ -ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility NVIDIA_VISIBLE_DEVICES=all +ENV NVIDIA_VISIBLE_DEVICES=all ENV PYTHONUNBUFFERED=1 PRELOAD=false HF_HOME=/root/.cache/huggingface CONFIG_DIR=/data/config/invoke CLI_ARGS="" EXPOSE 7860