Merge branch 'dev2' into sd-scripts-dev

.github/workflows/typos.yaml

@@ -18,4 +18,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: typos-action
-        uses: crate-ci/[email protected].21
+        uses: crate-ci/[email protected].23

Dockerfile

@@ -3,7 +3,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/London
 
 RUN apt update && apt-get install -y software-properties-common
-RUN add-apt-repository ppa:deadsnakes/ppa && \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    add-apt-repository ppa:deadsnakes/ppa && \
     apt update && \
     apt-get install -y git curl libgl1 libglib2.0-0 libgoogle-perftools-dev \
     python3.10-dev python3.10-tk python3-html5lib python3-apt python3-pip python3.10-distutils && \
@@ -17,22 +19,22 @@ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 3
 RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3
 
 WORKDIR /app
-RUN python3 -m pip install wheel
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install wheel
 
 # Todo: Install torch 2.1.0 for cu121 support (only available as nightly as of writing)
-## RUN python3 -m pip install --pre torch ninja setuptools --extra-index-url https://download.pytorch.org/whl/nightly/cu121
+## RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install --pre torch ninja setuptools --extra-index-url https://download.pytorch.org/whl/nightly/cu121
 
 # Todo: Install xformers nightly for Torch 2.1.0 support
-## RUN python3 -m pip install -v -U git+https://github.com/facebookresearch/xformers.git@main#egg=xformers
+## RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install -v -U git+https://github.com/facebookresearch/xformers.git@main#egg=xformers
 
 # Install requirements
 COPY ./requirements.txt ./requirements_linux_docker.txt ./
 COPY ./setup/docker_setup.py ./setup.py
-RUN python3 -m pip install -r ./requirements_linux_docker.txt
-RUN python3 -m pip install -r ./requirements.txt
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install -r ./requirements_linux_docker.txt
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install -r ./requirements.txt
 
 # Replace pillow with pillow-simd
-RUN python3 -m pip uninstall -y pillow && \
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip uninstall -y pillow && \
     CC="cc -mavx2" python3 -m pip install -U --force-reinstall pillow-simd
 
 # Fix missing libnvinfer7