From 5477b88a042b32fbce561e588ef3fab378da14be Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Sat, 6 May 2023 11:06:35 -0400 Subject: [PATCH] Update to Pytorch 2, Xformers 0.0.20, latest Comfy commit. --- services/comfy/Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/services/comfy/Dockerfile b/services/comfy/Dockerfile index 0df273f..34a0ead 100644 --- a/services/comfy/Dockerfile +++ b/services/comfy/Dockerfile @@ -1,15 +1,18 @@ 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.0/xformers-0.0.17.dev449-cp310-cp310-manylinux2014_x86_64.whl' +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' FROM python:3.10.9-slim ENV DEBIAN_FRONTEND=noninteractive PIP_PREFER_BINARY=1 -RUN --mount=type=cache,target=/root/.cache/pip pip install torch==1.13.1 torchvision --extra-index-url https://download.pytorch.org/whl/cu117 +RUN apt-get update && apt-get install -y git aria2 && apt-get clean -RUN apt-get update && apt-get install -y git && apt-get clean +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 ENV ROOT=/stable-diffusion RUN --mount=type=cache,target=/root/.cache/pip \ @@ -21,13 +24,13 @@ RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip \ - --mount=type=bind,from=xformers,source=/wheel.whl,target=/xformers-0.0.17-cp310-cp310-linux_x86_64.whl \ - pip install triton /xformers-0.0.17-cp310-cp310-linux_x86_64.whl +--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 WORKDIR ${ROOT} -ARG BRANCH=master SHA=884ea653c8d6fe19b3724f45a04a0d74cd881f2f +ARG BRANCH=master SHA=cb1551b819ecaa7d9044c13d0c8e8cfa4ff72830 RUN --mount=type=cache,target=/root/.cache/pip \ git fetch && \ git checkout ${BRANCH} && \