From 27c560cdcd377f810ab193945fdc8689a5cf12ad Mon Sep 17 00:00:00 2001 From: "Steven Lu (5950X 20.04[tmux])" Date: Fri, 14 Jul 2023 05:39:32 -0400 Subject: [PATCH 1/4] what i have right now --- docker-compose.yml | 8 +++++--- services/comfy/Dockerfile | 12 ++++++++---- services/comfy/extra_model_paths.yaml | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 815a9bfec..71cda598e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,9 @@ x-base_service: &base_service ports: - "${WEBUI_PORT:-7860}:7860" volumes: - - &v1 ./data:/data + - &v1 /vat/backups/StableDiffusion/data:/data - &v2 ./output:/output + - ./models_on_nvme:/data/models/Stable-diffusion/nvme stop_signal: SIGKILL tty: true deploy: @@ -31,7 +32,8 @@ services: build: ./services/AUTOMATIC1111 image: sd-auto:62 environment: - - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api + # - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api --distributed-remotes testrig_ftw3:192.168.1.41:7860 velka7:192.168.1.20:7860 --distributed-skip-verify-remotes --distributed-remotes-autosave --distributed-debug + - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --listen auto-cpu: <<: *automatic @@ -62,7 +64,7 @@ services: build: ./services/comfy/ image: sd-comfy:3 environment: - - CLI_ARGS= + - CLI_ARGS=--preview-method=taesd comfy-cpu: diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 69aaf49c6..c5f0acfc1 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -10,13 +10,12 @@ RUN apt-get update && apt-get install -y git && apt-get clean ENV ROOT=/stable-diffusion RUN --mount=type=cache,target=/root/.cache/pip \ - git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \ + git clone https://github.com/unphased/ComfyUI.git ${ROOT} && \ cd ${ROOT} && \ git checkout master && \ - git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \ + # git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \ 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 @@ -26,13 +25,18 @@ WORKDIR ${ROOT} ARG BRANCH=master SHA=8607c2d42d10b0108de02528e813cc703e58813f RUN --mount=type=cache,target=/root/.cache/pip \ + ls -la models && \ + ls -la models/vae_approx && \ git fetch && \ git checkout ${BRANCH} && \ - git reset --hard ${SHA} && \ + echo cach_bust 2 && \ + git pull && \ + # git reset --hard ${SHA} && \ pip install -r requirements.txt # add info COPY . /docker/ +RUN ls -la /docker RUN cp /docker/extra_model_paths.yaml ${ROOT} ENV NVIDIA_VISIBLE_DEVICES=all diff --git a/services/comfy/extra_model_paths.yaml b/services/comfy/extra_model_paths.yaml index eb374eb30..e4f6886b5 100644 --- a/services/comfy/extra_model_paths.yaml +++ b/services/comfy/extra_model_paths.yaml @@ -15,6 +15,7 @@ a111: gligen: models/GLIGEN clip: models/CLIPEncoder embeddings: embeddings + vae_approx: models/vae_approx custom_nodes: config/comfy/custom_nodes From e8681cf80f2e4f259b1375ee2d94abfc64b07745 Mon Sep 17 00:00:00 2001 From: "Steven Lu (5950X 20.04[tmux])" Date: Fri, 14 Jul 2023 06:18:15 -0400 Subject: [PATCH 2/4] adjustments to remove my customizations --- docker-compose.yml | 6 ++---- services/comfy/Dockerfile | 7 +------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 71cda598e..02f5929b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,9 +4,8 @@ x-base_service: &base_service ports: - "${WEBUI_PORT:-7860}:7860" volumes: - - &v1 /vat/backups/StableDiffusion/data:/data + - &v1 ./data:/data - &v2 ./output:/output - - ./models_on_nvme:/data/models/Stable-diffusion/nvme stop_signal: SIGKILL tty: true deploy: @@ -32,8 +31,7 @@ services: build: ./services/AUTOMATIC1111 image: sd-auto:62 environment: - # - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api --distributed-remotes testrig_ftw3:192.168.1.41:7860 velka7:192.168.1.20:7860 --distributed-skip-verify-remotes --distributed-remotes-autosave --distributed-debug - - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api --listen + - CLI_ARGS=--allow-code --xformers --enable-insecure-extension-access --api auto-cpu: <<: *automatic diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index c5f0acfc1..6e6d53add 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -25,18 +25,13 @@ WORKDIR ${ROOT} ARG BRANCH=master SHA=8607c2d42d10b0108de02528e813cc703e58813f RUN --mount=type=cache,target=/root/.cache/pip \ - ls -la models && \ - ls -la models/vae_approx && \ git fetch && \ git checkout ${BRANCH} && \ - echo cach_bust 2 && \ - git pull && \ - # git reset --hard ${SHA} && \ + git reset --hard ${SHA} && \ pip install -r requirements.txt # add info COPY . /docker/ -RUN ls -la /docker RUN cp /docker/extra_model_paths.yaml ${ROOT} ENV NVIDIA_VISIBLE_DEVICES=all From 6a3fb0cfa0262911787ecb028d11fe4d8486c062 Mon Sep 17 00:00:00 2001 From: "Steven Lu (5950X 20.04[tmux])" Date: Fri, 14 Jul 2023 06:54:30 -0400 Subject: [PATCH 3/4] simplify the dockerfile --- services/comfy/Dockerfile | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 6e6d53add..003363ada 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -8,28 +8,20 @@ ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 RUN apt-get update && apt-get install -y git && apt-get clean +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 + ENV ROOT=/stable-diffusion RUN --mount=type=cache,target=/root/.cache/pip \ - git clone https://github.com/unphased/ComfyUI.git ${ROOT} && \ + git clone https://github.com/comfyanonymous/ComfyUI.git ${ROOT} && \ cd ${ROOT} && \ git checkout master && \ - # git reset --hard 884ea653c8d6fe19b3724f45a04a0d74cd881f2f && \ + git reset --hard 91ed2815d542c96fdad75edba2205140de3cbba6 && \ 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=8607c2d42d10b0108de02528e813cc703e58813f -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} From c99a240ca59d727e0ca5b1ada9b736967827703c Mon Sep 17 00:00:00 2001 From: "Steven Lu (5950X 20.04[tmux])" Date: Fri, 14 Jul 2023 07:22:13 -0400 Subject: [PATCH 4/4] seems to work --- services/comfy/Dockerfile | 5 +++++ services/comfy/extra_model_paths.yaml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 003363ada..7453c8ef6 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -22,6 +22,11 @@ RUN --mount=type=cache,target=/root/.cache/pip \ WORKDIR ${ROOT} +ADD https://github.com/madebyollin/taesd/raw/main/taesd_decoder.pth \ + ${ROOT}/models/vae_approx/taesd_decoder.pth +ADD https://github.com/madebyollin/taesd/raw/main/taesdxl_decoder.pth \ + ${ROOT}/models/vae_approx/taesdxl_decoder.pth + # add info COPY . /docker/ RUN cp /docker/extra_model_paths.yaml ${ROOT} diff --git a/services/comfy/extra_model_paths.yaml b/services/comfy/extra_model_paths.yaml index e4f6886b5..eb374eb30 100644 --- a/services/comfy/extra_model_paths.yaml +++ b/services/comfy/extra_model_paths.yaml @@ -15,7 +15,6 @@ a111: gligen: models/GLIGEN clip: models/CLIPEncoder embeddings: embeddings - vae_approx: models/vae_approx custom_nodes: config/comfy/custom_nodes