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
85
85
# Copy nixl source, and use commit hash as cache hint
86
86
COPY --from=nixl_base /opt/nixl /opt/nixl
87
87
COPY --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 && \
97
89
mkdir build && \
98
90
meson setup build/ --prefix=/usr/local/nixl && \
99
91
cd build/ && \
100
92
ninja && \
101
- ninja install; \
102
- fi
93
+ ninja install
103
94
104
95
### NATS & ETCD SETUP ###
105
96
# nats
@@ -126,12 +117,7 @@ ENV VIRTUAL_ENV=/opt/dynamo/venv
126
117
ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
127
118
128
119
# 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 .
135
121
136
122
# Install sglang
137
123
# 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"]
102
102
# Copy nixl source, and use commit hash as cache hint
103
103
COPY --from=nixl_base /opt/nixl /opt/nixl
104
104
COPY --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 && \
114
106
mkdir build && \
115
107
meson setup build/ --prefix=/usr/local/nixl && \
116
108
cd build/ && \
117
109
ninja && \
118
- ninja install; \
119
- fi
110
+ ninja install
120
111
121
112
ENV NIXL_PREFIX=/usr/local/nixl
122
113
Original file line number Diff line number Diff line change @@ -120,21 +120,12 @@ WORKDIR /workspace
120
120
# Copy nixl source, and use commit hash as cache hint
121
121
COPY --from=nixl_base /opt/nixl /opt/nixl
122
122
COPY --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 && \
132
124
mkdir build && \
133
125
meson setup build/ --buildtype=release --prefix=/usr/local/nixl && \
134
126
cd build/ && \
135
127
ninja && \
136
- ninja install; \
137
- fi
128
+ ninja install
138
129
139
130
### NATS & ETCD SETUP ###
140
131
# nats
@@ -161,13 +152,7 @@ ENV VIRTUAL_ENV=/opt/dynamo/venv
161
152
ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
162
153
163
154
# 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
171
156
172
157
# Install the wheel
173
158
# TODO: Move NIXL wheel install to the wheel_builder stage
You can’t perform that action at this time.
0 commit comments