Unverified Commit f42a09af authored by Anant Sharma's avatar Anant Sharma Committed by GitHub
Browse files

fix: update nixl setup for arm builds (#1061) (#1062)

parent 56e18dc3
...@@ -4081,9 +4081,9 @@ dependencies = [ ...@@ -4081,9 +4081,9 @@ dependencies = [
[[package]] [[package]]
name = "nixl-sys" name = "nixl-sys"
version = "0.2.1-rc.1" version = "0.2.1-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4698155ec791ae888482b0c1c5d19792a1b457167fa8ec0ffa487ffef8c8e5a" checksum = "bfeec33e0229249e8688309a70c677f522446f9ac92105a85aad4a5ceef2dd2f"
dependencies = [ dependencies = [
"bindgen 0.71.1", "bindgen 0.71.1",
"cc", "cc",
......
...@@ -108,12 +108,21 @@ WORKDIR /workspace ...@@ -108,12 +108,21 @@ WORKDIR /workspace
# Copy nixl source, and use commit hash as cache hint # Copy nixl source, and use commit hash as cache hint
COPY --from=nixl_base /opt/nixl /opt/nixl COPY --from=nixl_base /opt/nixl /opt/nixl
COPY --from=nixl_base /opt/nixl/commit.txt /opt/nixl/commit.txt COPY --from=nixl_base /opt/nixl/commit.txt /opt/nixl/commit.txt
RUN cd /opt/nixl && \ RUN if [ "$ARCH" = "arm64" ]; then \
mkdir build && \ cd /opt/nixl && \
meson setup build/ --prefix=/usr/local/nixl && \ mkdir build && \
cd build/ && \ meson setup build/ --prefix=/usr/local/nixl -Dgds_path=/usr/local/cuda/targets/sbsa-linux && \
ninja && \ cd build/ && \
ninja install ninja && \
ninja install; \
else \
cd /opt/nixl && \
mkdir build && \
meson setup build/ --prefix=/usr/local/nixl && \
cd build/ && \
ninja && \
ninja install; \
fi
### NATS & ETCD SETUP ### ### NATS & ETCD SETUP ###
# nats # nats
...@@ -161,7 +170,8 @@ RUN --mount=type=bind,source=./container/deps/,target=/tmp/deps \ ...@@ -161,7 +170,8 @@ RUN --mount=type=bind,source=./container/deps/,target=/tmp/deps \
# NOTE: vLLM build from source on ARM can take several hours, see VLLM_MAX_JOBS details. # NOTE: vLLM build from source on ARM can take several hours, see VLLM_MAX_JOBS details.
if [ "$ARCH" = "arm64" ]; then \ if [ "$ARCH" = "arm64" ]; then \
# PyTorch 2.7 supports CUDA 12.8 and aarch64 installs # PyTorch 2.7 supports CUDA 12.8 and aarch64 installs
uv pip install torch==2.7.0 torchvision torchaudio --index-url https://download.pytorch.org/whl/cu128 && \ # NIXL has a torch dependency, so need to force-reinstall to install the correct version
uv pip install torch==2.7.0 torchvision torchaudio --force-reinstall --index-url https://download.pytorch.org/whl/cu128 && \
# Download vLLM source with version matching patch # Download vLLM source with version matching patch
git clone --branch v${VLLM_REF} --depth 1 https://github.com/vllm-project/vllm.git /tmp/vllm/vllm-${VLLM_REF} && \ git clone --branch v${VLLM_REF} --depth 1 https://github.com/vllm-project/vllm.git /tmp/vllm/vllm-${VLLM_REF} && \
cd /tmp/vllm/vllm-${VLLM_REF}/ && \ cd /tmp/vllm/vllm-${VLLM_REF}/ && \
......
...@@ -77,7 +77,7 @@ regex = "1" ...@@ -77,7 +77,7 @@ regex = "1"
rayon = "1" rayon = "1"
# block_manager # block_manager
nixl-sys = { version = "0.2.1-rc.1", optional = true } nixl-sys = { version = "0.2.1-rc.3", optional = true }
cudarc = { version = "0.16.2", features = ["cuda-12020"], optional = true } cudarc = { version = "0.16.2", features = ["cuda-12020"], optional = true }
ndarray = { version = "0.16", optional = true } ndarray = { version = "0.16", optional = true }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment