[Misc] Remove redundant imported envs, using envs_ascend instead (#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:
71683ca6f6

---------

Signed-off-by: shen-shanshan <467638484@qq.com>
This commit is contained in:
Shanshan Shen
2025-08-14 09:33:39 +08:00
committed by GitHub
parent 55d0790597
commit 103654ccd6
14 changed files with 46 additions and 46 deletions

View File

@@ -5,8 +5,8 @@ import torch
import vllm
from pytest_mock import MockerFixture
import vllm_ascend.envs as envs_ascend
from tests.ut.base import PytestBase
from vllm_ascend import envs
from vllm_ascend.patch.worker.patch_common import patch_linear
@@ -158,10 +158,10 @@ class TestAscendRowParallelLinear(PytestBase):
assert torch.allclose(ret, expected)
def test_enable_allreduce_matmul(self, mocker: MockerFixture):
mocker.patch.object(envs,
mocker.patch.object(envs_ascend,
"VLLM_ASCEND_ENABLE_MATMUL_ALLREDUCE",
new=True)
reload(patch_linear)
assert envs.VLLM_ASCEND_ENABLE_MATMUL_ALLREDUCE
assert envs_ascend.VLLM_ASCEND_ENABLE_MATMUL_ALLREDUCE
assert id(vllm.model_executor.layers.linear.RowParallelLinear) == id(
patch_linear.AscendRowParallelLinear)

View File

@@ -15,25 +15,26 @@
import inspect
import os
import vllm_ascend.envs as envs_ascend
from tests.ut.base import TestBase
from vllm_ascend import envs
class TestEnvVariables(TestBase):
def setUp(self):
self.env_vars = list(envs.env_variables.keys())
self.env_vars = list(envs_ascend.env_variables.keys())
def test_env_vars_behavior(self):
for var_name in self.env_vars:
with self.subTest(var=var_name):
original_val = os.environ.get(var_name)
var_handler = envs.env_variables[var_name]
var_handler = envs_ascend.env_variables[var_name]
try:
if var_name in os.environ:
del os.environ[var_name]
self.assertEqual(getattr(envs, var_name), var_handler())
self.assertEqual(getattr(envs_ascend, var_name),
var_handler())
handler_source = inspect.getsource(var_handler)
if 'int(' in handler_source:
@@ -45,7 +46,7 @@ class TestEnvVariables(TestBase):
for test_val in test_vals:
os.environ[var_name] = test_val
self.assertEqual(getattr(envs, var_name),
self.assertEqual(getattr(envs_ascend, var_name),
var_handler())
finally:
@@ -55,7 +56,7 @@ class TestEnvVariables(TestBase):
os.environ[var_name] = original_val
def test_dir_and_getattr(self):
self.assertEqual(sorted(envs.__dir__()), sorted(self.env_vars))
self.assertEqual(sorted(envs_ascend.__dir__()), sorted(self.env_vars))
for var_name in self.env_vars:
with self.subTest(var=var_name):
getattr(envs, var_name)
getattr(envs_ascend, var_name)