Add new dockerfiles for various use cases

Dockerfile

@@ -1,48 +1,13 @@
 # Custom docker image for DeTikZify. The default HF Spaces GPU image installs a
 # tex live version that is too old for our needs, so we install the correct one
-# ourselves.
+# ourselves. This simplified Dockerfile is based on an intermediate image
+# (./Dockerfile.base) that already has Tex Live and pyenv installed, thereby
+# greatly improving build time. It also defers preloading of detikzify models
+# to runtime to avoid OOM errors.
 
 ## system setup
 # -----------------------------------------------------------------------------
-FROM nvcr.io/nvidia/cuda:12.1.1-cudnn8-devel-ubuntu22.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-Run apt update && apt install -y \
-  ghostscript \
-  poppler-utils \
-  git \
-  make \
-  build-essential \
-  libssl-dev \
-  zlib1g-dev \
-  libbz2-dev \
-  libreadline-dev \
-  libsqlite3-dev \
-  wget \
-  curl \
-  llvm \
-  libncursesw5-dev \
-  xz-utils \
-  tk-dev \
-  libxml2-dev \
-  libxmlsec1-dev \
-  libffi-dev \
-  liblzma-dev \
-  ffmpeg \
-  libsm6 \
-  libxext6 \
-  cmake \
-  libgl1-mesa-glx \
-  sudo
-
-# install tex live 2023
-ENV PATH=/opt/texbin:$PATH
-
-RUN curl -LO https://github.com/scottkosty/install-tl-ubuntu/raw/master/install-tl-ubuntu \
-  && chmod +x ./install-tl-ubuntu \
-  && ./install-tl-ubuntu --repository 'https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2023/tlnet-final'\
-  && rm ./install-tl-ubuntu
+FROM registry.hf.space/nllg-detikzify:gpu-7ec758b-nmbqkl3l
 
 ## setup user
 # -----------------------------------------------------------------------------
@@ -55,15 +20,6 @@ WORKDIR $HOME/app
 
 ## install python dependencies
 # -----------------------------------------------------------------------------
-
-# install pyenv
-ENV PYENV_ROOT=/opt/pyenv
-ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
-
-RUN curl https://pyenv.run | bash \
-  && chown -R root:users $PYENV_ROOT \
-  && chmod -R g+w $PYENV_ROOT
-
 RUN pyenv install 3.11 \
   && pyenv global 3.11 \
   && pyenv rehash \
@@ -75,13 +31,14 @@ RUN pyenv install 3.11 \
 RUN chown -R user $HOME/app
 COPY --chown=user . $HOME/app
 
-## preload v2 models
+## prepare cache for models
 # -----------------------------------------------------------------------------
-RUN huggingface-cli download nllg/detikzify-v2.5-8b \
+RUN mkdir -p $HOME/.cache \
   && chown -R user $HOME/.cache
 
-## launch app
+## preload detikzify-v2.5 and launch app
 # -----------------------------------------------------------------------------
 USER user
 
-CMD ["python", "app.py"]
+CMD huggingface-cli download nllg/detikzify-v2.5-8b \
+  && python app.py

Dockerfile.base

