Skip to content

Commit b877031

Browse files
authored
Remove openvino support in favor of external plugin (#15339)
Signed-off-by: Russell Bryant <rbryant@redhat.com>
1 parent dd861b9 commit b877031

File tree

20 files changed

+8
-1789
lines changed

20 files changed

+8
-1789
lines changed

.buildkite/run-openvino-test.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

Dockerfile.openvino

Lines changed: 0 additions & 29 deletions
This file was deleted.

docs/source/getting_started/installation.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ installation/ai_accelerator
2626
- Google TPU
2727
- Intel Gaudi
2828
- AWS Neuron
29-
- OpenVINO

docs/source/getting_started/installation/ai_accelerator.md

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@ vLLM is a Python library that supports the following AI accelerators. Select you
3636

3737
::::
3838

39-
::::{tab-item} OpenVINO
40-
:sync: openvino
41-
42-
:::{include} ai_accelerator/openvino.inc.md
43-
:start-after: "# Installation"
44-
:end-before: "## Requirements"
45-
:::
46-
47-
::::
48-
4939
:::::
5040

5141
## Requirements
@@ -83,16 +73,6 @@ vLLM is a Python library that supports the following AI accelerators. Select you
8373

8474
::::
8575

86-
::::{tab-item} OpenVINO
87-
:sync: openvino
88-
89-
:::{include} ai_accelerator/openvino.inc.md
90-
:start-after: "## Requirements"
91-
:end-before: "## Set up using Python"
92-
:::
93-
94-
::::
95-
9676
:::::
9777

9878
## Configure a new environment
@@ -130,14 +110,6 @@ vLLM is a Python library that supports the following AI accelerators. Select you
130110

131111
::::
132112

133-
::::{tab-item} OpenVINO
134-
:sync: openvino
135-
136-
:::{include} python_env_setup.inc.md
137-
:::
138-
139-
::::
140-
141113
:::::
142114

143115
## Set up using Python
@@ -177,16 +149,6 @@ vLLM is a Python library that supports the following AI accelerators. Select you
177149

178150
::::
179151

180-
::::{tab-item} OpenVINO
181-
:sync: openvino
182-
183-
:::{include} ai_accelerator/openvino.inc.md
184-
:start-after: "### Pre-built wheels"
185-
:end-before: "### Build wheel from source"
186-
:::
187-
188-
::::
189-
190152
:::::
191153

192154
### Build wheel from source
@@ -224,16 +186,6 @@ vLLM is a Python library that supports the following AI accelerators. Select you
224186

225187
::::
226188

227-
::::{tab-item} OpenVINO
228-
:sync: openvino
229-
230-
:::{include} ai_accelerator/openvino.inc.md
231-
:start-after: "### Build wheel from source"
232-
:end-before: "## Set up using Docker"
233-
:::
234-
235-
::::
236-
237189
:::::
238190

239191
## Set up using Docker
@@ -273,16 +225,6 @@ vLLM is a Python library that supports the following AI accelerators. Select you
273225

274226
::::
275227

276-
::::{tab-item} OpenVINO
277-
:sync: openvino
278-
279-
:::{include} ai_accelerator/openvino.inc.md
280-
:start-after: "### Pre-built images"
281-
:end-before: "### Build image from source"
282-
:::
283-
284-
::::
285-
286228
:::::
287229

288230
### Build image from source
@@ -320,16 +262,6 @@ vLLM is a Python library that supports the following AI accelerators. Select you
320262

321263
::::
322264

323-
::::{tab-item} OpenVINO
324-
:sync: openvino
325-
326-
:::{include} ai_accelerator/openvino.inc.md
327-
:start-after: "### Build image from source"
328-
:end-before: "## Extra information"
329-
:::
330-
331-
::::
332-
333265
:::::
334266

335267
## Extra information
@@ -364,13 +296,4 @@ vLLM is a Python library that supports the following AI accelerators. Select you
364296

365297
::::
366298

367-
::::{tab-item} OpenVINO
368-
:sync: openvino
369-
370-
:::{include} ai_accelerator/openvino.inc.md
371-
:start-after: "## Extra information"
372-
:::
373-
374-
::::
375-
376299
:::::

docs/source/getting_started/installation/ai_accelerator/openvino.inc.md

Lines changed: 0 additions & 110 deletions
This file was deleted.

requirements/openvino.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,6 @@ def _is_cpu() -> bool:
449449
return VLLM_TARGET_DEVICE == "cpu"
450450

451451

452-
def _is_openvino() -> bool:
453-
return VLLM_TARGET_DEVICE == "openvino"
454-
455-
456452
def _is_xpu() -> bool:
457453
return VLLM_TARGET_DEVICE == "xpu"
458454

@@ -572,8 +568,6 @@ def get_vllm_version() -> str:
572568
if gaudi_sw_version != MAIN_CUDA_VERSION:
573569
gaudi_sw_version = gaudi_sw_version.replace(".", "")[:3]
574570
version += f"{sep}gaudi{gaudi_sw_version}"
575-
elif _is_openvino():
576-
version += f"{sep}openvino"
577571
elif _is_tpu():
578572
version += f"{sep}tpu"
579573
elif _is_cpu():
@@ -623,8 +617,6 @@ def _read_requirements(filename: str) -> list[str]:
623617
requirements = _read_requirements("neuron.txt")
624618
elif _is_hpu():
625619
requirements = _read_requirements("hpu.txt")
626-
elif _is_openvino():
627-
requirements = _read_requirements("openvino.txt")
628620
elif _is_tpu():
629621
requirements = _read_requirements("tpu.txt")
630622
elif _is_cpu():
@@ -634,7 +626,7 @@ def _read_requirements(filename: str) -> list[str]:
634626
else:
635627
raise ValueError(
636628
"Unsupported platform, please use CUDA, ROCm, Neuron, HPU, "
637-
"OpenVINO, or CPU.")
629+
"or CPU.")
638630
return requirements
639631

