[Misc] Remove redundant imported `envs`, using `envs_ascend` instead #2193

shen-shanshan · 2025-08-04T06:54:37Z

What this PR does / why we need it?

Remove redundant imported envs, using envs_ascend instead.

import vllm.envs as envs_vllm
import vllm_ascend.envs as envs_ascend

Does this PR introduce any user-facing change?

How was this patch tested?

vLLM version: v0.10.0
vLLM main: vllm-project/vllm@71683ca

github-actions · 2025-08-04T07:19:18Z

👋 Hi! Thank you for contributing to the vLLM Ascend project. The following points will speed up your PR merge:‌‌

A PR should do only one thing, smaller PRs enable faster reviews.
Every PR should include unit tests and end-to-end tests ‌to ensure it works and is not broken by other future PRs.
Write the commit message by fulfilling the PR description to help reviewer and future developers understand.

If CI fails, you can run linting and testing checks locally according Contributing and Testing.

ApsarasX · 2025-08-04T07:23:12Z

There are also many vllm_ascend envs in other code files. I suggest replacing all of them.

For example

envs.VLLM_ENABLE_FUSED_EXPERTS_ALLGATHER_EP in w8a8_dynamic.py
envs.VLLM_ASCEND_ENABLE_MATMUL_ALLREDUCE in patch_linear.py
.....

shen-shanshan · 2025-08-08T03:18:47Z

There are also many vllm_ascend envs in other code files. I suggest replacing all of them.

For example

envs.VLLM_ENABLE_FUSED_EXPERTS_ALLGATHER_EP in w8a8_dynamic.py

envs.VLLM_ASCEND_ENABLE_MATMUL_ALLREDUCE in patch_linear.py
.....

@ApsarasX Done.

codecov · 2025-08-08T04:21:38Z

Codecov Report

❌ Patch coverage is 84.21053% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 75.74%. Comparing base (992271b) to head (3a96ee4).
⚠️ Report is 5 commits behind head on main.

Files with missing lines	Patch %	Lines
..._ascend/distributed/llmdatadist_c_mgr_connector.py	50.00%	2 Missing ⚠️
vllm_ascend/utils.py	75.00%	2 Missing ⚠️
...d/patch/platform/patch_common/patch_distributed.py	50.00%	1 Missing ⚠️
vllm_ascend/quantization/w8a8_dynamic.py	50.00%	1 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2193   +/-   ##
=======================================
  Coverage   75.74%   75.74%           
=======================================
  Files         118      118           
  Lines       13525    13525           
=======================================
  Hits        10245    10245           
  Misses       3280     3280

