Skip to content

Commit 0e251f1

Browse files
YikunAngazenn
authored andcommitted
Set numpy < 2.0.0 to resolve numpy VersionConflict (vllm-project#476)
### What this PR does / why we need it? vLLM bumps numpy version to 2.x: vllm-project/vllm@8427f70 , 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: vllm-project#473 Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
1 parent 48d986e commit 0e251f1

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

.github/workflows/vllm_ascend_test_main.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
7878
- name: Install vllm-project/vllm-ascend
7979
run: |
80-
pip uninstall -y numpy
8180
pip install -r requirements-dev.txt
8281
pip install -e .
8382

pyproject.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
[build-system]
22
# Should be mirrored in requirements.txt
33
requires = [
4-
"setuptools>=64",
5-
"setuptools-scm>=8",
64
"cmake>=3.26",
7-
"pybind11",
85
"decorator",
6+
"numpy<2.0.0",
7+
"pybind11",
98
"pyyaml",
109
"scipy",
10+
"setuptools>=64",
11+
"setuptools-scm>=8",
1112
"torch_npu >= 2.5.1rc1",
12-
"torch >= 2.5.1"
13+
"torch >= 2.5.1",
1314
]
1415
build-backend = "setuptools.build_meta"

requirements.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
# Should be mirrored in pyporject.toml
2+
cmake>=3.26
13
decorator
4+
numpy<2.0.0
5+
pybind11
26
pyyaml
37
scipy
4-
pybind11
5-
setuptools
6-
setuptools-scm
7-
numpy==1.26.4
8+
setuptools>=64
9+
setuptools-scm>=8
10+
torch_npu >= 2.5.1rc1
11+
torch >= 2.5.1

0 commit comments

Comments
 (0)