Skip to content

Commit 11cffa4

Browse files
authored
Merge branch 'vllm-project:main' into main
2 parents 6fa270b + 68dafcc commit 11cffa4

5,428 files changed

Lines changed: 1121712 additions & 342587 deletions

File tree

Some content is hidden

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

.buildkite/check-wheel-size.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import sys
66
import zipfile
77

8-
# Read the VLLM_MAX_SIZE_MB environment variable, defaulting to 400 MiB
9-
# Note that we have 400 MiB quota, please use it wisely.
10-
# See https://github.com/pypi/support/issues/3792 .
8+
# Read the VLLM_MAX_SIZE_MB environment variable, defaulting to 500 MiB
9+
# Note that we have 800 MiB quota, please use it wisely.
10+
# See https://github.com/pypi/support/issues/6326 .
1111
# Please also sync the value with the one in Dockerfile.
12-
VLLM_MAX_SIZE_MB = int(os.environ.get("VLLM_MAX_SIZE_MB", 400))
12+
VLLM_MAX_SIZE_MB = int(os.environ.get("VLLM_MAX_SIZE_MB", 500))
1313

1414

1515
def print_top_10_largest_files(zip_file):

.buildkite/ci_config.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: vllm_ci
2+
job_dirs:
3+
- ".buildkite/image_build"
4+
- ".buildkite/test_areas"
5+
- ".buildkite/hardware_tests"
6+
run_all_patterns:
7+
- "docker/Dockerfile"
8+
- "CMakeLists.txt"
9+
- "requirements/common.txt"
10+
- "requirements/cuda.txt"
11+
- "requirements/kv_connectors.txt"
12+
- "requirements/build/cuda.txt"
13+
- "requirements/test/cuda.txt"
14+
- "setup.py"
15+
- "csrc/"
16+
- "cmake/"
17+
run_all_exclude_patterns:
18+
- "docker/Dockerfile."
19+
- "csrc/cpu/"
20+
- "csrc/rocm/"
21+
- "cmake/hipify.py"
22+
- "cmake/cpu_extension.cmake"
23+
registries: public.ecr.aws/q9t5s3a7
24+
repositories:
25+
main: "vllm-ci-postmerge-repo"
26+
premerge: "vllm-ci-test-repo"

.buildkite/ci_config_intel.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: vllm_intel_ci
2+
job_dirs:
3+
- ".buildkite/intel_jobs"
4+
run_all_patterns:
5+
- "docker/Dockerfile"
6+
- "CMakeLists.txt"
7+
- "requirements/common.txt"
8+
- "requirements/xpu.txt"
9+
- "requirements/build/cuda.txt"
10+
- "requirements/test/cuda.txt"
11+
- "setup.py"
12+
- "csrc/"
13+
- "cmake/"
14+
run_all_exclude_patterns:
15+
- "docker/Dockerfile."
16+
- "csrc/cpu/"
17+
- "csrc/rocm/"
18+
- "cmake/hipify.py"
19+
- "cmake/cpu_extension.cmake"
20+
registries: public.ecr.aws/q9t5s3a7
21+
repositories:
22+
main: "vllm-ci-test-repo"
23+
premerge: "vllm-ci-test-repo"

.buildkite/generate_index.py

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

