File tree Expand file tree Collapse file tree 3 files changed +8
-46
lines changed Expand file tree Collapse file tree 3 files changed +8
-46
lines changed Original file line number Diff line number Diff line change @@ -85,21 +85,12 @@ WORKDIR /workspace
8585# Copy nixl source, and use commit hash as cache hint
8686COPY --from=nixl_base /opt/nixl /opt/nixl
8787COPY --from=nixl_base /opt/nixl/commit.txt /opt/nixl/commit.txt
88- RUN if [ "$ARCH" = "arm64" ]; then \
89- cd /opt/nixl && \
90- mkdir build && \
91- meson setup build/ --prefix=/usr/local/nixl -Dgds_path=/usr/local/cuda/targets/sbsa-linux && \
92- cd build/ && \
93- ninja && \
94- ninja install; \
95- else \
96- cd /opt/nixl && \
88+ RUN cd /opt/nixl && \
9789 mkdir build && \
9890 meson setup build/ --prefix=/usr/local/nixl && \
9991 cd build/ && \
10092 ninja && \
101- ninja install; \
102- fi
93+ ninja install
10394
10495### NATS & ETCD SETUP ###
10596# nats
@@ -126,12 +117,7 @@ ENV VIRTUAL_ENV=/opt/dynamo/venv
126117ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
127118
128119# Install NIXL Python module
129- # TODO: Move gds_path selection based on arch into NIXL build
130- RUN if [ "$ARCH" = "arm64" ]; then \
131- cd /opt/nixl && uv pip install . --config-settings=setup-args="-Dgds_path=/usr/local/cuda/targets/sbsa-linux"; \
132- else \
133- cd /opt/nixl && uv pip install . ; \
134- fi
120+ RUN cd /opt/nixl && uv pip install .
135121
136122# Install sglang
137123# Once either 0.4.6post6 or 0.4.7 is released, we can switch back to using the published version
Original file line number Diff line number Diff line change @@ -102,21 +102,12 @@ SHELL ["/bin/bash", "-c"]
102102# Copy nixl source, and use commit hash as cache hint
103103COPY --from=nixl_base /opt/nixl /opt/nixl
104104COPY --from=nixl_base /opt/nixl/commit.txt /opt/nixl/commit.txt
105- RUN if [ "$ARCH" = "arm64" ]; then \
106- cd /opt/nixl && \
107- mkdir build && \
108- meson setup build/ --prefix=/usr/local/nixl -Dgds_path=/usr/local/cuda/targets/sbsa-linux && \
109- cd build/ && \
110- ninja && \
111- ninja install; \
112- else \
113- cd /opt/nixl && \
105+ RUN cd /opt/nixl && \
114106 mkdir build && \
115107 meson setup build/ --prefix=/usr/local/nixl && \
116108 cd build/ && \
117109 ninja && \
118- ninja install; \
119- fi
110+ ninja install
120111
121112ENV NIXL_PREFIX=/usr/local/nixl
122113
Original file line number Diff line number Diff line change @@ -120,21 +120,12 @@ WORKDIR /workspace
120120# Copy nixl source, and use commit hash as cache hint
121121COPY --from=nixl_base /opt/nixl /opt/nixl
122122COPY --from=nixl_base /opt/nixl/commit.txt /opt/nixl/commit.txt
123- RUN if [ "$ARCH" = "arm64" ]; then \
124- cd /opt/nixl && \
125- mkdir build && \
126- meson setup build/ --buildtype=release --prefix=/usr/local/nixl -Dgds_path=/usr/local/cuda/targets/sbsa-linux && \
127- cd build/ && \
128- ninja && \
129- ninja install; \
130- else \
131- cd /opt/nixl && \
123+ RUN cd /opt/nixl && \
132124 mkdir build && \
133125 meson setup build/ --buildtype=release --prefix=/usr/local/nixl && \
134126 cd build/ && \
135127 ninja && \
136- ninja install; \
137- fi
128+ ninja install
138129
139130### NATS & ETCD SETUP ###
140131# nats
@@ -161,13 +152,7 @@ ENV VIRTUAL_ENV=/opt/dynamo/venv
161152ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
162153
163154# Install NIXL Python module
164- # TODO: Move gds_path selection based on arch into NIXL build
165- RUN if [ "$ARCH" = "arm64" ]; then \
166- cd /opt/nixl && uv build . --out-dir /workspace/wheels/nixl \
167- --config-settings=setup-args="-Dgds_path=/usr/local/cuda/targets/sbsa-linux"; \
168- else \
169- cd /opt/nixl && uv build . --out-dir /workspace/wheels/nixl; \
170- fi
155+ RUN cd /opt/nixl && uv build . --out-dir /workspace/wheels/nixl
171156
172157# Install the wheel
173158# TODO: Move NIXL wheel install to the wheel_builder stage
You can’t perform that action at this time.
0 commit comments