Flag	Coverage Δ
unittests	`75.74% <84.21%> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

shen-shanshan · 2025-08-12T01:51:32Z

@ApsarasX The CI has all passed. Does this can be merged?

ApsarasX · 2025-08-12T02:49:42Z

@ApsarasX The CI has all passed. Does this can be merged?

OK

github-actions · 2025-08-12T13:16:17Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: shen-shanshan <467638484@qq.com>

… MoE layers (#3) * feat(performance): support `GroupedMatmulSwigluQuant` in `W8A8_DYNAMIC` quantized MoE layers Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(bug): fix bug Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * feat(ops): enable grouped_matmul_swiglu_quant by default Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(test): fix broken test Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(test): temporally skip broken test due to oom Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(test): change bias1 to tensor Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(bug): update group_list handling and weight scale in dynamic methods Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * feat(ops): replace all splited gmm and swiglu Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * feat(quantization): split w4a8 and w8a8 apply Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(test): replace w8a8 function in apply Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * feat(cumsum): add cumsum_group_list function for group list processing Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * [Doc] Add container image save/load FAQ for offline environments (vllm-project#2347) ### What this PR does / why we need it? Add Docker export/import guide for air-gapped environments ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? NA - vLLM version: v0.10.0 - vLLM main: vllm-project/vllm@d16aa3d Signed-off-by: QwertyJack <7554089+QwertyJack@users.noreply.github.com> * [Bugfix] fix the oom when chunkprefill with long context like 64k (vllm-project#2319) The attn mask was declared in the mla.py，we don't need the splitfuse mask when mla chunkprefill, and this mask will cause memory problem when long context like 64k or 128k - vLLM version: v0.10.0 - vLLM main: vllm-project/vllm@14a5d90 --------- Signed-off-by: haojiangzheng <justineric096@gmail.com> * [Quickfix] Add the missing `apply_router_weight_on_input` in FusedMoE init (vllm-project#2348) ### What this PR does / why we need it? Add the missing `apply_router_weight_on_input` in FusedMoE init Quick fix on vllm-project#2268 (comment) ### Does this PR introduce _any_ user-facing change? N/A ### How was this patch tested? CI passed with existing test. - vLLM version: v0.10.0 - vLLM main: vllm-project/vllm@6807af8 Signed-off-by: MengqingCao <cmq0113@163.com> * [2/N][Refactor] Refactor V1 attention for better extensibility (vllm-project#1995) ### What this PR does / why we need it? Refactor V1 Attention for better extensibility (prepared for torchair attention refactor). **Main changes:** - Move different kinds of foward into their method respectively, e.g., `_forward_prefill_no_cache()`, `_forward_prefill_cache_hit()`, `_forward_decode_only()`, `_forward_v1_style()`. ### Does this PR introduce _any_ user-facing change? No. - vLLM version: v0.10.0 - vLLM main: vllm-project/vllm@14a5d90 Signed-off-by: shen-shanshan <467638484@qq.com> * [Misc] Remove redundant imported `envs`, using `envs_ascend` instead (vllm-project#2193) ### What this PR does / why we need it? Remove redundant imported `envs`, using `envs_ascend` instead. ```python import vllm.envs as envs_vllm import vllm_ascend.envs as envs_ascend ``` - vLLM version: v0.10.0 - vLLM main: vllm-project/vllm@71683ca --------- Signed-off-by: shen-shanshan <467638484@qq.com> * feat(torchair): consider not using gmmswigluquant when torchair enabled Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(dtype): unify `w1_scale` dtype Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> * fix(lint): fix lint Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> --------- Signed-off-by: zhoux77899 <zhouxiang100@huawei.com> Signed-off-by: QwertyJack <7554089+QwertyJack@users.noreply.github.com> Signed-off-by: haojiangzheng <justineric096@gmail.com> Signed-off-by: MengqingCao <cmq0113@163.com> Signed-off-by: shen-shanshan <467638484@qq.com> Co-authored-by: jack <QwertyJack@users.noreply.github.com> Co-authored-by: zhenghaojiang <zhjoneson@163.com> Co-authored-by: Mengqing Cao <cmq0113@163.com> Co-authored-by: Shanshan Shen <467638484@qq.com>

…llm-project#2193) ### What this PR does / why we need it? Remove redundant imported `envs`, using `envs_ascend` instead. ```python import vllm.envs as envs_vllm import vllm_ascend.envs as envs_ascend ``` - vLLM version: v0.10.0 - vLLM main: vllm-project/vllm@71683ca --------- Signed-off-by: shen-shanshan <467638484@qq.com>

wangxiyuan approved these changes Aug 4, 2025

View reviewed changes

shen-shanshan force-pushed the fix branch from 504186e to 3152bf0 Compare August 8, 2025 03:07

github-actions bot added module:tests module:core module:quantization labels Aug 8, 2025

shen-shanshan force-pushed the fix branch from 3d1287e to 3cb6e85 Compare August 11, 2025 02:03

ApsarasX approved these changes Aug 11, 2025

View reviewed changes

shen-shanshan force-pushed the fix branch from 3cb6e85 to 5a11fd8 Compare August 11, 2025 09:53

github-actions bot added the merge-conflicts label Aug 12, 2025

shen-shanshan added 4 commits August 13, 2025 03:15

Remove redundant import, using instead

342383c

Signed-off-by: shen-shanshan <467638484@qq.com>

update

1337a55

Signed-off-by: shen-shanshan <467638484@qq.com>

update

0acf2d6

Signed-off-by: shen-shanshan <467638484@qq.com>

update

3a96ee4

Signed-off-by: shen-shanshan <467638484@qq.com>

shen-shanshan force-pushed the fix branch from 5a11fd8 to 3a96ee4 Compare August 13, 2025 03:16

github-actions bot removed the merge-conflicts label Aug 13, 2025

wangxiyuan approved these changes Aug 14, 2025

View reviewed changes

wangxiyuan merged commit 103654c into vllm-project:main Aug 14, 2025
25 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Misc] Remove redundant imported `envs`, using `envs_ascend` instead #2193

[Misc] Remove redundant imported `envs`, using `envs_ascend` instead #2193

Uh oh!

shen-shanshan commented Aug 4, 2025 •

edited by github-actions bot

Loading

Uh oh!

github-actions bot commented Aug 4, 2025

Uh oh!

ApsarasX commented Aug 4, 2025 •

edited

Loading

Uh oh!

shen-shanshan commented Aug 8, 2025

Uh oh!

codecov bot commented Aug 8, 2025 •

edited

Loading

Uh oh!

shen-shanshan commented Aug 12, 2025

Uh oh!

ApsarasX commented Aug 12, 2025

Uh oh!

github-actions bot commented Aug 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

[Misc] Remove redundant imported envs, using envs_ascend instead #2193

[Misc] Remove redundant imported envs, using envs_ascend instead #2193

Uh oh!

Conversation

shen-shanshan commented Aug 4, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR does / why we need it?

Does this PR introduce any user-facing change?

How was this patch tested?

Uh oh!

github-actions bot commented Aug 4, 2025

Uh oh!

ApsarasX commented Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shen-shanshan commented Aug 8, 2025

Uh oh!

codecov bot commented Aug 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shen-shanshan commented Aug 12, 2025

Uh oh!

ApsarasX commented Aug 12, 2025

Uh oh!

github-actions bot commented Aug 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

[Misc] Remove redundant imported `envs`, using `envs_ascend` instead #2193

[Misc] Remove redundant imported `envs`, using `envs_ascend` instead #2193

shen-shanshan commented Aug 4, 2025 •

edited by github-actions bot

Loading

ApsarasX commented Aug 4, 2025 •

edited

Loading

codecov bot commented Aug 8, 2025 •

edited

Loading