Unverified Commit cfe712bf authored by Joe Runde's avatar Joe Runde Committed by GitHub
Browse files

[CI/Build] Use python 3.12 in cuda image (#8133)


Signed-off-by: default avatarJoe Runde <Joseph.Runde@ibm.com>
parent b962ee14
...@@ -10,7 +10,7 @@ ARG CUDA_VERSION=12.4.1 ...@@ -10,7 +10,7 @@ ARG CUDA_VERSION=12.4.1
# prepare basic build environment # prepare basic build environment
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 AS base FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 AS base
ARG CUDA_VERSION=12.4.1 ARG CUDA_VERSION=12.4.1
ARG PYTHON_VERSION=3.10 ARG PYTHON_VERSION=3.12
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# Install Python and other dependencies # Install Python and other dependencies
...@@ -133,7 +133,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ ...@@ -133,7 +133,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
# image with vLLM installed # image with vLLM installed
FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 AS vllm-base FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 AS vllm-base
ARG CUDA_VERSION=12.4.1 ARG CUDA_VERSION=12.4.1
ARG PYTHON_VERSION=3.10 ARG PYTHON_VERSION=3.12
WORKDIR /vllm-workspace WORKDIR /vllm-workspace
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
...@@ -179,6 +179,10 @@ FROM vllm-base AS test ...@@ -179,6 +179,10 @@ FROM vllm-base AS test
ADD . /vllm-workspace/ ADD . /vllm-workspace/
# install development dependencies (for testing) # install development dependencies (for testing)
# A newer setuptools is required for installing some test dependencies from source that do not publish python 3.12 wheels
# This installation must complete before the test dependencies are collected and installed.
RUN --mount=type=cache,target=/root/.cache/pip \
python3 -m pip install "setuptools>=74.1.1"
RUN --mount=type=cache,target=/root/.cache/pip \ RUN --mount=type=cache,target=/root/.cache/pip \
python3 -m pip install -r requirements-dev.txt python3 -m pip install -r requirements-dev.txt
......
...@@ -27,3 +27,4 @@ gguf == 0.9.1 ...@@ -27,3 +27,4 @@ gguf == 0.9.1
importlib_metadata importlib_metadata
mistral_common >= 1.3.4 mistral_common >= 1.3.4
pyyaml pyyaml
six>=1.16.0; python_version > '3.11' # transitive dependency of pandas that needs to be the latest version for python 3.12
...@@ -95,7 +95,7 @@ def test_logger_configuring_can_be_disabled(): ...@@ -95,7 +95,7 @@ def test_logger_configuring_can_be_disabled():
config behavior, however mocks are used to ensure no changes in behavior or config behavior, however mocks are used to ensure no changes in behavior or
configuration occur.""" configuration occur."""
with patch("logging.config.dictConfig") as dict_config_mock: with patch("vllm.logger.dictConfig") as dict_config_mock:
_configure_vllm_root_logger() _configure_vllm_root_logger()
dict_config_mock.assert_not_called() dict_config_mock.assert_not_called()
...@@ -175,9 +175,9 @@ def test_custom_logging_config_is_parsed_and_used_when_provided(): ...@@ -175,9 +175,9 @@ def test_custom_logging_config_is_parsed_and_used_when_provided():
logging_config_file.flush() logging_config_file.flush()
with patch("vllm.logger.VLLM_LOGGING_CONFIG_PATH", with patch("vllm.logger.VLLM_LOGGING_CONFIG_PATH",
logging_config_file.name), patch( logging_config_file.name), patch(
"logging.config.dictConfig") as dict_config_mock: "vllm.logger.dictConfig") as dict_config_mock:
_configure_vllm_root_logger() _configure_vllm_root_logger()
assert dict_config_mock.called_with(valid_logging_config) dict_config_mock.assert_called_with(valid_logging_config)
@patch("vllm.logger.VLLM_CONFIGURE_LOGGING", 0) @patch("vllm.logger.VLLM_CONFIGURE_LOGGING", 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment