Skip to content

Commit a985baa

Browse files
authored
Merge branch 'main' into dev/qwen3-omni-moe
Signed-off-by: Roger Wang <[email protected]>
2 parents 3c44f89 + 91ac7f7 commit a985baa

File tree

1,523 files changed

+118227
-96749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,523 files changed

+118227
-96749
lines changed

.buildkite/nightly-benchmarks/scripts/convert-results-json-to-markdown.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def parse_client_command(cmd: str) -> dict[str, Any]:
368368
# The GPUs sometimes come in format of "GPUTYPE\nGPUTYPE\n...",
369369
# we want to turn it into "8xGPUTYPE"
370370
df["GPU"] = df["GPU"].apply(
371-
lambda x: f"{len(x.split('\n'))}x{x.split('\n')[0]}"
371+
lambda x: f"{len(x.splitlines())}x{x.splitlines()[0]}"
372372
)
373373

374374
# get markdown tables

.buildkite/pyproject.toml

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

.buildkite/test-pipeline.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ steps:
477477
source_file_dependencies:
478478
- csrc/mamba/
479479
- tests/kernels/mamba
480+
- vllm/model_executor/layers/mamba/ops
480481
commands:
481482
- pytest -v -s kernels/mamba
482483

@@ -834,11 +835,11 @@ steps:
834835
- pytest -v -s tests/kernels/moe/test_flashinfer.py
835836
- pytest -v -s tests/compile/test_silu_mul_quant_fusion.py
836837

837-
- label: GPT-OSS Eval (Blackwell)
838+
- label: Blackwell GPT-OSS Eval
838839
timeout_in_minutes: 60
839840
working_dir: "/vllm-workspace/"
840841
gpu: b200
841-
optional: true # disable while debugging
842+
optional: true # run on nightlies
842843
source_file_dependencies:
843844
- tests/evals/gpt_oss
844845
- vllm/model_executor/models/gpt_oss.py
@@ -865,6 +866,16 @@ steps:
865866
commands:
866867
- pytest -s -v tests/quantization/test_blackwell_moe.py
867868

869+
- label: Blackwell LM Eval Small Models
870+
timeout_in_minutes: 75
871+
gpu: b200
872+
optional: true # run on nightlies
873+
source_file_dependencies:
874+
- csrc/
875+
- vllm/model_executor/layers/quantization
876+
commands:
877+
- pytest -s -v evals/gsm8k/test_gsm8k_correctness.py --config-list-file=configs/models-blackwell.txt --tp-size=1
878+
868879
##### 1 GPU test #####
869880
##### multi gpus test #####
870881

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ CMakeLists.txt @tlrmchlsmth @LucasWilkinson
2323
# Any change to the VllmConfig changes can have a large user-facing impact,
2424
# so spam a lot of people
2525
/vllm/config @simon-mo @WoosukKwon @youkaichao @robertgshaw2-redhat @mgoin @tlrmchlsmth @houseroad @hmellor @yewentao256 @ProExpertProg
26+
/vllm/config/cache.py @simon-mo @WoosukKwon @youkaichao @robertgshaw2-redhat @mgoin @tlrmchlsmth @houseroad @hmellor @yewentao256 @ProExpertProg @heheda12345
2627

2728
# vLLM V1
2829
/vllm/v1 @WoosukKwon @robertgshaw2-redhat @njhill @ywang96 @comaniac @alexm-redhat

.pre-commit-config.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,16 @@ default_stages:
66
- manual # Run in CI
77
exclude: 'vllm/third_party/.*'
88
repos:
9-
- repo: https://github.com/google/yapf
10-
rev: v0.43.0
11-
hooks:
12-
- id: yapf
13-
args: [--in-place, --verbose]
14-
# Keep the same list from yapfignore here to avoid yapf failing without any inputs
15-
exclude: '(.buildkite|benchmarks|build|examples)/.*'
169
- repo: https://github.com/astral-sh/ruff-pre-commit
17-
rev: v0.11.7
10+
rev: v0.13.3
1811
hooks:
19-
- id: ruff
12+
- id: ruff-check
2013
args: [--output-format, github, --fix]
2114
- id: ruff-format
22-
files: ^(.buildkite|benchmarks|examples)/.*
2315
- repo: https://github.com/crate-ci/typos
2416
rev: v1.35.5
2517
hooks:
2618
- id: typos
27-
- repo: https://github.com/PyCQA/isort
28-
rev: 6.0.1
29-
hooks:
30-
- id: isort
3119
- repo: https://github.com/pre-commit/mirrors-clang-format
3220
rev: v20.1.3
3321
hooks:

benchmarks/benchmark_block_pool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
33
import gc
44

5+
from benchmark_utils import TimeCollector
56
from tabulate import tabulate
67

7-
from benchmark_utils import TimeCollector
88
from vllm.utils import FlexibleArgumentParser
99
from vllm.v1.core.block_pool import BlockPool
1010

benchmarks/benchmark_ngram_proposer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
from unittest import mock
66

77
import numpy as np
8+
from benchmark_utils import TimeCollector
89
from tabulate import tabulate
910

10-
from benchmark_utils import TimeCollector
1111
from vllm.config import (
1212
CacheConfig,
1313
DeviceConfig,

benchmarks/benchmark_serving_structured_output.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,13 @@
3737
import datasets
3838
import numpy as np
3939
import pandas as pd
40-
from tqdm.asyncio import tqdm
41-
from transformers import PreTrainedTokenizerBase
42-
4340
from backend_request_func import (
4441
ASYNC_REQUEST_FUNCS,
4542
RequestFuncInput,
4643
RequestFuncOutput,
4744
)
45+
from tqdm.asyncio import tqdm
46+
from transformers import PreTrainedTokenizerBase
4847

4948
try:
5049
from vllm.transformers_utils.tokenizer import get_tokenizer

0 commit comments

Comments
 (0)