Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfile*.ubi: bump python to 3.12 #158

Merged
merged 3 commits into from
Sep 16, 2024
Merged

Dockerfile*.ubi: bump python to 3.12 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
514af68
Dockerfile.ubi: bump python to 3.12
dtrifiro Sep 12, 2024
4fae090
Dockerfile.ubi: bump flashinfer to 0.1.6
dtrifiro Sep 12, 2024
91c4c51
Dockerfile.rocm.ubi: do not use nightly pytorch_triton
dtrifiro Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Dockerfile.rocm.ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Global Args #################################################################
ARG BASE_UBI_IMAGE_TAG=9.4
ARG PYTHON_VERSION=3.11
ARG PYTHON_VERSION=3.12
# Default ROCm ARCHes to build vLLM for.
ARG PYTORCH_ROCM_ARCH="gfx908;gfx90a;gfx942;gfx1100"
ARG MAX_JOBS=12
Expand Down Expand Up @@ -132,7 +132,6 @@ FROM rocm_devel AS build_triton
# Whether to build triton on rocm
ARG BUILD_TRITON="0"
ARG TRITON_BRANCH="e0fc12c"
ARG TRITON_WHEEL_SHA=21eae954ef

# Build triton wheel if `BUILD_TRITON` is set to 1
RUN --mount=type=cache,target=/root/.cache/ccache \
Expand All @@ -148,7 +147,7 @@ RUN --mount=type=cache,target=/root/.cache/ccache \
python3 setup.py bdist_wheel --dist-dir=/install; \
else \
mkdir -p /install && \
wget -P /install "https://download.pytorch.org/whl/nightly/pytorch_triton_rocm-3.0.0%2B${TRITON_WHEEL_SHA}-cp311-cp311-linux_x86_64.whl"; \
wget -P /install "https://download.pytorch.org/whl/pytorch_triton_rocm-3.0.0-cp312-cp312-linux_x86_64.whl#sha256=650ce7a6624ecbbe90c30fccb472a57772c08bc6f12312246f7af584f275b7ca"; \
fi

##################################################################################################
Expand Down Expand Up @@ -179,7 +178,6 @@ RUN --mount=type=cache,target=/root/.cache/ccache \

FROM rocm_base AS vllm-openai
ARG MAX_JOBS
ARG PYTHON_VERSION

WORKDIR /workspace

Expand Down
16 changes: 7 additions & 9 deletions Dockerfile.ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
## Global Args #################################################################
ARG BASE_UBI_IMAGE_TAG=9.4
ARG PYTHON_VERSION=3.11
ARG PYTHON_VERSION=3.12

ARG TORCH_CUDA_ARCH_LIST="7.0 7.5 8.0 8.6 8.9 9.0+PTX"

## Base Layer ##################################################################
FROM registry.access.redhat.com/ubi9/ubi-minimal:${BASE_UBI_IMAGE_TAG} as base
ARG PYTHON_VERSION

RUN microdnf -y update && \
microdnf install -y \
ENV PYTHON_VERSION=$PYTHON_VERSION
ARG PYTHON_VERSION RUN microdnf -y update && \ microdnf install -y \
python${PYTHON_VERSION}-pip python${PYTHON_VERSION}-wheel \
&& microdnf clean all

Expand All @@ -26,13 +24,13 @@ RUN microdnf install -y \

## Python Installer ############################################################
FROM base as python-install

ARG PYTHON_VERSION

ENV VIRTUAL_ENV=/opt/vllm
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
ENV PYTHON_VERSION=$PYTHON_VERSION
RUN microdnf install -y \
python${PYTHON_VERSION}-devel python${PYTHON_VERSION}-pip python${PYTHON_VERSION}-wheel && \
python${PYTHON_VERSION}-devel && \
python${PYTHON_VERSION} -m venv $VIRTUAL_ENV && pip install --no-cache -U pip wheel uv && microdnf clean all


Expand Down Expand Up @@ -151,7 +149,6 @@ RUN CFLAGS="-O3 -Wall -Werror=format-security -Wno-unused-function -Wp,-D_GLIBCX

## Release #####################################################################
FROM python-install AS vllm-openai
ARG PYTHON_VERSION

WORKDIR /workspace

Expand Down Expand Up @@ -180,7 +177,8 @@ RUN --mount=type=bind,from=libsodium-builder,src=/usr/src/libsodium,target=/usr/

RUN --mount=type=cache,target=/root/.cache/pip \
--mount=type=cache,target=/root/.cache/uv \
uv pip install https://github.com/flashinfer-ai/flashinfer/releases/download/v0.1.2/flashinfer-0.1.2+cu121torch2.4-cp311-cp311-linux_x86_64.whl
uv pip install \
"https://github.com/flashinfer-ai/flashinfer/releases/download/v0.1.6/flashinfer-0.1.6+cu124torch2.4-cp312-cp312-linux_x86_64.whl"

ENV HF_HUB_OFFLINE=1 \
HOME=/home/vllm \
Expand Down
Loading