.buildkite/hardware_tests/amd.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
group: Hardware - AMD Build
2+
steps:
3+
- label: "AMD: :docker: build image"
4+
key: image-build-amd
5+
depends_on: []
6+
device: amd_cpu
7+
no_plugin: true
8+
commands:
9+
- >
10+
docker build
11+
--build-arg max_jobs=16
12+
--build-arg REMOTE_VLLM=1
13+
--build-arg ARG_PYTORCH_ROCM_ARCH='gfx90a;gfx942;gfx950'
14+
--build-arg VLLM_BRANCH=$BUILDKITE_COMMIT
15+
--tag "rocm/vllm-ci:${BUILDKITE_COMMIT}"
16+
-f docker/Dockerfile.rocm
17+
--target test
18+
--no-cache
19+
--progress plain .
20+
- |
21+
docker run --rm --network=none --entrypoint /bin/bash "rocm/vllm-ci:${BUILDKITE_COMMIT}" -ec '
22+
if [ ! -d /vllm-workspace ]; then echo Missing directory: /vllm-workspace >&2; exit 1; fi
23+
if [ ! -d /vllm-workspace/tests ]; then echo Missing directory: /vllm-workspace/tests >&2; exit 1; fi
24+
if [ ! -d /vllm-workspace/src/vllm ]; then echo Missing directory: /vllm-workspace/src/vllm >&2; exit 1; fi
25+
if [ ! -x /vllm-workspace/src/vllm/vllm-rs ]; then echo Missing executable: /vllm-workspace/src/vllm/vllm-rs >&2; exit 1; fi
26+
command -v python3
27+
command -v uv
28+
command -v pytest
29+
if ! command -v amd-smi >/dev/null 2>&1 && ! command -v rocminfo >/dev/null 2>&1; then
30+
echo No ROCm CLI found in image >&2
31+
exit 1
32+
fi
33+
python3 - <<PY
34+
import torch, vllm
35+
print(torch.__version__)
36+
print(vllm.__version__)
37+
PY
38+
echo AMD image smoke OK
39+
'
40+
- docker push "rocm/vllm-ci:${BUILDKITE_COMMIT}"
41+
env:
42+
DOCKER_BUILDKIT: "1"
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
group: Hardware
2+
depends_on: ~
3+
steps:
4+
- label: "Ascend NPU Test"
5+
soft_fail: true
6+
timeout_in_minutes: 20
7+
no_plugin: true
8+
device: ascend_npu
9+
commands:
10+
- bash .buildkite/scripts/hardware_ci/run-npu-test.sh

