From 9879143e48a102b2dc8c2c14e589b56a2af0780a Mon Sep 17 00:00:00 2001 From: Avram Tudor Date: Mon, 18 Nov 2024 13:03:38 +0200 Subject: [PATCH] fix: downgrade vllm (#122) Co-authored-by: Avram Tudor --- poetry.lock | 58 ++++++++---------------------------------------- pyproject.toml | 2 +- requirements.txt | 6 ++--- 3 files changed, 12 insertions(+), 54 deletions(-) diff --git a/poetry.lock b/poetry.lock index 42d3e40..a6f5c3c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -644,26 +644,6 @@ humanfriendly = ">=9.1" [package.extras] cron = ["capturer (>=2.4)"] -[[package]] -name = "compressed-tensors" -version = "0.6.0" -description = "Library for utilization of compressed safetensors of neural network models" -optional = false -python-versions = "*" -files = [ - {file = "compressed-tensors-0.6.0.tar.gz", hash = "sha256:639ca97afc852602be0d3666b236ad6a96880de45af87851f515047eff700927"}, - {file = "compressed_tensors-0.6.0-py3-none-any.whl", hash = "sha256:1be9c466e38b992b1d462e577f7e1b2bfad5d1aa0e25e9c95ab1ee458b9e92a2"}, -] - -[package.dependencies] -pydantic = ">=2.0" -torch = ">=1.7.0" -transformers = "*" - -[package.extras] -accelerate = ["accelerate"] -dev = ["black (==22.12.0)", "flake8 (>=3.8.3)", "isort (==5.8.0)", "nbconvert (>=7.16.3)", "pytest (>=6.0.0)", "wheel (>=0.36.2)"] - [[package]] name = "crashtest" version = "0.4.1" @@ -1986,7 +1966,6 @@ files = [ [package.dependencies] jsonschema = ">=4.21.1,<5.0.0" numpy = {version = ">=1.25", markers = "python_version >= \"3.9\""} -opencv-python-headless = {version = ">=4.0.0,<5.0.0", optional = true, markers = "extra == \"opencv\""} pillow = ">=10.3.0,<11.0.0" pydantic = ">=2.6.1,<3.0.0" requests = ">=2.0.0,<3.0.0" @@ -2648,25 +2627,6 @@ typing-extensions = ">=4.11,<5" [package.extras] datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"] -[[package]] -name = "opencv-python-headless" -version = "4.10.0.84" -description = "Wrapper package for OpenCV python bindings." -optional = false -python-versions = ">=3.6" -files = [ - {file = "opencv-python-headless-4.10.0.84.tar.gz", hash = "sha256:f2017c6101d7c2ef8d7bc3b414c37ff7f54d64413a1847d89970b6b7069b4e1a"}, - {file = "opencv_python_headless-4.10.0.84-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:a4f4bcb07d8f8a7704d9c8564c224c8b064c63f430e95b61ac0bffaa374d330e"}, - {file = "opencv_python_headless-4.10.0.84-cp37-abi3-macosx_12_0_x86_64.whl", hash = "sha256:5ae454ebac0eb0a0b932e3406370aaf4212e6a3fdb5038cc86c7aea15a6851da"}, - {file = "opencv_python_headless-4.10.0.84-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:46071015ff9ab40fccd8a163da0ee14ce9846349f06c6c8c0f2870856ffa45db"}, - {file = "opencv_python_headless-4.10.0.84-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:377d08a7e48a1405b5e84afcbe4798464ce7ee17081c1c23619c8b398ff18295"}, - {file = "opencv_python_headless-4.10.0.84-cp37-abi3-win32.whl", hash = "sha256:9092404b65458ed87ce932f613ffbb1106ed2c843577501e5768912360fc50ec"}, - {file = "opencv_python_headless-4.10.0.84-cp37-abi3-win_amd64.whl", hash = "sha256:afcf28bd1209dd58810d33defb622b325d3cbe49dcd7a43a902982c33e5fad05"}, -] - -[package.dependencies] -numpy = {version = ">=1.23.5", markers = "python_version >= \"3.11\""} - [[package]] name = "orjson" version = "3.10.7" @@ -5384,25 +5344,24 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [[package]] name = "vllm" -version = "0.6.3.post1" +version = "0.6.2" description = "A high-throughput and memory-efficient inference and serving engine for LLMs" optional = false python-versions = ">=3.8" files = [ - {file = "vllm-0.6.3.post1-cp38-abi3-manylinux1_x86_64.whl", hash = "sha256:691f10edb9869eb8b85bebfe2c0fb3c6a6b2cf2aefad7cdb2ab97688a57ca60e"}, - {file = "vllm-0.6.3.post1.tar.gz", hash = "sha256:0aae6ddd5348f86bf20e4f323c09e77d5ad2638d77f0d69323c5a63a40f8c143"}, + {file = "vllm-0.6.2-cp38-abi3-manylinux1_x86_64.whl", hash = "sha256:414e2244a6c3a97175e7659f9a6e10c2e295376d1d1e4bec704da18caa237f0b"}, + {file = "vllm-0.6.2.tar.gz", hash = "sha256:2fffd856a25d3defa38a539150fccf9126959ce4c6781c1c5a76d5da7216af59"}, ] [package.dependencies] aiohttp = "*" -compressed-tensors = "0.6.0" einops = "*" -fastapi = {version = ">=0.107.0,<0.113.dev0 || >0.114.0", markers = "python_version >= \"3.9\""} +fastapi = {version = ">=0.114.1", markers = "python_version >= \"3.9\""} filelock = ">=3.10.4" gguf = "0.10.0" importlib-metadata = "*" lm-format-enforcer = "0.10.6" -mistral-common = {version = ">=1.4.4", extras = ["opencv"]} +mistral-common = ">=1.4.3" msgspec = "*" numpy = "<2.0.0" nvidia-ml-py = "*" @@ -5419,14 +5378,14 @@ pydantic = ">=2.9" pyyaml = "*" pyzmq = "*" ray = ">=2.9" -requests = ">=2.26.0" +requests = "*" sentencepiece = "*" tiktoken = ">=0.6.0" tokenizers = ">=0.19.1" torch = "2.4.0" torchvision = "0.19" tqdm = "*" -transformers = ">=4.45.2" +transformers = ">=4.45.0" typing-extensions = ">=4.10" uvicorn = {version = "*", extras = ["standard"]} xformers = {version = "0.0.27.post2", markers = "platform_system == \"Linux\" and platform_machine == \"x86_64\""} @@ -5434,6 +5393,7 @@ xformers = {version = "0.0.27.post2", markers = "platform_system == \"Linux\" an [package.extras] audio = ["librosa", "soundfile"] tensorizer = ["tensorizer (>=2.9.0)"] +video = ["opencv-python"] [[package]] name = "watchfiles" @@ -5981,4 +5941,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "~3.11" -content-hash = "82619c826f78a374732469fe005e8fc43b913198b82c2d252e0bc19844a169ea" +content-hash = "495e3c5a0cb347d13376eaef3bfd532e89798cb752ea67c17a4979a87311882e" diff --git a/pyproject.toml b/pyproject.toml index a2d5c04..32eea13 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ langchain = "^0.3.0" langchain-openai = "^0.2.0" av = "^12.3.0" pybase64 = "^1.4.0" -vllm = "^0.6.3.post1" +vllm = "0.6.2" [build-system] build-backend = "poetry.core.masonry.api" diff --git a/requirements.txt b/requirements.txt index 09e1e4f..5077415 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,6 @@ click==8.1.7 ; python_version >= "3.11" and python_version < "3.12" cloudpickle==3.0.0 ; python_version >= "3.11" and python_version < "3.12" colorama==0.4.6 ; python_version >= "3.11" and python_version < "3.12" and (sys_platform == "win32" or platform_system == "Windows") coloredlogs==15.0.1 ; python_version >= "3.11" and python_version < "3.12" -compressed-tensors==0.6.0 ; python_version >= "3.11" and python_version < "3.12" cryptography==43.0.1 ; python_version >= "3.11" and python_version < "3.12" ctranslate2==4.4.0 ; python_version >= "3.11" and python_version < "3.12" datasets==2.14.4 ; python_version >= "3.11" and python_version < "3.12" @@ -59,7 +58,7 @@ lark==1.2.2 ; python_version >= "3.11" and python_version < "3.12" llvmlite==0.43.0 ; python_version >= "3.11" and python_version < "3.12" lm-format-enforcer==0.10.6 ; python_version >= "3.11" and python_version < "3.12" markupsafe==2.1.5 ; python_version >= "3.11" and python_version < "3.12" -mistral-common[opencv]==1.4.4 ; python_version >= "3.11" and python_version < "3.12" +mistral-common==1.4.4 ; python_version >= "3.11" and python_version < "3.12" mpmath==1.3.0 ; python_version >= "3.11" and python_version < "3.12" msgpack==1.1.0 ; python_version >= "3.11" and python_version < "3.12" msgspec==0.18.6 ; python_version >= "3.11" and python_version < "3.12" @@ -85,7 +84,6 @@ nvidia-nvjitlink-cu12==12.6.68 ; platform_system == "Linux" and platform_machine nvidia-nvtx-cu12==12.1.105 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.11" and python_version < "3.12" onnxruntime==1.19.2 ; python_version >= "3.11" and python_version < "3.12" openai==1.48.0 ; python_version >= "3.11" and python_version < "3.12" -opencv-python-headless==4.10.0.84 ; python_version >= "3.11" and python_version < "3.12" orjson==3.10.7 ; python_version >= "3.11" and python_version < "3.12" outlines==0.0.46 ; python_version >= "3.11" and python_version < "3.12" packaging==24.1 ; python_version >= "3.11" and python_version < "3.12" @@ -141,7 +139,7 @@ urllib3==2.2.3 ; python_version >= "3.11" and python_version < "3.12" uuid6==2024.7.10 ; python_version >= "3.11" and python_version < "3.12" uvicorn[standard]==0.29.0 ; python_version >= "3.11" and python_version < "3.12" uvloop==0.21.0 ; (sys_platform != "win32" and sys_platform != "cygwin") and platform_python_implementation != "PyPy" and python_version >= "3.11" and python_version < "3.12" -vllm==0.6.3.post1 ; python_version >= "3.11" and python_version < "3.12" +vllm==0.6.2 ; python_version >= "3.11" and python_version < "3.12" watchfiles==0.24.0 ; python_version >= "3.11" and python_version < "3.12" websockets==13.1 ; python_version >= "3.11" and python_version < "3.12" xformers==0.0.27.post2 ; platform_system == "Linux" and platform_machine == "x86_64" and python_version >= "3.11" and python_version < "3.12"