updating dockerfile and dependencies for optimal hf deployment

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10
+FROM python:3.10-slim
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \
     libgl1-mesa-glx \
     libgtk2.0-dev \
     wget \
+    curl \
     unzip \
     ffmpeg \
     libopencv-dev \
@@ -23,13 +24,27 @@ RUN apt-get update && apt-get install -y \
 # Create user
 RUN useradd -m -u 1000 user
 
-# Install PyTorch with ALL dependencies
-RUN pip install torch==2.0.1+cpu torchvision==0.15.2+cpu torchaudio==2.0.2+cpu \
-    --index-url https://download.pytorch.org/whl/cpu
+# Install Python dependencies in correct order
+RUN pip install --upgrade pip setuptools wheel
 
-# Install detectron2 using pre-built wheel (much more reliable)
+# Install sympy FIRST (required by torch)
+RUN pip install sympy
+
+# Install PyTorch CPU version
+RUN pip install torch==2.0.1+cpu torchvision==0.15.2+cpu --index-url https://download.pytorch.org/whl/cpu
+
+# Install detectron2 from pre-built wheel (more reliable)
 RUN pip install detectron2 -f https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch2.0/index.html
 
+# Install other dependencies
+RUN pip install \
+    numpy>=1.23.0,<2.0.0 \
+    opencv-python \
+    scipy \
+    scikit-learn \
+    gradio \
+    huggingface_hub
+
 # Switch to user
 USER user
 ENV HOME=/home/user PATH=/home/user/.local/bin:$PATH
@@ -40,12 +55,19 @@ ENV CUDA_VISIBLE_DEVICES=""
 ENV FORCE_CUDA="0"
 ENV TORCH_CUDA_ARCH_LIST=""
 
-# Copy and install requirements
+# Copy requirements and install remaining dependencies
 COPY --chown=user:user requirements.txt .
 RUN pip install --user --no-cache-dir -r requirements.txt
 
 # Copy app files
 COPY --chown=user:user . .
 
+# Clone and setup OneFormer if needed
+RUN if [ ! -d "oneformer" ]; then \
+    git clone https://github.com/SHI-Labs/OneFormer.git oneformer && \
+    cd oneformer && \
+    pip install --user -e . ; \
+    fi
+
 EXPOSE 7860
-CMD ["python", "app.py"]
+CMD ["python", "gradio_test.py"]

requirements.txt

@@ -1,19 +1,62 @@
-# Core dependencies (NO torch, NO detectron2, NO natten)
+# Core dependencies (torch and detectron2 installed in Dockerfile)
 numpy>=1.23.0,<2.0.0
 Pillow>=8.3.2
 opencv-python
+scipy
+scikit-learn
+scikit-image
+shapely
+h5py
+timm==0.4.12
+einops
+tqdm
+gradio>=4.0.0
+huggingface_hub
+matplotlib
+pycocotools
+
+# Git dependencies
 git+https://github.com/cocodataset/panopticapi.git
 git+https://github.com/mcordts/cityscapesScripts.git
+
+# Additional utilities
 imutils
 cython
 setuptools==59.5.0
+submitit
+icecream
+wandb
+ftfy
+regex
+inflect
+diffdist
+gdown
+wget# Core dependencies (torch and detectron2 installed in Dockerfile)
+numpy>=1.23.0,<2.0.0
+Pillow>=8.3.2
+opencv-python
 scipy
+scikit-learn
+scikit-image
 shapely
 h5py
-submitit
-scikit-image
 timm==0.4.12
 einops
+tqdm
+gradio>=4.0.0
+huggingface_hub
+matplotlib
+pycocotools
+
+# Git dependencies
+git+https://github.com/cocodataset/panopticapi.git
+git+https://github.com/mcordts/cityscapesScripts.git
+
+# Additional utilities
+imutils
+cython
+setuptools==59.5.0
+submitit
 icecream
 wandb
 ftfy
@@ -21,11 +64,4 @@ regex
 inflect
 diffdist
 gdown
-huggingface_hub
-pytorch_lightning==2.0.0
-tqdm
-gradio
 wget
-
-# NATTEN - install separately if needed
-# natten==0.14.6+torch200cpu -f https://shi-labs.com/natten/wheels/cpu/torch2.0.0/index.html