From 6695c2315000915203f843c80a4b8fa163e83cf8 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Mon, 29 May 2023 19:07:01 +0200
Subject: [PATCH] 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