diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8bb5799bc..db5d840b6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,7 +14,6 @@ jobs: matrix: profile: - auto - - invoke - comfy - download runs-on: ubuntu-latest diff --git a/README.md b/README.md index 95e10c302..071a45982 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,6 @@ 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](https://github.com/invoke-ai/InvokeAI) - -[Full feature list here](https://github.com/invoke-ai/InvokeAI#features), Screenshots: - -| Text to image | Image to image | Extras | -| ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | -| ![](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) | - ### [ComfyUI](https://github.com/comfyanonymous/ComfyUI) [Full feature list here](https://github.com/comfyanonymous/ComfyUI#features), Screenshot: diff --git a/docker-compose.yml b/docker-compose.yml index d3673884d..970b61211 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,22 +38,6 @@ services: environment: - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api - invoke: &invoke - <<: *base_service - profiles: ["invoke"] - build: ./services/invoke/ - image: sd-invoke:31 - environment: - - PRELOAD=true - - CLI_ARGS=--xformers - - # invoke-cpu: - # <<: *invoke - # profiles: ["invoke-cpu"] - # environment: - # - PRELOAD=true - # - CLI_ARGS=--always_use_cpu - comfy: &comfy <<: *base_service profiles: ["comfy"] diff --git a/services/invoke/Dockerfile b/services/invoke/Dockerfile deleted file mode 100644 index 21c13ec00..000000000 --- a/services/invoke/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -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.3.0-cuda12.1-cudnn8-runtime - -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 -RUN --mount=type=cache,target=/var/cache/apt \ - apt-get update && \ - apt-get install make g++ git libopencv-dev -y && \ - apt-get clean && \ - cd /usr/lib/x86_64-linux-gnu/pkgconfig/ && \ - ln -sf opencv4.pc opencv.pc - - -ENV ROOT=/InvokeAI -RUN git clone https://github.com/invoke-ai/InvokeAI.git ${ROOT} -WORKDIR ${ROOT} - -RUN --mount=type=cache,target=/root/.cache/pip \ - git reset --hard f3b2e02921927d9317255b1c3811f47bd40a2bf9 && \ - pip install -e . - - -ARG BRANCH=main SHA=f3b2e02921927d9317255b1c3811f47bd40a2bf9 -RUN --mount=type=cache,target=/root/.cache/pip \ - git fetch && \ - git reset --hard && \ - git checkout ${BRANCH} && \ - git reset --hard ${SHA} && \ - pip install -U -e . - -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 -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_VISIBLE_DEVICES=all -ENV PYTHONUNBUFFERED=1 PRELOAD=false HF_HOME=/root/.cache/huggingface CONFIG_DIR=/data/config/invoke CLI_ARGS="" -EXPOSE 7860 - -ENTRYPOINT ["/docker/entrypoint.sh"] -CMD invokeai --web --host 0.0.0.0 --port 7860 --root_dir ${ROOT} --config ${CONFIG_DIR}/models.yaml \ - --outdir /output/invoke --embedding_directory /data/embeddings/ --lora_directory /data/models/Lora \ - --no-nsfw_checker --no-safety_checker ${CLI_ARGS} - diff --git a/services/invoke/entrypoint.sh b/services/invoke/entrypoint.sh deleted file mode 100755 index 348bb2b3f..000000000 --- a/services/invoke/entrypoint.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -Eeuo pipefail - -declare -A MOUNTS - -mkdir -p ${CONFIG_DIR} ${ROOT}/configs/stable-diffusion/ - -# cache -MOUNTS["/root/.cache"]=/data/.cache/ - -# this is really just a hack to avoid migrations -rm -rf ${HF_HOME}/diffusers - -# ui specific -MOUNTS["${ROOT}/models/codeformer"]=/data/models/Codeformer/ -MOUNTS["${ROOT}/models/gfpgan/GFPGANv1.4.pth"]=/data/models/GFPGAN/GFPGANv1.4.pth -MOUNTS["${ROOT}/models/gfpgan/weights"]=/data/models/GFPGAN/ -MOUNTS["${ROOT}/models/realesrgan"]=/data/models/RealESRGAN/ - -MOUNTS["${ROOT}/models/ldm"]=/data/.cache/invoke/ldm/ - -# hacks - -for to_path in "${!MOUNTS[@]}"; do - set -Eeuo pipefail - from_path="${MOUNTS[${to_path}]}" - rm -rf "${to_path}" - mkdir -p "$(dirname "${to_path}")" - # ends with slash, make it! - if [[ "$from_path" == */ ]]; then - mkdir -vp "$from_path" - fi - - ln -sT "${from_path}" "${to_path}" - echo Mounted $(basename "${from_path}") -done - -if "${PRELOAD}" == "true"; then - set -Eeuo pipefail - invokeai-configure --root ${ROOT} --yes - cp ${ROOT}/configs/models.yaml ${CONFIG_DIR}/models.yaml -fi - -exec "$@"