@@ -0,0 +1,56 @@
+# Custom docker image for DeTikZify. The default HF Spaces GPU image installs a
+# tex live version that is too old for our needs, so we install the correct one
+# ourselves. This Dockerfile builds the base image for the simplified
+# Dockerfile (./Dockerfile).
+
+## system setup
+# -----------------------------------------------------------------------------
+FROM nvcr.io/nvidia/cuda:12.1.1-cudnn8-devel-ubuntu22.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt install -y \
+  ghostscript \
+  poppler-utils \
+  git \
+  make \
+  build-essential \
+  libssl-dev \
+  zlib1g-dev \
+  libbz2-dev \
+  libreadline-dev \
+  libsqlite3-dev \
+  wget \
+  curl \
+  llvm \
+  libncursesw5-dev \
+  xz-utils \
+  tk-dev \
+  libxml2-dev \
+  libxmlsec1-dev \
+  libffi-dev \
+  liblzma-dev \
+  ffmpeg \
+  libsm6 \
+  libxext6 \
+  cmake \
+  libgl1-mesa-glx \
+  sudo
+
+## install tex live 2023
+# -----------------------------------------------------------------------------
+ENV PATH=/opt/texbin:$PATH
+
+RUN curl -LO https://github.com/scottkosty/install-tl-ubuntu/raw/master/install-tl-ubuntu \
+  && chmod +x ./install-tl-ubuntu \
+  && ./install-tl-ubuntu --repository 'https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2023/tlnet-final'\
+  && rm ./install-tl-ubuntu
+
+## install pyenv
+# -----------------------------------------------------------------------------
+ENV PYENV_ROOT=/opt/pyenv
+ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
+
+RUN curl https://pyenv.run | bash \
+  && chown -R root:users $PYENV_ROOT \
+  && chmod -R g+w $PYENV_ROOT

Dockerfile.full

@@ -0,0 +1,88 @@
+# Custom docker image for DeTikZify. The default HF Spaces GPU image installs a
+# tex live version that is too old for our needs, so we install the correct one
+# ourselves. This is the full Dockerfile which installs TeX Live from scratch
+# which could take a while to complete.
+
+## system setup
+# -----------------------------------------------------------------------------
+FROM nvcr.io/nvidia/cuda:12.1.1-cudnn8-devel-ubuntu22.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && apt install -y \
+  ghostscript \
+  poppler-utils \
+  git \
+  make \
+  build-essential \
+  libssl-dev \
+  zlib1g-dev \
+  libbz2-dev \
+  libreadline-dev \
+  libsqlite3-dev \
+  wget \
+  curl \
+  llvm \
+  libncursesw5-dev \
+  xz-utils \
+  tk-dev \
+  libxml2-dev \
+  libxmlsec1-dev \
+  libffi-dev \
+  liblzma-dev \
+  ffmpeg \
+  libsm6 \
+  libxext6 \
+  cmake \
+  libgl1-mesa-glx \
+  sudo
+
+# install tex live 2023
+ENV PATH=/opt/texbin:$PATH
+
+RUN curl -LO https://github.com/scottkosty/install-tl-ubuntu/raw/master/install-tl-ubuntu \
+  && chmod +x ./install-tl-ubuntu \
+  && ./install-tl-ubuntu --repository 'https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2023/tlnet-final'\
+  && rm ./install-tl-ubuntu
+
+## setup user
+# -----------------------------------------------------------------------------
+RUN useradd -m -G users -u 1000 user
+
+ENV HOME=/home/user \
+  PATH=/home/user/.local/bin:$PATH
+
+WORKDIR $HOME/app
+
+## install python dependencies
+# -----------------------------------------------------------------------------
+
+# install pyenv
+ENV PYENV_ROOT=/opt/pyenv
+ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
+
+RUN curl https://pyenv.run | bash \
+  && chown -R root:users $PYENV_ROOT \
+  && chmod -R g+w $PYENV_ROOT
+
+RUN pyenv install 3.11 \
+  && pyenv global 3.11 \
+  && pyenv rehash \
+  && pip install --no-cache-dir --upgrade setuptools wheel \
+  && pip install --no-cache-dir 'detikzify[legacy] @ git+https://github.com/potamides/DeTikZify' \
+  && pip install --no-cache-dir flash-attn --no-build-isolation \
+  && pip install --no-cache-dir spaces
+
+RUN chown -R user $HOME/app
+COPY --chown=user . $HOME/app
+
+## preload v2 models
+# -----------------------------------------------------------------------------
+RUN huggingface-cli download nllg/detikzify-v2.5-8b \
+  && chown -R user $HOME/.cache
+
+## launch app
+# -----------------------------------------------------------------------------
+USER user
+
+CMD ["python", "app.py"]