From 90affeb72ab15a66537e171dcb24bee03f8291b4 Mon Sep 17 00:00:00 2001 From: sejoung kim Date: Mon, 1 Jan 2024 19:04:02 +0900 Subject: [PATCH 1/4] Bump Comfy (#603) https://github.com/comfyanonymous/ComfyUI/commit/d1f3637a5a944d0607b899babd8ff11d87100503 --------- Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/comfy/Dockerfile | 30 ++++-------------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b5b57e8..c8e98de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,7 @@ services: <<: *base_service profiles: ["comfy"] build: ./services/comfy/ - image: sd-comfy:5 + image: sd-comfy:6 environment: - CLI_ARGS= diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 6d1f6ce..f813c68 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -1,8 +1,4 @@ -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/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 pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 @@ -13,32 +9,14 @@ RUN --mount=type=cache,target=/root/.cache/pip \ git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \ cd ${ROOT} && \ git checkout master && \ - git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \ + git reset --hard d1f3637a5a944d0607b899babd8ff11d87100503 && \ pip install -r requirements.txt - -RUN --mount=type=cache,target=/root/.cache/pip \ - --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.21-cp310-cp310-linux_x86_64.whl \ - pip install /xformers-0.0.21-cp310-cp310-linux_x86_64.whl - - WORKDIR ${ROOT} - -ARG BRANCH=master SHA=7e941f9f247f9b013a33c2e7d117466108414e99 -RUN --mount=type=cache,target=/root/.cache/pip \ - git fetch && \ - git checkout ${BRANCH} && \ - git reset --hard ${SHA} && \ - pip install -r requirements.txt - -# add info COPY . /docker/ -RUN cp /docker/extra_model_paths.yaml ${ROOT} -RUN chmod u+x /docker/entrypoint.sh -RUN cp /docker/extra_model_paths.yaml ${ROOT} +RUN chmod u+x /docker/entrypoint.sh && cp /docker/extra_model_paths.yaml ${ROOT} -ENV NVIDIA_VISIBLE_DEVICES=all -ENV PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS="" +ENV NVIDIA_VISIBLE_DEVICES=all PYTHONPATH="${PYTHONPATH}:${PWD}" CLI_ARGS="" EXPOSE 7860 ENTRYPOINT ["/docker/entrypoint.sh"] CMD python -u main.py --listen --port 7860 ${CLI_ARGS} From fbc5c359d03f539d4f6eaa90fd18d8590a2a4b61 Mon Sep 17 00:00:00 2001 From: simonmcnair <101189766+simonmcnair@users.noreply.github.com> Date: Mon, 1 Jan 2024 10:13:01 +0000 Subject: [PATCH 2/4] Resolve memory usage situation in Auto (#620) Fixes https://github.com/AbdBarho/stable-diffusion-webui-docker/issues/612 --------- Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c8e98de..f9a475c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:68 + image: sd-auto:69 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 9e40d8c..c30ac1f 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -48,6 +48,10 @@ RUN --mount=type=cache,target=/root/.cache/pip \ git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \ git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b +# there seems to be a memory leak (or maybe just memory not being freed fast eno8ugh) that is fixed by this version of malloc +# maybe move this up to the dependencies list. +RUN apt-get -y install libgoogle-perftools-dev && apt-get clean +ENV LD_PRELOAD=libtcmalloc.so COPY . /docker From f61363974802f22f6c0cfd869239b1a5b93254bb Mon Sep 17 00:00:00 2001 From: Adam Florizone <72236049+adamflorizone@users.noreply.github.com> Date: Mon, 1 Jan 2024 05:30:40 -0500 Subject: [PATCH 3/4] Update Auto v1.7.0 (#632) Update Auto v1.7.0 https://github.com/AUTOMATIC1111/stable-diffusion-webui/releases/tag/v1.7.0 --------- Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f9a475c..4901b80 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:69 + image: sd-auto:70 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index c30ac1f..3a2f5a5 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -15,7 +15,7 @@ RUN . /clone.sh clip-interrogator https://github.com/pharmapsychotic/clip-interr RUN . /clone.sh generative-models https://github.com/Stability-AI/generative-models 45c443b316737a4ab6e40413d7794a7f5657c19f -FROM pytorch/pytorch:2.1.0-cuda12.1-cudnn8-runtime +FROM pytorch/pytorch:2.1.2-cuda12.1-cudnn8-runtime ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 @@ -31,7 +31,7 @@ WORKDIR / 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 4afaaf8a020c1df457bcf7250cb1c7f609699fa7 && \ + git reset --hard cf2772fab0af5573da775e7437e6acdca424f26e && \ pip install -r requirements_versions.txt From 60c4832185dc492166c5e3f8492f00120d15e35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sj=C3=B6lund?= Date: Mon, 1 Jan 2024 11:34:46 +0100 Subject: [PATCH 4/4] Update open_clip to v2.20.0 in Auto (#617) Fixes #615. Updates `open-clip-torch` to the one specified in auto's [requirements_versions.txt](https://github.com/AUTOMATIC1111/stable-diffusion-webui/blob/master/requirements_versions.txt#L18). --------- Co-authored-by: AbdBarho --- docker-compose.yml | 2 +- services/AUTOMATIC1111/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4901b80..44dcc87 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: <<: *base_service profiles: ["auto"] build: ./services/AUTOMATIC1111 - image: sd-auto:70 + image: sd-auto:71 environment: - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile index 3a2f5a5..efc712c 100644 --- a/services/AUTOMATIC1111/Dockerfile +++ b/services/AUTOMATIC1111/Dockerfile @@ -46,7 +46,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ pip install pyngrok xformers \ git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379 \ git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1 \ - git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b + git+https://github.com/mlfoundations/open_clip.git@v2.20.0 # there seems to be a memory leak (or maybe just memory not being freed fast eno8ugh) that is fixed by this version of malloc # maybe move this up to the dependencies list.