added Rocky Linux support and new Dockerfile for cpu

Dockerfile

@@ -1,85 +1,31 @@
-# Stage 1: Build detectron2
-FROM python:3.8-slim as builder
+FROM python:3.8-slim
 
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
     build-essential \
-    cmake \
-    ninja-build \
-    python3-dev \
-    gcc-8 \
-    g++-8 \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set gcc-8 as default
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
-
-# Install build dependencies
-RUN pip install --upgrade "pip<24.1" setuptools wheel
-RUN pip install torch==1.13.1+cpu torchvision==0.14.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
-RUN pip install numpy==1.21.6 cython pycocotools
-
-# Build detectron2 wheel
-WORKDIR /tmp
-RUN git clone https://github.com/facebookresearch/detectron2.git && \
-    cd detectron2 && \
-    git checkout v0.6 && \
-    python setup.py bdist_wheel && \
-    cp dist/*.whl /wheels/ || mkdir -p /wheels && \
-    pip wheel . --wheel-dir=/wheels
-
-# Stage 2: Runtime image
-FROM python:3.8-slim
-
-# Install runtime dependencies only
-RUN apt-get update && apt-get install -y \
-    libglib2.0-0 \
+    wget \
+    curl \
+    ffmpeg \
     libsm6 \
     libxext6 \
-    libxrender-dev \
-    libgomp1 \
     libgl1-mesa-glx \
-    libgcc-s1 \
     && rm -rf /var/lib/apt/lists/*
 
-# Create user
+# Create user (required by HF Spaces)
 RUN useradd -m -u 1000 user
 
 WORKDIR /app
 
 # Install Python packages
-RUN pip install --upgrade "pip<24.1" setuptools wheel
-
-# Install PyTorch
-RUN pip install torch==1.13.1+cpu torchvision==0.14.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
+COPY requirements.txt .
+RUN pip install --upgrade pip==22.3.1 && \
+    pip install --no-cache-dir -r requirements.txt
 
-# Install core dependencies
-RUN pip install \
-    numpy==1.21.6 \
-    pillow==9.5.0 \
-    pycocotools \
-    opencv-python==4.5.5.64 \
-    scipy==1.7.3 \
-    matplotlib==3.5.3
-
-# Copy and install detectron2 wheel from builder
-COPY --from=builder /wheels/detectron2*.whl /tmp/
-RUN pip install /tmp/detectron2*.whl && rm -f /tmp/detectron2*.whl
-
-# Install remaining dependencies
-RUN pip install \
-    scikit-learn==1.0.2 \
-    scikit-image==0.19.3 \
-    gradio==3.35.2 \
-    huggingface_hub==0.15.1 \
-    tqdm \
-    iopath==0.1.9 \
-    omegaconf==2.1.2 \
-    hydra-core==1.1.2 \
-    tabulate \
-    tensorboard \
-    yacs \
-    termcolor
+# Verify installations
+RUN python -c "import torch; print(f'PyTorch: {torch.__version__}, CPU: {not torch.cuda.is_available()}')"
+RUN python -c "import natten; print(f'NATTEN: {natten.__version__}')"
+RUN python -c "import detectron2; print(f'Detectron2: {detectron2.__version__}')"
 
 # Switch to user
 USER user
@@ -88,15 +34,11 @@ ENV HOME=/home/user PATH=/home/user/.local/bin:$PATH
 # Copy application
 COPY --chown=user:user . /app
 
-# Install user requirements
-COPY --chown=user:user requirements.txt /app/requirements.txt
-RUN pip install --user --no-deps -r /app/requirements.txt || true
-
-# Environment variables
+# CPU optimizations
 ENV CUDA_VISIBLE_DEVICES=""
 ENV FORCE_CUDA="0"
-ENV TORCH_CUDA_ARCH_LIST=""
-ENV PYTHONUNBUFFERED=1
+ENV OMP_NUM_THREADS=4
+ENV MKL_NUM_THREADS=4
 
 EXPOSE 7860
-CMD ["python", "app.py"]
+CMD ["python", "gradio_app.py"]

deform_setup_cpu.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+echo '----------------------------------------------------------------'
+echo 'CPU Setup - Skipping CUDA operations compilation'
+echo '----------------------------------------------------------------'
+pip3 freeze | grep torch
+pip3 freeze | grep detectron2
+pip3 freeze | grep natten
+echo '----------------------------------------------------------------'
+echo 'CPU setup complete'
+echo '----------------------------------------------------------------'

requirements.txt

@@ -1,24 +1,65 @@
-# Git dependencies compatible with Python 3.8
+# PyTorch CPU versions
+--extra-index-url https://download.pytorch.org/whl/cpu
+torch==1.9.0+cpu
+torchvision==0.10.0+cpu
+torchaudio==0.9.0
+
+# Core dependencies
+numpy==1.21.6
+Pillow==8.3.2
+
+# Detectron2 CPU version
+-f https://dl.fbaipublicfiles.com/detectron2/wheels/cpu/torch1.9/index.html
+detectron2==0.6
+
+# OpenCV
+opencv-python==4.5.5.64
+
+# Git dependencies
 git+https://github.com/cocodataset/panopticapi.git@7bb4655
 git+https://github.com/mcordts/cityscapesScripts.git@4f57ab6
 
-# Core dependencies with Python 3.8 compatible versions
+# Image utilities
 imutils==0.5.4
+
+# NATTEN CPU version for torch 1.9
+-f https://shi-labs.com/natten/wheels/cpu/torch1.9/index.html
+natten==0.14.6
+
+# Build tools
 cython==0.29.35
+setuptools==59.5.0
+
+# Scientific computing
+scipy==1.7.3
+shapely==1.8.5
 h5py==3.7.0
+scikit-image==0.19.3
+
+# Deep learning utilities
 timm==0.4.12
 einops==0.6.1
-gdown==4.5.4
-wget==3.2
-submitit==1.4.5
-shapely==1.8.5
-regex==2022.10.31
+
+# Development tools
+icecream==2.1.3
+wandb==0.13.5
+tqdm==4.64.1
+
+# NLP utilities
 ftfy==6.1.1
+regex==2022.10.31
 inflect==6.0.4
 
-# Don't install these - handled in Dockerfile
-# torch
-# torchvision
-# detectron2
-# numpy
-# pillow
+# File utilities
+gdown==4.5.4
+wget==3.2
+huggingface_hub==0.11.1
+
+# Training framework
+pytorch_lightning==1.8.6
+
+# Web interface
+gradio==3.16.2
+
+# Job submission
+submitit==1.4.5