Skip to content

Commit 6eaa86b

Browse files
committed
Remove v0 guided decoding
1 parent 8d0a01a commit 6eaa86b

26 files changed

+27
-2138
lines changed

.buildkite/test-pipeline.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ steps:
128128
- tests/entrypoints/offline_mode
129129
commands:
130130
- export VLLM_WORKER_MULTIPROC_METHOD=spawn
131-
- pytest -v -s entrypoints/llm --ignore=entrypoints/llm/test_lazy_outlines.py --ignore=entrypoints/llm/test_generate.py --ignore=entrypoints/llm/test_generate_multiple_loras.py --ignore=entrypoints/llm/test_guided_generate.py --ignore=entrypoints/llm/test_collective_rpc.py
132-
- pytest -v -s entrypoints/llm/test_lazy_outlines.py # it needs a clean process
131+
- pytest -v -s entrypoints/llm --ignore=entrypoints/llm/test_generate.py --ignore=entrypoints/llm/test_generate_multiple_loras.py --ignore=entrypoints/llm/test_guided_generate.py --ignore=entrypoints/llm/test_collective_rpc.py
133132
- pytest -v -s entrypoints/llm/test_generate.py # it needs a clean process
134133
- pytest -v -s entrypoints/llm/test_generate_multiple_loras.py # it needs a clean process
135134
- VLLM_USE_V1=0 pytest -v -s entrypoints/llm/test_guided_generate.py # it needs a clean process

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
/vllm/worker/worker.py @zhuohan123 @youkaichao @alexm-redhat @comaniac @njhill
1111
/vllm/model_executor/layers/sampler.py @zhuohan123 @youkaichao @alexm-redhat @comaniac @njhill
1212
/vllm/model_executor/layers/quantization @mgoin @robertgshaw2-redhat @tlrmchlsmth
13-
/vllm/model_executor/guided_decoding @mgoin @russellb @aarnphm
1413
/vllm/multimodal @DarkLight1337 @ywang96
1514
/vllm/vllm_flash_attn @LucasWilkinson
1615
/vllm/lora @jeejeelee
@@ -37,7 +36,6 @@ CMakeLists.txt @tlrmchlsmth @LucasWilkinson
3736
/tests/entrypoints @DarkLight1337 @robertgshaw2-redhat @simon-mo @aarnphm
3837
/tests/entrypoints/llm/test_guided_generate.py @mgoin @russellb @aarnphm
3938
/tests/kernels @tlrmchlsmth @WoosukKwon
40-
/tests/model_executor/test_guided_processors.py @mgoin @russellb
4139
/tests/models @DarkLight1337 @ywang96
4240
/tests/multi_step @alexm-redhat @comaniac
4341
/tests/multimodal @DarkLight1337 @ywang96

.github/mergify.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ pull_request_rules:
149149
- files=examples/offline_inference/structured_outputs.py
150150
- files=examples/online_serving/openai_chat_completion_structured_outputs.py
151151
- files=examples/online_serving/openai_chat_completion_structured_outputs_with_reasoning.py
152-
- files~=^vllm/model_executor/guided_decoding/
153-
- files=tests/model_executor/test_guided_processors.py
154152
- files=tests/entrypoints/llm/test_guided_generate.py
155153
- files~=^tests/v1/structured_output/
156154
- files=tests/v1/entrypoints/llm/test_guided_generate.py

tests/entrypoints/llm/test_guided_generate.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
# which only support regex based constraints in tests.
2222
GRAMMAR_DECODING_BACKENDS = [
2323
# (backend, disable_any_whitespace),
24-
("lm-format-enforcer", False),
2524
("xgrammar", True),
2625
("guidance", True),
2726
]

tests/entrypoints/llm/test_lazy_outlines.py

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

tests/entrypoints/openai/test_completion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# need to change to match the prompt adapter
3232
PA_NUM_VIRTUAL_TOKENS = 8
3333

34-
GUIDED_DECODING_BACKENDS = ["outlines", "lm-format-enforcer", "xgrammar"]
34+
GUIDED_DECODING_BACKENDS = ["outlines", "xgrammar"]
3535

3636

3737
@pytest.fixture(scope="module")

tests/model_executor/test_guided_processors.py

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

tests/models/language/generation/test_mistral.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def test_mistral_function_calling(vllm_runner, model: str, dtype: str) -> None:
276276

277277
@pytest.mark.parametrize("model", MODELS)
278278
@pytest.mark.parametrize("guided_backend",
279-
["outlines", "lm-format-enforcer", "xgrammar"])
279+
["outlines", "xgrammar"])
280280
def test_mistral_guided_decoding(
281281
monkeypatch: pytest.MonkeyPatch,
282282
vllm_runner,

tests/test_sampling_params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_sampling_params_from_request_with_no_guided_decoding_backend(
6262

6363
@pytest.mark.parametrize("request_level_guided_decoding_backend,expected",
6464
[("xgrammar", "xgrammar"),
65-
("lm-format-enforcer", "lm-format-enforcer"),
65+
("guidance", "guidance"),
6666
("outlines", "outlines")])
6767
def test_sampling_params_from_request_with_guided_decoding_backend(
6868
request_level_guided_decoding_backend: str, expected: str,

0 commit comments

Comments
 (0)