640632

tests/conftest.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,7 @@ class HfRunner:
273273
def get_default_device(self):
274274
from vllm.platforms import current_platform
275275

276-
return ("cpu" if current_platform.is_cpu()
277-
or current_platform.is_openvino() else "cuda")
276+
return ("cpu" if current_platform.is_cpu() else "cuda")
278277

279278
def wrap_device(self, x: _T, device: Optional[str] = None) -> _T:
280279
if x is None or isinstance(x, (bool, )):

tests/kernels/test_attention_selector.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
from unittest.mock import Mock, patch
3+
from unittest.mock import patch
44

55
import pytest
66
import torch
77

88
from vllm.attention.selector import _cached_get_attn_backend, get_attn_backend
99
from vllm.platforms.cpu import CpuPlatform
1010
from vllm.platforms.cuda import CudaPlatform
11-
from vllm.platforms.openvino import OpenVinoPlatform
1211
from vllm.platforms.rocm import RocmPlatform
1312
from vllm.utils import STR_BACKEND_ENV_VAR, STR_FLASH_ATTN_VAL, STR_INVALID_VAL
1413

@@ -21,9 +20,9 @@ def clear_cache():
2120

2221

2322
@pytest.mark.parametrize(
24-
"name", ["TORCH_SDPA", "ROCM_FLASH", "XFORMERS", "FLASHINFER", "OPENVINO"])
23+
"name", ["TORCH_SDPA", "ROCM_FLASH", "XFORMERS", "FLASHINFER"])
2524
@pytest.mark.parametrize("use_v1", [True, False])
26-
@pytest.mark.parametrize("device", ["cpu", "openvino", "hip", "cuda"])
25+
@pytest.mark.parametrize("device", ["cpu", "hip", "cuda"])
2726
def test_env(
2827
name: str,
2928
use_v1: bool,
@@ -51,13 +50,6 @@ def test_env(
5150
16, False)
5251
EXPECTED = "TRITON_ATTN_VLLM_V1" if use_v1 else "ROCM_FLASH"
5352
assert backend.get_name() == EXPECTED
54-
elif device == "openvino":
55-
with patch("vllm.attention.selector.current_platform",
56-
OpenVinoPlatform()), patch.dict('sys.modules',
57-
{'openvino': Mock()}):
58-
backend = get_attn_backend(16, torch.float16, torch.float16,
59-
16, False)
60-
assert backend.get_name() == "OPENVINO"
6153
else:
6254
if name in ["XFORMERS", "FLASHINFER"]:
6355
with patch("vllm.attention.selector.current_platform",

0 commit comments

Comments
 (0)