Unverified Commit a4c8f5ab authored by Alec's avatar Alec Committed by GitHub
Browse files

chore: add ucx binaries to path (#3388)


Signed-off-by: default avataralec-flowers <aflowers@nvidia.com>
parent cfe74445
...@@ -205,7 +205,7 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -205,7 +205,7 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
# UCX environment variables # UCX environment variables
ENV CPATH=/usr/include:$CPATH \ ENV CPATH=/usr/include:$CPATH \
PATH=/usr/bin:$PATH \ PATH=/usr/bin:/usr/local/ucx/bin:$PATH \
PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH
################################## ##################################
......
...@@ -116,12 +116,16 @@ COPY --from=framework /usr/local/lib/lib* /usr/local/lib/ ...@@ -116,12 +116,16 @@ COPY --from=framework /usr/local/lib/lib* /usr/local/lib/
# Copy nats and etcd from dynamo_base image # Copy nats and etcd from dynamo_base image
COPY --from=dynamo_base /usr/bin/nats-server /usr/bin/nats-server COPY --from=dynamo_base /usr/bin/nats-server /usr/bin/nats-server
COPY --from=dynamo_base /usr/local/bin/etcd/ /usr/local/bin/etcd/ COPY --from=dynamo_base /usr/local/bin/etcd/ /usr/local/bin/etcd/
# Add ETCD and CUDA binaries to PATH so cicc and other CUDA tools are accessible
ENV PATH=/usr/local/bin/etcd/:/usr/local/cuda/nvvm/bin:$PATH
# Copy UCX from framework image as plugin for NIXL # Copy UCX from framework image as plugin for NIXL
# Copy NIXL source from framework image # Copy NIXL source from framework image
# Copy dynamo wheels for gitlab artifacts # Copy dynamo wheels for gitlab artifacts
COPY --from=dynamo_base /usr/local/ucx /usr/local/ucx COPY --from=dynamo_base /usr/local/ucx /usr/local/ucx
COPY --from=dynamo_base $NIXL_PREFIX $NIXL_PREFIX COPY --from=dynamo_base $NIXL_PREFIX $NIXL_PREFIX
ENV PATH=/usr/local/ucx/bin:$PATH
# Copy OpenMPI from framework image # Copy OpenMPI from framework image
COPY --from=framework /opt/hpcx/ompi /opt/hpcx/ompi COPY --from=framework /opt/hpcx/ompi /opt/hpcx/ompi
# Copy NUMA library from framework image # Copy NUMA library from framework image
...@@ -339,4 +343,4 @@ RUN uv pip install maturin[patchelf] ...@@ -339,4 +343,4 @@ RUN uv pip install maturin[patchelf]
COPY pyproject.toml README.md hatch_build.py /workspace/ COPY pyproject.toml README.md hatch_build.py /workspace/
RUN uv pip install --no-deps -e . RUN uv pip install --no-deps -e .
CMD [] CMD []
\ No newline at end of file
...@@ -221,6 +221,7 @@ ENV PATH=/usr/local/bin/etcd/:/usr/local/cuda/nvvm/bin:$PATH ...@@ -221,6 +221,7 @@ ENV PATH=/usr/local/bin/etcd/:/usr/local/cuda/nvvm/bin:$PATH
# Copy dynamo wheels for gitlab artifacts # Copy dynamo wheels for gitlab artifacts
COPY --from=dynamo_base /usr/local/ucx /usr/local/ucx COPY --from=dynamo_base /usr/local/ucx /usr/local/ucx
COPY --from=dynamo_base $NIXL_PREFIX $NIXL_PREFIX COPY --from=dynamo_base $NIXL_PREFIX $NIXL_PREFIX
ENV PATH=/usr/local/ucx/bin:$PATH
# Copies vllm, DeepEP, DeepGEMM, PPLX repos (all editable installs) and nvshmem binaries # Copies vllm, DeepEP, DeepGEMM, PPLX repos (all editable installs) and nvshmem binaries
COPY --from=framework /opt/vllm /opt/vllm COPY --from=framework /opt/vllm /opt/vllm
......
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