From 80cbe10c59a3354d0fc7c841fdc6422fc64899aa Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 7 Aug 2024 20:49:10 +0400 Subject: [PATCH] [OpenVINO] migrate to latest dependencies versions (#7251) --- Dockerfile.openvino | 2 +- .../getting_started/openvino-installation.rst | 2 +- requirements-openvino.txt | 33 ++----------------- setup.py | 2 +- 4 files changed, 6 insertions(+), 33 deletions(-) diff --git a/Dockerfile.openvino b/Dockerfile.openvino index c84dea41..06ca4638 100644 --- a/Dockerfile.openvino +++ b/Dockerfile.openvino @@ -21,7 +21,7 @@ COPY setup.py /workspace/vllm/ # install build requirements RUN PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" python3 -m pip install -r /workspace/vllm/requirements-build.txt # build vLLM with OpenVINO backend -RUN PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu https://storage.openvinotoolkit.org/simple/wheels/pre-release" VLLM_TARGET_DEVICE="openvino" python3 -m pip install /workspace/vllm/ +RUN PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" VLLM_TARGET_DEVICE="openvino" python3 -m pip install /workspace/vllm/ COPY examples/ /workspace/vllm/examples COPY benchmarks/ /workspace/vllm/benchmarks diff --git a/docs/source/getting_started/openvino-installation.rst b/docs/source/getting_started/openvino-installation.rst index 62256df0..d8f27c43 100644 --- a/docs/source/getting_started/openvino-installation.rst +++ b/docs/source/getting_started/openvino-installation.rst @@ -57,7 +57,7 @@ Install from source .. code-block:: console - $ PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu https://storage.openvinotoolkit.org/simple/wheels/pre-release" VLLM_TARGET_DEVICE=openvino python -m pip install -v . + $ PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" VLLM_TARGET_DEVICE=openvino python -m pip install -v . .. _openvino_backend_performance_tips: diff --git a/requirements-openvino.txt b/requirements-openvino.txt index 2dd971d6..419294aa 100644 --- a/requirements-openvino.txt +++ b/requirements-openvino.txt @@ -1,34 +1,7 @@ # Common dependencies -# -r requirements-common.txt -# TODO: remove temporary copy of all common dependencies once Optimum Intel will support Transformers >= 4.43.2 -cmake >= 3.21 -ninja # For faster builds. -psutil -sentencepiece # Required for LLaMA tokenizer. -numpy < 2.0.0 -requests -tqdm -py-cpuinfo -transformers < 4.43 -tokenizers >= 0.19.1 # Required for Llama 3. -fastapi -aiohttp -openai -uvicorn[standard] -pydantic >= 2.0 # Required for OpenAI server. -pillow # Required for image processing -prometheus_client >= 0.18.0 -prometheus-fastapi-instrumentator >= 7.0.0 -tiktoken >= 0.6.0 # Required for DBRX tokenizer -lm-format-enforcer == 0.10.3 -outlines >= 0.0.43, < 0.1 # Requires torch >= 2.1.0 -typing_extensions -filelock >= 3.10.4 # filelock starts to support `mode` argument from 3.10.4 -pyzmq -gguf == 0.9.1 +-r requirements-common.txt # OpenVINO dependencies torch >= 2.1.2 -openvino ~= 2024.3.0.dev -openvino-tokenizers[transformers] ~= 2024.3.0.0.dev -optimum-intel[openvino] >= 1.18.1 +openvino ~= 2024.3.0 +optimum-intel[openvino] >= 1.18.2 diff --git a/setup.py b/setup.py index b146299f..f6e00587 100644 --- a/setup.py +++ b/setup.py @@ -272,7 +272,7 @@ def _build_custom_ops() -> bool: def _build_core_ext() -> bool: - return not _is_neuron() and not _is_tpu() + return not _is_neuron() and not _is_tpu() and not _is_openvino() def get_hipcc_rocm_version():