Set numpy < 2.0.0 to resolve numpy VersionConflict (#476)

### What this PR does / why we need it?
vLLM bumps numpy version to 2.x:
8427f70493
, this will cause a
`pip._vendor.pkg_resources.ContextualVersionConflict: (numpy 2.2.4
(/usr/local/python3.10/lib/python3.10/site-packages),
Requirement.parse('numpy==1.26.4'), {'vllm-ascend'})` failure when vllm
ascend install. This PR resolved the issue by:
- Set numpy < 2.0.0 to resolve numpy VersionConflict
- Sync requirements and toml 
- Reorder


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

### How was this patch tested?
CI passed

Closes: https://github.com/vllm-project/vllm-ascend/issues/473

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
This commit is contained in:
Yikun Jiang
2025-04-07 16:07:21 +08:00
committed by GitHub
parent 344228a5da
commit adabdeea7f
3 changed files with 13 additions and 9 deletions

View File

@@ -77,7 +77,6 @@ jobs:
- name: Install vllm-project/vllm-ascend - name: Install vllm-project/vllm-ascend
run: | run: |
pip uninstall -y numpy
pip install -r requirements-dev.txt pip install -r requirements-dev.txt
pip install -e . pip install -e .

View File

@@ -1,14 +1,15 @@
[build-system] [build-system]
# Should be mirrored in requirements.txt # Should be mirrored in requirements.txt
requires = [ requires = [
"setuptools>=64",
"setuptools-scm>=8",
"cmake>=3.26", "cmake>=3.26",
"pybind11",
"decorator", "decorator",
"numpy<2.0.0",
"pybind11",
"pyyaml", "pyyaml",
"scipy", "scipy",
"setuptools>=64",
"setuptools-scm>=8",
"torch_npu >= 2.5.1rc1", "torch_npu >= 2.5.1rc1",
"torch >= 2.5.1" "torch >= 2.5.1",
] ]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"

View File

@@ -1,7 +1,11 @@
# Should be mirrored in pyporject.toml
cmake>=3.26
decorator decorator
numpy<2.0.0
pybind11
pyyaml pyyaml
scipy scipy
pybind11 setuptools>=64
setuptools setuptools-scm>=8
setuptools-scm torch_npu >= 2.5.1rc1
numpy==1.26.4 torch >= 2.5.1