From 7b4f6972afd159ae82b4766472cc0b8a4b43cf6d Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Tue, 3 Sep 2024 14:27:51 -0600 Subject: [PATCH 1/8] :arrow_up: use python 3.12 in prod image Signed-off-by: Joe Runde --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec6069f605eb1..9288704e045b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG CUDA_VERSION=12.4.1 # prepare basic build environment FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04 AS base ARG CUDA_VERSION=12.4.1 -ARG PYTHON_VERSION=3.10 +ARG PYTHON_VERSION=3.12 ENV DEBIAN_FRONTEND=noninteractive # Install Python and other dependencies From c5772e043b80003ba92aff605a4e1fa53c7a7b8c Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Tue, 3 Sep 2024 15:00:23 -0600 Subject: [PATCH 2/8] :bug: align other python version arg Signed-off-by: Joe Runde --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9288704e045b9..ae0dab39003cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -128,7 +128,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ # image with vLLM installed FROM nvidia/cuda:${CUDA_VERSION}-base-ubuntu20.04 AS vllm-base ARG CUDA_VERSION=12.4.1 -ARG PYTHON_VERSION=3.10 +ARG PYTHON_VERSION=3.12 WORKDIR /vllm-workspace ENV DEBIAN_FRONTEND=noninteractive From 195b19ed00c0132bbbb3a8fd6aee73bf507be8da Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Tue, 3 Sep 2024 17:24:13 -0600 Subject: [PATCH 3/8] :bug: fixup test installs Signed-off-by: Joe Runde --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index ae0dab39003cb..a5a01d7e49ba5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -174,6 +174,10 @@ FROM vllm-base AS test ADD . /vllm-workspace/ # 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 \ python3 -m pip install -r requirements-dev.txt From 3c430c14619dfc308a108eaa33839d1e9117273f Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Wed, 4 Sep 2024 09:31:49 -0600 Subject: [PATCH 4/8] :bug: fixup called_with assert Signed-off-by: Joe Runde --- tests/test_logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_logger.py b/tests/test_logger.py index 29346cd0878b8..ec7803c22acc6 100644 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -177,7 +177,7 @@ def test_custom_logging_config_is_parsed_and_used_when_provided(): logging_config_file.name), patch( "logging.config.dictConfig") as dict_config_mock: _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) From 4d7ed4641e7848162142af9f51a5a604adb295fc Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Wed, 4 Sep 2024 09:43:22 -0600 Subject: [PATCH 5/8] :bug: pin six Signed-off-by: Joe Runde --- requirements-common.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-common.txt b/requirements-common.txt index 4c5b681a0d5ab..4b6a72019ce65 100644 --- a/requirements-common.txt +++ b/requirements-common.txt @@ -26,3 +26,4 @@ gguf == 0.9.1 importlib_metadata mistral_common >= 1.3.4 pyyaml +six>=1.16.0; python_version > '3.11' # transitive dependency of pandas that needs to be the latest version for python 3.12 From 1f636d2aebd54181786eeb3ad831e20b193ac151 Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Wed, 4 Sep 2024 09:55:58 -0600 Subject: [PATCH 6/8] :bug: update one lora example Signed-off-by: Joe Runde --- tests/lora/test_gemma.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lora/test_gemma.py b/tests/lora/test_gemma.py index 709246179bfe4..478bb86b78610 100644 --- a/tests/lora/test_gemma.py +++ b/tests/lora/test_gemma.py @@ -37,7 +37,7 @@ def test_gemma_lora(gemma_lora_files): expected_lora_output = [ "more important than knowledge.\nAuthor: Albert Einstein\n", "everyone else is already taken.\nAuthor: Oscar Wilde\n", - "so little time\nAuthor: Frank Zappa\n", + "so little time.\nAuthor: Frank Zappa\n", ] output1 = do_sample(llm, gemma_lora_files, lora_id=1) From 731ff2ee8e524a0fc507e12e21196ff6b3f91582 Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Wed, 4 Sep 2024 11:19:01 -0600 Subject: [PATCH 7/8] empty bump Signed-off-by: Joe Runde From b2e05b4de3334329076430e43e5a7093570d6c5b Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Wed, 4 Sep 2024 16:10:30 -0600 Subject: [PATCH 8/8] :bug: fixup mock patch Signed-off-by: Joe Runde --- tests/test_logger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_logger.py b/tests/test_logger.py index ec7803c22acc6..8f3d218416870 100644 --- a/tests/test_logger.py +++ b/tests/test_logger.py @@ -95,7 +95,7 @@ def test_logger_configuring_can_be_disabled(): config behavior, however mocks are used to ensure no changes in behavior or configuration occur.""" - with patch("logging.config.dictConfig") as dict_config_mock: + with patch("vllm.logger.dictConfig") as dict_config_mock: _configure_vllm_root_logger() dict_config_mock.assert_not_called() @@ -175,7 +175,7 @@ def test_custom_logging_config_is_parsed_and_used_when_provided(): logging_config_file.flush() with patch("vllm.logger.VLLM_LOGGING_CONFIG_PATH", logging_config_file.name), patch( - "logging.config.dictConfig") as dict_config_mock: + "vllm.logger.dictConfig") as dict_config_mock: _configure_vllm_root_logger() dict_config_mock.assert_called_with(valid_logging_config)