Build image in CI checks

Signed-off-by: Pierangelo Di Pilato <[email protected]>

Author: pierDipi

.github/workflows/ci-pr-checks.yaml

@@ -57,6 +57,10 @@ jobs:
           CPATH: ${{ env.CPATH }}
           PKG_CONFIG_PATH: ${{ env.PKG_CONFIG_PATH }}
 
+      - name: Build Container image
+        run: |
+          make image-build SIM_TAG=pr-check
+
       - name: Run go test
         shell: bash
         run: |

Dockerfile

@@ -6,8 +6,9 @@ ARG TARGETARCH
 # Install build tools
 # The builder is based on UBI8, so we need epel-release-8.
 RUN dnf install -y 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm' && \
-    dnf install -y gcc-c++ libstdc++ libstdc++-devel clang zeromq-devel pkgconfig python3-devel && \
+    dnf install -y gcc-c++ libstdc++ libstdc++-devel clang zeromq-devel pkgconfig python3.12-devel python3.12-pip git && \
     dnf clean all
+# python3.12-devel needed for CGO compilation (Python headers and python3.12-config for linker flags)
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -28,11 +29,13 @@ ARG TOKENIZER_VERSION=v1.22.1
 RUN curl -L https://github.com/daulet/tokenizers/releases/download/${TOKENIZER_VERSION}/libtokenizers.${TARGETOS}-${TARGETARCH}.tar.gz | tar -xz -C lib
 RUN ranlib lib/*.a
 
-# Copy Python wrapper from kv-cache-manager dependency
+# Copy Python wrapper and requirements from kv-cache-manager dependency
 # Extract version dynamically and copy to a known location
 RUN KV_CACHE_MGR_VERSION=$(go list -m -f '{{.Version}}' github.com/llm-d/llm-d-kv-cache-manager) && \
     mkdir -p /workspace/kv-cache-manager-wrapper && \
     cp /go/pkg/mod/github.com/llm-d/llm-d-kv-cache-manager@${KV_CACHE_MGR_VERSION}/pkg/preprocessing/chat_completions/render_jinja_template_wrapper.py \
+       /workspace/kv-cache-manager-wrapper/ && \
+    cp /go/pkg/mod/github.com/llm-d/llm-d-kv-cache-manager@${KV_CACHE_MGR_VERSION}/pkg/preprocessing/chat_completions/requirements.txt \
        /workspace/kv-cache-manager-wrapper/
 
 # Build
@@ -43,7 +46,12 @@ RUN KV_CACHE_MGR_VERSION=$(go list -m -f '{{.Version}}' github.com/llm-d/llm-d-k
 ENV CGO_ENABLED=1
 ENV GOOS=${TARGETOS:-linux}
 ENV GOARCH=${TARGETARCH}
-RUN go build -a -o bin/llm-d-inference-sim -ldflags="-extldflags '-L$(pwd)/lib'" cmd/cmd.go
+ENV PYTHON=python3.12
+ENV PYTHONPATH=/usr/lib64/python3.12/site-packages:/usr/lib/python3.12/site-packages
+
+RUN export CGO_CFLAGS="$(python3.12-config --cflags) -I/workspace/lib" && \
+    export CGO_LDFLAGS="$(python3.12-config --ldflags --embed) -L/workspace/lib -ltokenizers -ldl -lm" && \
+    go build -a -o bin/llm-d-inference-sim -ldflags="-extldflags '-L$(pwd)/lib'" cmd/cmd.go
 
 # Runtime stage
 # Use ubi9 as a minimal base image to package the manager binary
@@ -59,24 +67,28 @@ USER root
 RUN curl -L -o /tmp/epel-release.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     rpm -i /tmp/epel-release.rpm && \
     rm /tmp/epel-release.rpm && \
-    microdnf install -y --setopt=install_weak_deps=0 zeromq python3 python3-libs python3-pip && \
+    microdnf install -y --setopt=install_weak_deps=0 zeromq python3.12 python3.12-libs python3.12-pip && \
     microdnf clean all && \
-    rm -rf /var/cache/yum /var/lib/yum
+    rm -rf /var/cache/yum /var/lib/yum && \
+    ln -sf /usr/bin/python3.12 /usr/bin/python3 && \
+    ln -sf /usr/bin/python3.12 /usr/bin/python
 
 # Install wrapper as a module in site-packages
-# Extract the kv-cache-manager version dynamically from go.mod in the builder stage
-RUN mkdir -p /usr/local/lib/python3.9/site-packages/
-COPY --from=builder /workspace/kv-cache-manager-wrapper/render_jinja_template_wrapper.py /usr/local/lib/python3.9/site-packages/
+RUN mkdir -p /usr/local/lib/python3.12/site-packages/
+COPY --from=builder /workspace/kv-cache-manager-wrapper/render_jinja_template_wrapper.py /usr/local/lib/python3.12/site-packages/
 
-# Python deps (no cache, single target) – install transformers
+# Python deps (no cache, single target) – filter out torch
 ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1
-RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel && \
-    python3 -m pip install --no-cache-dir --target /usr/local/lib/python3.9/site-packages transformers && \
+COPY --from=builder /workspace/kv-cache-manager-wrapper/requirements.txt /tmp/requirements.txt
+RUN sed '/^torch\b/d' /tmp/requirements.txt > /tmp/requirements.notorch.txt && \
+    python3.12 -m pip install --no-cache-dir --upgrade pip setuptools wheel && \
+    python3.12 -m pip install --no-cache-dir --target /usr/local/lib/python3.12/site-packages -r /tmp/requirements.notorch.txt && \
+    rm /tmp/requirements.txt /tmp/requirements.notorch.txt && \
     rm -rf /root/.cache/pip
 
 # Python env
-ENV PYTHONPATH="/usr/local/lib/python3.9/site-packages:/usr/lib/python3.9/site-packages"
-ENV PYTHON=python3
+ENV PYTHONPATH="/usr/local/lib/python3.12/site-packages:/usr/lib/python3.12/site-packages"
+ENV PYTHON=python3.12
 
 COPY --from=builder /workspace/bin/llm-d-inference-sim /app/llm-d-inference-sim