Skip to content

Commit 1ee0442

Browse files
committed
set PYTHON_VERSION for python installations
1 parent 6f75b30 commit 1ee0442

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

container/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,9 @@ RUN if [ "$ARCH" = "arm64" ]; then \
238238
##################################
239239

240240
# Create and activate virtual environment
241+
ARG PYTHON_VERSION
241242
RUN mkdir -p /opt/dynamo/venv && \
242-
uv venv /opt/dynamo/venv --python 3.12
243+
uv venv /opt/dynamo/venv --python $PYTHON_VERSION
243244

244245
ENV VIRTUAL_ENV=/opt/dynamo/venv \
245246
PATH="/opt/dynamo/venv/bin:${PATH}"
@@ -280,8 +281,9 @@ ENV CARGO_BUILD_JOBS=${CARGO_BUILD_JOBS:-16} \
280281
PATH=/usr/local/cargo/bin:/opt/dynamo/venv/bin:$PATH
281282

282283
# Install system dependencies
284+
ARG PYTHON_VERSION
283285
RUN dnf update -y \
284-
&& dnf install -y llvm-toolset protobuf-compiler python3.12-devel wget \
286+
&& dnf install -y llvm-toolset protobuf-compiler python${PYTHON_VERSION}-devel wget \
285287
&& dnf clean all \
286288
&& rm -rf /var/cache/dnf
287289

container/Dockerfile.vllm

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ ARG FLASHINF_REF="v0.2.11"
4242
# without adding if statements everywhere, so just define both as ARGs for now.
4343
ARG ARCH=amd64
4444
ARG ARCH_ALT=x86_64
45+
# Python configuration
46+
ARG PYTHON_VERSION=3.12
4547

4648
ARG DYNAMO_BASE_IMAGE="dynamo:latest-none"
4749
FROM ${DYNAMO_BASE_IMAGE} AS dynamo_base
@@ -75,18 +77,19 @@ RUN apt-get update -y \
7577
ibverbs-utils \
7678
libibumad-dev \
7779
libibverbs-dev \
78-
librdmacm-dev \
7980
libnuma-dev \
81+
librdmacm-dev \
8082
rdma-core \
8183
&& apt-get clean \
8284
&& rm -rf /var/lib/apt/lists/*
8385

8486
### VIRTUAL ENVIRONMENT SETUP ###
8587

8688
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
89+
ARG PYTHON_VERSION
8790
# Create virtual environment
8891
RUN mkdir -p /opt/dynamo/venv && \
89-
uv venv /opt/dynamo/venv --python 3.12
92+
uv venv /opt/dynamo/venv --python $PYTHON_VERSION
9093

9194
# Activate virtual environment
9295
ENV VIRTUAL_ENV=/opt/dynamo/venv \
@@ -240,12 +243,13 @@ $LD_LIBRARY_PATH
240243
### VIRTUAL ENVIRONMENT SETUP ###
241244

242245
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
243-
RUN uv venv ${VIRTUAL_ENV} --python 3.12
246+
ARG PYTHON_VERSION
247+
RUN uv venv ${VIRTUAL_ENV} --python $PYTHON_VERSION
244248

245249
# Copy virtual environment from framework image to avoid re-installing framework + vllm dependencies
246250
COPY --from=framework \
247-
/opt/dynamo/venv/lib/python3.12/site-packages \
248-
/opt/dynamo/venv/lib/python3.12/site-packages
251+
/opt/dynamo/venv/lib/python${PYTHON_VERSION}/site-packages \
252+
/opt/dynamo/venv/lib/python${PYTHON_VERSION}/site-packages
249253

250254
# Install dynamo, NIXL, and dynamo-specific dependencies
251255
COPY benchmarks/ /opt/dynamo/benchmarks/

0 commit comments

Comments
 (0)