Main2main Upgrade vllm commit to 0320 17:00 (#7510)

### What this PR does / why we need it?
Main2main Upgrade vllm commit to 0320 17:00

1. fix vllm refactored `_moe_forward` to call
`runner.forward_impl_chunked()` when `runner.use_dp_chunking` is True.
vllm PR:"[MoE Refactor] DefaultMoERunner simplification
[#33049](https://github.com/vllm-project/vllm/pull/33049)"

2.fix vllm moved the call to `self._set_compile_ranges()` in
`VllmConfig.__post_init__` from **before** `check_and_update_config()`
to **after** it (to allow platforms to lower `max_num_batched_tokens`
first). vllm PR: "fix(xpu): Re-compute compile ranges after
platform-specific config updates"
[#37523](https://github.com/vllm-project/vllm/pull/37523)


### Does this PR introduce _any_ user-facing change?
NA

### How was this patch tested?
NA

- vLLM version: v0.17.0
- vLLM main:
8b6325758c

---------

Signed-off-by: leo-pony <nengjunma@outlook.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
This commit is contained in:
Nengjun Ma
2026-03-23 21:37:41 +08:00
committed by GitHub
parent bdd90c0088
commit fcba91a392
8 changed files with 15 additions and 9 deletions

View File

@@ -37,7 +37,7 @@ jobs:
steps:
- name: Get vLLM version
run: |
VLLM_COMMIT=6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209
VLLM_COMMIT=ed359c497a728f08b5b41456c07a688ccd510fbc
echo "VLLM_COMMIT=https://github.com/vllm-project/vllm/commit/$VLLM_COMMIT" >> "$GITHUB_ENV"
- name: Checkout repository

View File

@@ -27,7 +27,7 @@ RUN apt-get update -y && \
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
# For lint purpose, actually we need make a main2main matching.
ARG VLLM_COMMIT=6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209
ARG VLLM_COMMIT=ed359c497a728f08b5b41456c07a688ccd510fbc
RUN git clone $VLLM_REPO /vllm-workspace/vllm && \
cd /vllm-workspace/vllm && \
git checkout $VLLM_COMMIT

View File

@@ -75,7 +75,7 @@ jobs:
name: e2e-full
strategy:
matrix:
vllm_version: [6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209, v0.18.0]
vllm_version: [ed359c497a728f08b5b41456c07a688ccd510fbc, v0.18.0]
needs: [changes]
if: ${{ needs.changes.outputs.e2e_tracker == 'true' || needs.changes.outputs.e2e_tracker == true }}
uses: ./.github/workflows/_e2e_test.yaml

View File

@@ -41,7 +41,7 @@ jobs:
lint:
uses: ./.github/workflows/_pre_commit.yml
with:
vllm: 6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209
vllm: ed359c497a728f08b5b41456c07a688ccd510fbc
changes:
runs-on: linux-aarch64-a2b3-0
outputs:
@@ -90,7 +90,7 @@ jobs:
if: ${{ needs.lint.result == 'success' && (needs.changes.outputs.e2e_tracker == 'true' || needs.changes.outputs.ut_tracker == 'true') }}
strategy:
matrix:
vllm_version: [6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209, v0.18.0]
vllm_version: [ed359c497a728f08b5b41456c07a688ccd510fbc, v0.18.0]
uses: ./.github/workflows/_unit_test.yaml
with:
vllm: ${{ matrix.vllm_version }}
@@ -102,7 +102,7 @@ jobs:
name: e2e-light
strategy:
matrix:
vllm_version: [6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209, v0.18.0]
vllm_version: [ed359c497a728f08b5b41456c07a688ccd510fbc, v0.18.0]
# Note (yikun): If CI resource are limited we can split job into two chain jobs
needs: [lint, changes]
# only trigger e2e test after lint passed and the change is e2e related with pull request.

View File

@@ -33,7 +33,7 @@ jobs:
name: refresh codecov
strategy:
matrix:
vllm_version: [6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209]
vllm_version: [ed359c497a728f08b5b41456c07a688ccd510fbc]
uses: ./.github/workflows/_unit_test.yaml
with:
vllm: ${{ matrix.vllm_version }}

View File

@@ -59,7 +59,7 @@ For main branch of vLLM Ascend, we usually make it compatible with the latest vL
| vLLM Ascend | vLLM | Python | Stable CANN | PyTorch/torch_npu |
|-------------|--------------|------------------|-------------|--------------------|
| main | 6a9cceb219fcbd6b1eb540ddfdc77ec160f0e209, v0.18.0 tag | >= 3.10, < 3.12 | 8.5.0 | 2.9.0 / 2.9.0 |
| main | ed359c497a728f08b5b41456c07a688ccd510fbc, v0.18.0 tag | >= 3.10, < 3.12 | 8.5.0 | 2.9.0 / 2.9.0 |
## Release cadence

View File

@@ -161,7 +161,7 @@ class AscendConfig:
@staticmethod
def _get_compile_ranges(compilation_config):
return compilation_config.compile_ranges_endpoints
return compilation_config.compile_ranges_endpoints or []
@staticmethod
def _set_compile_ranges(compilation_config, value):

View File

@@ -259,6 +259,12 @@ class AscendMoERunner(DefaultMoERunner):
else:
self.moe_forward = torch.ops.vllm.moe_forward_shared
@property
def use_dp_chunking(self) -> bool:
"""Ascend uses its own forward_impl path, not the FlashInfer Cutlass
chunked path. Always return False to stay on forward_impl."""
return False
def forward_impl(
self,
layer: torch.nn.Module,