.buildkite/hardware_tests/cpu.yaml

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
group: CPU
2+
depends_on: []
3+
steps:
4+
- label: CPU-Kernel Tests
5+
depends_on: []
6+
device: intel_cpu
7+
no_plugin: true
8+
source_file_dependencies:
9+
- csrc/cpu/
10+
- cmake/cpu_extension.cmake
11+
- CMakeLists.txt
12+
- vllm/_custom_ops.py
13+
- tests/kernels/attention/test_cpu_attn.py
14+
- tests/kernels/moe/test_cpu_fused_moe.py
15+
- tests/kernels/moe/test_cpu_quant_fused_moe.py
16+
- tests/kernels/test_onednn.py
17+
- tests/kernels/test_awq_int4_to_int8.py
18+
- tests/kernels/quantization/test_cpu_fp8_scaled_mm.py
19+
commands:
20+
- |
21+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 30m "
22+
pytest -x -v -s tests/kernels/attention/test_cpu_attn.py
23+
pytest -x -v -s tests/kernels/moe/test_cpu_fused_moe.py
24+
pytest -x -v -s tests/kernels/moe/test_cpu_quant_fused_moe.py
25+
pytest -x -v -s tests/kernels/test_onednn.py
26+
pytest -x -v -s tests/kernels/test_awq_int4_to_int8.py
27+
pytest -x -v -s tests/kernels/quantization/test_cpu_fp8_scaled_mm.py"
28+
29+
- label: CPU-Compatibility Tests
30+
depends_on: []
31+
device: intel_cpu
32+
no_plugin: true
33+
source_file_dependencies:
34+
- cmake/cpu_extension.cmake
35+
- setup.py
36+
- vllm/platforms/cpu.py
37+
commands:
38+
- |
39+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 20m "
40+
bash .buildkite/scripts/hardware_ci/run-cpu-compatibility-test.sh"
41+
42+
- label: CPU-Language Generation and Pooling Model Tests
43+
depends_on: []
44+
device: intel_cpu
45+
no_plugin: true
46+
source_file_dependencies:
47+
- csrc/cpu/
48+
- vllm/
49+
- tests/models/language/generation/
50+
- tests/models/language/pooling/
51+
commands:
52+
- |
53+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 40m "
54+
pytest -x -v -s tests/models/language/generation -m cpu_model
55+
pytest -x -v -s tests/models/language/pooling -m cpu_model"
56+
57+
- label: CPU-ModelRunnerV2 Tests
58+
depends_on: []
59+
device: intel_cpu
60+
no_plugin: true
61+
soft_fail: true
62+
source_file_dependencies:
63+
- vllm/v1/worker/cpu/
64+
- vllm/v1/worker/gpu/
65+
- vllm/v1/sample/ops/topk_topp_triton.py
66+
- vllm/v1/sample/ops/topk_topp_sampler.py
67+
- tests/v1/sample/test_topk_topp_sampler.py
68+
commands:
69+
- |
70+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 45m "
71+
uv pip install git+https://github.com/triton-lang/triton-cpu.git@270e696d
72+
VLLM_USE_V2_MODEL_RUNNER=1 pytest -x -v -s tests/models/language/generation/test_granite.py -m cpu_model
73+
# TODO: move to CPU-Kernel Tests once triton-cpu has a pre-built wheel
74+
pytest -x -v -s tests/v1/sample/test_topk_topp_sampler.py::TestTritonTopkTopp"
75+
76+
- label: CPU-Quantization Model Tests
77+
depends_on: []
78+
device: intel_cpu
79+
no_plugin: true
80+
source_file_dependencies:
81+
- csrc/cpu/
82+
- vllm/model_executor/layers/quantization/auto_gptq.py
83+
- vllm/model_executor/layers/quantization/compressed_tensors/schemes/compressed_tensors_w8a8_int8.py
84+
- vllm/model_executor/kernels/linear/mixed_precision/cpu.py
85+
- vllm/model_executor/kernels/linear/scaled_mm/cpu.py
86+
- vllm/model_executor/layers/fused_moe/experts/cpu_moe.py
87+
- tests/quantization/test_compressed_tensors.py
88+
- tests/quantization/test_cpu_wna16.py
89+
commands:
90+
- |
91+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 30m "
92+
pytest -x -v -s tests/quantization/test_compressed_tensors.py::test_compressed_tensors_w8a8_logprobs
93+
pytest -x -v -s tests/quantization/test_cpu_wna16.py"
94+
95+
- label: CPU-Distributed Tests (PP+TP)
96+
depends_on: []
97+
device: intel_cpu
98+
no_plugin: true
99+
source_file_dependencies: &cpu_distributed_deps
100+
- csrc/cpu/shm.cpp
101+
- vllm/v1/worker/cpu_worker.py
102+
- vllm/v1/worker/gpu_worker.py
103+
- vllm/v1/worker/cpu_model_runner.py
104+
- vllm/v1/worker/gpu_model_runner.py
105+
- vllm/platforms/cpu.py
106+
- vllm/distributed/parallel_state.py
107+
- vllm/distributed/device_communicators/cpu_communicator.py
108+
- .buildkite/scripts/hardware_ci/run-cpu-distributed-smoke-test.sh
109+
commands:
110+
- |
111+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 10m "
112+
bash .buildkite/scripts/hardware_ci/run-cpu-distributed-smoke-test.sh tp_pp"
113+
114+
- label: CPU-Distributed Tests (DP+TP)
115+
depends_on: []
116+
device: intel_cpu
117+
no_plugin: true
118+
source_file_dependencies: *cpu_distributed_deps
119+
commands:
120+
- |
121+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 10m "
122+
bash .buildkite/scripts/hardware_ci/run-cpu-distributed-smoke-test.sh dp_tp"
123+
124+
- label: CPU-Multi-Modal Model Tests %N
125+
depends_on: []
126+
device: intel_cpu
127+
no_plugin: true
128+
source_file_dependencies:
129+
# - vllm/
130+
- vllm/model_executor/layers/rotary_embedding
131+
- tests/models/multimodal/generation/
132+
commands:
133+
- |
134+
bash .buildkite/scripts/hardware_ci/run-cpu-test.sh 45m "
135+
pytest -x -v -s tests/models/multimodal/generation --ignore=tests/models/multimodal/generation/test_pixtral.py -m cpu_model --num-shards=$$BUILDKITE_PARALLEL_JOB_COUNT --shard-id=$$BUILDKITE_PARALLEL_JOB"
136+
parallelism: 3
137+
138+
- label: "Arm CPU Test"
139+
depends_on: []
140+
soft_fail: false
141+
device: arm_cpu
142+
no_plugin: true
143+
commands:
144+
- bash .buildkite/scripts/hardware_ci/run-cpu-test-arm.sh
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
group: Hardware
2+
steps:
3+
- label: "GH200 Test"
4+
soft_fail: true
5+
device: gh200
6+
no_plugin: true
7+
optional: true
8+
commands:
9+
- nvidia-smi
10+
- bash .buildkite/scripts/hardware_ci/run-gh200-test.sh
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
group: Hardware
2+
depends_on: ~
3+
steps:
4+
- label: "Intel HPU Test"
5+
soft_fail: true
6+
device: intel_hpu
7+
no_plugin: true
8+
commands:
9+
- bash .buildkite/scripts/hardware_ci/run-hpu-test.sh
10+

0 commit comments

Comments
 (0)