Skip to content

Commit 1689219

Browse files
authored
[CI/Build] Build on Ubuntu 20.04 instead of 22.04 (#6517)
1 parent 4ffffcc commit 1689219

File tree

4 files changed

+31
-13
lines changed

4 files changed

+31
-13
lines changed

.buildkite/test-pipeline.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
fast_check: true
2222
fast_check_only: true
2323
commands:
24-
- apt-get install curl libsodium23 && pytest -v -s tensorizer_loader # Tensorizer
24+
- apt-get install -y curl libsodium23 && pytest -v -s tensorizer_loader # Tensorizer
2525
- pytest -v -s metrics # Metrics
2626
- "pip install \
2727
opentelemetry-sdk \
@@ -221,7 +221,7 @@ steps:
221221
- label: Tensorizer Test
222222
#mirror_hardwares: [amd]
223223
commands:
224-
- apt-get install curl libsodium23
224+
- apt-get install -y curl libsodium23
225225
- export VLLM_WORKER_MULTIPROC_METHOD=spawn
226226
- pytest -v -s tensorizer_loader
227227

Dockerfile

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
ARG CUDA_VERSION=12.4.1
99
#################### BASE BUILD IMAGE ####################
1010
# prepare basic build environment
11-
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04 AS base
11+
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 AS base
1212

1313
ARG CUDA_VERSION=12.4.1
14-
ARG PYTHON_VERSION=3
14+
ARG PYTHON_VERSION=3.10
1515

1616
ENV DEBIAN_FRONTEND=noninteractive
1717

@@ -21,13 +21,16 @@ RUN echo 'tzdata tzdata/Areas select America' | debconf-set-selections \
2121
&& apt-get install -y ccache software-properties-common \
2222
&& add-apt-repository ppa:deadsnakes/ppa \
2323
&& apt-get update -y \
24-
&& apt-get install -y python${PYTHON_VERSION} python${PYTHON_VERSION}-dev python${PYTHON_VERSION}-venv python3-pip \
24+
&& apt-get install -y python${PYTHON_VERSION} python${PYTHON_VERSION}-dev python${PYTHON_VERSION}-venv \
2525
&& if [ "${PYTHON_VERSION}" != "3" ]; then update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1; fi \
26-
&& python3 --version \
27-
&& python3 -m pip --version
26+
&& python3 --version
2827

2928
RUN apt-get update -y \
30-
&& apt-get install -y python3-pip git curl sudo
29+
&& apt-get install -y git curl sudo
30+
31+
# Install pip s.t. it will be compatible with our PYTHON_VERSION
32+
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION}
33+
RUN python3 -m pip --version
3134

3235
# Workaround for https://github.com/openai/triton/issues/2507 and
3336
# https://github.com/pytorch/pytorch/issues/107960 -- hopefully
@@ -58,7 +61,7 @@ ENV TORCH_CUDA_ARCH_LIST=${torch_cuda_arch_list}
5861
#################### WHEEL BUILD IMAGE ####################
5962
FROM base AS build
6063

61-
ARG PYTHON_VERSION=3
64+
ARG PYTHON_VERSION=3.10
6265

6366
# install build dependencies
6467
COPY requirements-build.txt requirements-build.txt
@@ -149,12 +152,27 @@ RUN pip --verbose wheel -r requirements-mamba.txt \
149152

150153
#################### vLLM installation IMAGE ####################
151154
# image with vLLM installed
152-
FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu22.04 AS vllm-base
155+
FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 AS vllm-base
153156
ARG CUDA_VERSION=12.4.1
157+
ARG PYTHON_VERSION=3.10
154158
WORKDIR /vllm-workspace
155159

160+
RUN echo 'tzdata tzdata/Areas select America' | debconf-set-selections \
161+
&& echo 'tzdata tzdata/Zones/America select Los_Angeles' | debconf-set-selections \
162+
&& apt-get update -y \
163+
&& apt-get install -y ccache software-properties-common \
164+
&& add-apt-repository ppa:deadsnakes/ppa \
165+
&& apt-get update -y \
166+
&& apt-get install -y python${PYTHON_VERSION} python${PYTHON_VERSION}-dev python${PYTHON_VERSION}-venv \
167+
&& if [ "${PYTHON_VERSION}" != "3" ]; then update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1; fi \
168+
&& python3 --version
169+
156170
RUN apt-get update -y \
157-
&& apt-get install -y python3-pip git vim
171+
&& apt-get install -y python3-pip git curl
172+
173+
# Install pip s.t. it will be compatible with our PYTHON_VERSION
174+
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION}
175+
RUN python3 -m pip --version
158176

159177
# Workaround for https://github.com/openai/triton/issues/2507 and
160178
# https://github.com/pytorch/pytorch/issues/107960 -- hopefully

Dockerfile.openvino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The vLLM Dockerfile is used to construct vLLM image that can be directly used
22
# to run the OpenAI compatible server.
33

4-
FROM ubuntu:22.04 AS dev
4+
FROM ubuntu:20.04 AS dev
55

66
RUN apt-get update -y && \
77
apt-get install -y python3-pip git

Dockerfile.xpu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM intel/oneapi-basekit:2024.1.0-devel-ubuntu22.04
1+
FROM intel/oneapi-basekit:2024.1.0-devel-ubuntu20.04
22

33
RUN wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | tee /usr/share/keyrings/intel-oneapi-archive-keyring.gpg > /dev/null && \
44
echo "deb [signed-by=/usr/share/keyrings/intel-oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main " | tee /etc/apt/sources.list.d/oneAPI.list && \

0 commit comments

Comments
 (0)