Skip to content

Commit e21887e

Browse files
youkaichaoDanilaKirichkoMTSAI
authored andcommitted
[ci/build] Fix abi tag for aarch64 (#23329)
Signed-off-by: youkaichao <youkaichao@gmail.com> Signed-off-by: Danila Kirichko <d.kirichko@mts.ai>
1 parent bdf8b8d commit e21887e

File tree

3 files changed

+32
-7
lines changed

3 files changed

+32
-7
lines changed

.buildkite/generate_index.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@
2222

2323
with open("index.html", "w") as f:
2424
print(f"Generated index.html for {args.wheel}")
25+
# sync the abi tag with .buildkite/scripts/upload-wheels.sh
2526
if "x86_64" in filename:
2627
x86_wheel = filename
27-
arm_wheel = filename.replace("x86_64", "aarch64")
28+
arm_wheel = filename.replace("x86_64", "aarch64").replace(
29+
"manylinux1", "manylinux2014"
30+
)
2831
elif "aarch64" in filename:
29-
x86_wheel = filename.replace("aarch64", "x86_64")
32+
x86_wheel = filename.replace("aarch64", "x86_64").replace(
33+
"manylinux2014", "manylinux1"
34+
)
3035
arm_wheel = filename
3136
else:
3237
raise ValueError(f"Unsupported wheel: {filename}")

.buildkite/scripts/upload-wheels.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,19 @@ fi
1414
# Get the single wheel file
1515
wheel="${wheel_files[0]}"
1616

17-
# Rename 'linux' to 'manylinux1' in the wheel filename
18-
new_wheel="${wheel/linux/manylinux1}"
17+
# Detect architecture and rename 'linux' to appropriate manylinux version
18+
arch=$(uname -m)
19+
if [[ $arch == "x86_64" ]]; then
20+
manylinux_version="manylinux1"
21+
elif [[ $arch == "aarch64" ]]; then
22+
manylinux_version="manylinux2014"
23+
else
24+
echo "Warning: Unknown architecture $arch, using manylinux1 as default"
25+
manylinux_version="manylinux1"
26+
fi
27+
28+
# Rename 'linux' to the appropriate manylinux version in the wheel filename
29+
new_wheel="${wheel/linux/$manylinux_version}"
1930
mv -- "$wheel" "$new_wheel"
2031
wheel="$new_wheel"
2132

setup.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,16 +643,25 @@ def _read_requirements(filename: str) -> list[str]:
643643
if wheel_location is not None:
644644
wheel_url = wheel_location
645645
else:
646+
import platform
647+
arch = platform.machine()
648+
if arch == "x86_64":
649+
wheel_tag = "manylinux1_x86_64"
650+
elif arch == "aarch64":
651+
wheel_tag = "manylinux2014_aarch64"
652+
else:
653+
raise ValueError(f"Unsupported architecture: {arch}")
646654
base_commit = precompiled_wheel_utils.get_base_commit_in_main_branch()
647-
wheel_url = f"https://wheels.vllm.ai/{base_commit}/vllm-1.0.0.dev-cp38-abi3-manylinux1_x86_64.whl"
655+
wheel_url = f"https://wheels.vllm.ai/{base_commit}/vllm-1.0.0.dev-cp38-abi3-{wheel_tag}.whl"
656+
nightly_wheel_url = f"https://wheels.vllm.ai/nightly/vllm-1.0.0.dev-cp38-abi3-{wheel_tag}.whl"
648657
from urllib.request import urlopen
649658
try:
650659
with urlopen(wheel_url) as resp:
651660
if resp.status != 200:
652-
wheel_url = "https://wheels.vllm.ai/nightly/vllm-1.0.0.dev-cp38-abi3-manylinux1_x86_64.whl"
661+
wheel_url = nightly_wheel_url
653662
except Exception as e:
654663
print(f"[warn] Falling back to nightly wheel: {e}")
655-
wheel_url = "https://wheels.vllm.ai/nightly/vllm-1.0.0.dev-cp38-abi3-manylinux1_x86_64.whl"
664+
wheel_url = nightly_wheel_url
656665

657666
patch = precompiled_wheel_utils.extract_precompiled_and_patch_package(
658667
wheel_url)

0 commit comments

Comments
 (0)