Skip to content

Commit 8d2998d

Browse files
authored
[Misc] Upgrade vllm hash to 12_14 (#5000)
### What this PR does / why we need it? ### Does this PR introduce _any_ user-facing change? 1. fix vllm-project/vllm#27938 2. fix vllm-project/vllm#27145 pooling models now supports chunked prefill and prefix caching, 3. fix vllm-project/vllm#30181 define the CPU fields in the field config where they really belong. 4. fix vllm-project/vllm#28168 define the CPU fields in the field config where they really belong. 5. fix vllm-project/vllm#30201 some moudle rename 6. fix vllm-project/vllm#29067 fusedmoe moudle refactor 7. fix vllm-project/vllm#29066 fusedmoe moudle refactor 8. fix vllm-project/vllm#29624 ### How was this patch tested? - vLLM version: v0.12.0 - vLLM main: vllm-project/vllm@ad32e3e --------- Signed-off-by: wangli <[email protected]>
1 parent 3b7eb51 commit 8d2998d

File tree

17 files changed

+167
-1183
lines changed

17 files changed

+167
-1183
lines changed

.github/workflows/pr_test_full.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
name: e2e-full
7575
strategy:
7676
matrix:
77-
vllm_version: [ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9, v0.12.0]
77+
vllm_version: [97f2f160fda2805f9149b0e44da76b5d3b1f7c7e, v0.12.0]
7878
needs: [changes]
7979
if: ${{ needs.changes.outputs.e2e_tracker == 'true' }}
8080
uses: ./.github/workflows/_e2e_test.yaml

.github/workflows/pr_test_light.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
lint:
4343
uses: ./.github/workflows/_pre_commit.yml
4444
with:
45-
vllm: ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9
45+
vllm: 97f2f160fda2805f9149b0e44da76b5d3b1f7c7e
4646
changes:
4747
runs-on: linux-aarch64-a2-0
4848
outputs:
@@ -90,7 +90,7 @@ jobs:
9090
SOC_VERSION: ascend910b1
9191
strategy:
9292
matrix:
93-
vllm_version: [ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9, v0.12.0]
93+
vllm_version: [97f2f160fda2805f9149b0e44da76b5d3b1f7c7e, v0.12.0]
9494

9595
steps:
9696
- name: Free up disk space
@@ -154,7 +154,7 @@ jobs:
154154
name: e2e-light
155155
strategy:
156156
matrix:
157-
vllm_version: [ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9, v0.12.0]
157+
vllm_version: [97f2f160fda2805f9149b0e44da76b5d3b1f7c7e, v0.12.0]
158158
# Note (yikun): If CI resource are limited we can split job into two chain jobs
159159
needs: [lint, changes]
160160
# only trigger e2e test after lint passed and the change is e2e related with pull request.

docs/source/community/versioning_policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The table below is the release compatibility matrix for vLLM Ascend release.
4545
For main branch of vLLM Ascend, we usually make it compatible with the latest vLLM release and a newer commit hash of vLLM. Please note that this table is usually updated. Please check it regularly.
4646
| vLLM Ascend | vLLM | Python | Stable CANN | PyTorch/torch_npu |
4747
|-------------|--------------|------------------|-------------|--------------------|
48-
| main | ad32e3e19ccf0526cb6744a5fed09a138a5fb2f9, v0.12.0 tag | >= 3.10, < 3.12 | 8.3.RC2 | 2.8.0 / 2.8.0 |
48+
| main | 97f2f160fda2805f9149b0e44da76b5d3b1f7c7e, v0.12.0 tag | >= 3.10, < 3.12 | 8.3.RC2 | 2.8.0 / 2.8.0 |
4949

5050
## Release cadence
5151

tests/ut/compilation/test_acl_graph.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,9 @@ def test_update_mla_dcp_pcp_params(self, _mock_graph_task_end):
803803
(q_nope, q_pe, k_nope, k_pe, block_table, seq_lens, num_heads,
804804
scale, num_kv_heads, out, lse))
805805

806-
update_mla_attn_dcp_pcp_params(self.update_stream, forward_context, 4)
806+
with patch("torch_npu._C._npu_setStream", return_value=None):
807+
update_mla_attn_dcp_pcp_params(self.update_stream, forward_context,
808+
4)
807809

808810
_mock_graph_task_end.assert_called_once()
809811

@@ -842,6 +844,7 @@ def test_update_attn_dcp_pcp_params(self, _mock_graph_task_end):
842844
block_table, 128, actual_seq_lengths_kv, actual_seq_lengths_q,
843845
out, lse, 2, 0, 0))
844846

845-
update_attn_dcp_pcp_params(self.update_stream, forward_context, 4)
847+
with patch("torch_npu._C._npu_setStream", return_value=None):
848+
update_attn_dcp_pcp_params(self.update_stream, forward_context, 4)
846849

847850
_mock_graph_task_end.assert_called_once()

tests/ut/spec_decode/test_eagle_proposer.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ def test_load_model_pp1(self, mock_pp_group, mock_get_model,
9595
mock_model = MagicMock()
9696
mock_model.model.embed_tokens = MagicMock()
9797
mock_model.lm_head = MagicMock()
98+
mock_model.multimodal_cpu_fields = None
99+
mock_model.merge_by_field_config = None
98100
mock_get_model.return_value = MagicMock()
99101
self.proposer.name = SpecDcodeType.EAGLE
100102

@@ -117,6 +119,8 @@ def test_load_model_pp_gt1(self, mock_pp_group, mock_get_model,
117119

118120
mock_model = MagicMock()
119121
original_embed = MagicMock()
122+
mock_model.multimodal_cpu_fields = None
123+
mock_model.merge_by_field_config = None
120124
mock_get_model.return_value = MagicMock(model=MagicMock(
121125
embed_tokens=original_embed))
122126

0 commit comments

Comments
 (0)