Skip to content

GitLab

Unverified Commit 00b38ded authored by Joe Chandler's avatar Joe Chandler Committed by GitHub
Browse files

feat: Libfabric support (#4407) 


Signed-off-by: default avatarJoe Chandler <jchandler@glia-ai.com>
Co-authored-by: default avatarMeenakshi Sharma <163925564+nvda-mesharma@users.noreply.github.com>
parent da0f2fb8
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 31 deletions
container/Dockerfile
View file @ 00b38ded
...@@ -52,6 +52,7 @@ ARG SCCACHE_REGION="" ...@@ -52,6 +52,7 @@ ARG SCCACHE_REGION=""
ARG NIXL_UCX_REF ARG NIXL_UCX_REF
ARG NIXL_REF ARG NIXL_REF
ARG NIXL_GDRCOPY_REF ARG NIXL_GDRCOPY_REF
ARG NIXL_LIBFABRIC_REF
################################## ##################################
########## Base Image ############ ########## Base Image ############
...@@ -155,7 +156,11 @@ RUN yum groupinstall -y 'Development Tools' && \ ...@@ -155,7 +156,11 @@ RUN yum groupinstall -y 'Development Tools' && \
libibumad \ libibumad \
libibumad-devel \ libibumad-devel \
librdmacm-devel \ librdmacm-devel \
numactl-devel numactl-devel \
# Libfabric support
hwloc \
hwloc-devel
# Ensure a modern protoc is available (required for --experimental_allow_proto3_optional) # Ensure a modern protoc is available (required for --experimental_allow_proto3_optional)
...@@ -285,6 +290,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -285,6 +290,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \ echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \
ldconfig ldconfig
ARG NIXL_LIBFABRIC_REF
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
export SCCACHE_S3_KEY_PREFIX="${SCCACHE_S3_KEY_PREFIX:-${ARCH}}" && \
if [ "$USE_SCCACHE" = "true" ]; then \
export CMAKE_C_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CXX_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CUDA_COMPILER_LAUNCHER="sccache"; \
fi && \
cd /usr/local/src && \
git clone https://github.com/ofiwg/libfabric.git && \
cd libfabric && \
git checkout $NIXL_LIBFABRIC_REF && \
./autogen.sh && \
./configure --prefix="/usr/local/libfabric" \
--disable-verbs \
--disable-psm3 \
--disable-opx \
--disable-usnic \
--disable-rstream \
--enable-efa \
--with-cuda=/usr/local/cuda \
--enable-cuda-dlopen \
--with-gdrcopy \
--enable-gdrcopy-dlopen && \
make -j$(nproc) && \
make install && \
/tmp/use-sccache.sh show-stats "LIBFABRIC" && \
echo "/usr/local/libfabric/lib" > /etc/ld.so.conf.d/libfabric.conf && \
ldconfig
# build and install nixl # build and install nixl
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \ --mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
...@@ -301,7 +337,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -301,7 +337,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \ meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \
-Dcudapath_lib="/usr/local/cuda/lib64" \ -Dcudapath_lib="/usr/local/cuda/lib64" \
-Dcudapath_inc="/usr/local/cuda/include" \ -Dcudapath_inc="/usr/local/cuda/include" \
-Ducx_path="/usr/local/ucx" && \ -Ducx_path="/usr/local/ucx" \
-Dlibfabric_path="/usr/local/libfabric" && \
cd build && \ cd build && \
ninja && \ ninja && \
ninja install && \ ninja install && \
......
container/Dockerfile.aws 0 → 100644
View file @ 00b38ded
# syntax=docker/dockerfile:1.10.0
# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
# PURPOSE: AWS EFA support layer
#
# This Dockerfile adds AWS EFA (Elastic Fabric Adapter) support on top of
# the runtime or dev stages from framework Dockerfiles (vllm, sglang, trtllm).
#
# Usage (via build.sh with --make-efa flag):
# ./build.sh --framework vllm --target runtime --make-efa
# ./build.sh --framework vllm --target local-dev --make-efa
ARG BASE_IMAGE
ARG EFA_VERSION
###########################################################
########## Runtime with AWS EFA ##########################
###########################################################
#
# This stage extends the runtime stage with AWS EFA installer
# which includes: libfabric and aws-ofi-nccl plugin
#
# Use this stage when deploying on AWS infrastructure with EFA support
FROM ${BASE_IMAGE} AS runtime-aws
ARG EFA_VERSION
USER root
# Install AWS EFA installer with bundled libfabric and aws-ofi-nccl
# Flags explanation:
# --skip-kmod: Skip kernel module installation (handled by host)
# --skip-limit-conf: Skip ulimit configuration (handled by container runtime)
# --no-verify: Skip GPG verification (optional, can be removed if verification is needed)
RUN mkdir -p /tmp/efa && \
cd /tmp/efa && \
curl --retry 3 --retry-delay 2 -fsSL -o aws-efa-installer-${EFA_VERSION}.tar.gz \
https://efa-installer.amazonaws.com/aws-efa-installer-${EFA_VERSION}.tar.gz && \
tar -xf aws-efa-installer-${EFA_VERSION}.tar.gz && \
cd aws-efa-installer && \
apt-get update && \
./efa_installer.sh -y --skip-kmod --skip-limit-conf --no-verify && \
rm -rf /tmp/efa && \
ldconfig
USER dynamo
ENTRYPOINT ["/opt/nvidia/nvidia_entrypoint.sh"]
CMD []
########################################################################
########## Development with AWS EFA (run.sh, runs as root user) ########
########################################################################
#
# PURPOSE: Development environment with AWS EFA support
#
# This stage extends dev stages with development tools for building and
# debugging on EFA-enabled AWS instances.
FROM ${BASE_IMAGE} AS dev-aws
ARG EFA_VERSION
# Dev stage runs as root, no USER switch needed
# Install AWS EFA installer with bundled libfabric and aws-ofi-nccl
# Flags explanation:
# --skip-kmod: Skip kernel module installation (handled by host)
# --skip-limit-conf: Skip ulimit configuration (handled by container runtime)
# --no-verify: Skip GPG verification (optional, can be removed if verification is needed)
RUN mkdir -p /tmp/efa && \
cd /tmp/efa && \
curl --retry 3 --retry-delay 2 -fsSL -o aws-efa-installer-${EFA_VERSION}.tar.gz \
https://efa-installer.amazonaws.com/aws-efa-installer-${EFA_VERSION}.tar.gz && \
tar -xf aws-efa-installer-${EFA_VERSION}.tar.gz && \
cd aws-efa-installer && \
apt-get update && \
./efa_installer.sh -y --skip-kmod --skip-limit-conf --no-verify && \
rm -rf /tmp/efa && \
ldconfig
ENTRYPOINT ["/opt/nvidia/nvidia_entrypoint.sh"]
CMD []
container/Dockerfile.sglang
View file @ 00b38ded
...@@ -56,6 +56,7 @@ ARG SCCACHE_REGION="" ...@@ -56,6 +56,7 @@ ARG SCCACHE_REGION=""
ARG NIXL_UCX_REF ARG NIXL_UCX_REF
ARG NIXL_REF ARG NIXL_REF
ARG NIXL_GDRCOPY_REF ARG NIXL_GDRCOPY_REF
ARG NIXL_LIBFABRIC_REF
################################## ##################################
########## Base Image ############ ########## Base Image ############
...@@ -158,7 +159,10 @@ RUN yum groupinstall -y 'Development Tools' && \ ...@@ -158,7 +159,10 @@ RUN yum groupinstall -y 'Development Tools' && \
libibumad \ libibumad \
libibumad-devel \ libibumad-devel \
librdmacm-devel \ librdmacm-devel \
numactl-devel numactl-devel \
# Libfabric support
hwloc \
hwloc-devel
# Ensure a modern protoc is available (required for --experimental_allow_proto3_optional) # Ensure a modern protoc is available (required for --experimental_allow_proto3_optional)
...@@ -288,6 +292,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -288,6 +292,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \ echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \
ldconfig ldconfig
ARG NIXL_LIBFABRIC_REF
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
export SCCACHE_S3_KEY_PREFIX="${SCCACHE_S3_KEY_PREFIX:-${ARCH}}" && \
if [ "$USE_SCCACHE" = "true" ]; then \
export CMAKE_C_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CXX_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CUDA_COMPILER_LAUNCHER="sccache"; \
fi && \
cd /usr/local/src && \
git clone https://github.com/ofiwg/libfabric.git && \
cd libfabric && \
git checkout $NIXL_LIBFABRIC_REF && \
./autogen.sh && \
./configure --prefix="/usr/local/libfabric" \
--disable-verbs \
--disable-psm3 \
--disable-opx \
--disable-usnic \
--disable-rstream \
--enable-efa \
--with-cuda=/usr/local/cuda \
--enable-cuda-dlopen \
--with-gdrcopy \
--enable-gdrcopy-dlopen && \
make -j$(nproc) && \
make install && \
/tmp/use-sccache.sh show-stats "LIBFABRIC" && \
echo "/usr/local/libfabric/lib" > /etc/ld.so.conf.d/libfabric.conf && \
ldconfig
# build and install nixl # build and install nixl
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \ --mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
...@@ -304,7 +339,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -304,7 +339,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \ meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \
-Dcudapath_lib="/usr/local/cuda/lib64" \ -Dcudapath_lib="/usr/local/cuda/lib64" \
-Dcudapath_inc="/usr/local/cuda/include" \ -Dcudapath_inc="/usr/local/cuda/include" \
-Ducx_path="/usr/local/ucx" && \ -Ducx_path="/usr/local/ucx" \
-Dlibfabric_path="/usr/local/libfabric" && \
cd build && \ cd build && \
ninja && \ ninja && \
ninja install && \ ninja install && \
......
container/Dockerfile.trtllm
View file @ 00b38ded
...@@ -59,6 +59,7 @@ ARG SCCACHE_REGION="" ...@@ -59,6 +59,7 @@ ARG SCCACHE_REGION=""
ARG NIXL_UCX_REF ARG NIXL_UCX_REF
ARG NIXL_REF ARG NIXL_REF
ARG NIXL_GDRCOPY_REF ARG NIXL_GDRCOPY_REF
ARG NIXL_LIBFABRIC_REF
# Define general architecture ARGs for supporting both x86 and aarch64 builds. # Define general architecture ARGs for supporting both x86 and aarch64 builds.
# ARCH: Used for package suffixes (e.g., amd64, arm64) # ARCH: Used for package suffixes (e.g., amd64, arm64)
...@@ -179,7 +180,10 @@ RUN yum groupinstall -y 'Development Tools' && \ ...@@ -179,7 +180,10 @@ RUN yum groupinstall -y 'Development Tools' && \
libibumad \ libibumad \
libibumad-devel \ libibumad-devel \
librdmacm-devel \ librdmacm-devel \
numactl-devel numactl-devel \
# Libfabric support
hwloc \
hwloc-devel
# Ensure a modern protoc is available (required for --experimental_allow_proto3_optional) # Ensure a modern protoc is available (required for --experimental_allow_proto3_optional)
...@@ -308,6 +312,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -308,6 +312,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \ echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \
ldconfig ldconfig
ARG NIXL_LIBFABRIC_REF
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
export SCCACHE_S3_KEY_PREFIX="${SCCACHE_S3_KEY_PREFIX:-${ARCH}}" && \
if [ "$USE_SCCACHE" = "true" ]; then \
export CMAKE_C_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CXX_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CUDA_COMPILER_LAUNCHER="sccache"; \
fi && \
cd /usr/local/src && \
git clone https://github.com/ofiwg/libfabric.git && \
cd libfabric && \
git checkout $NIXL_LIBFABRIC_REF && \
./autogen.sh && \
./configure --prefix="/usr/local/libfabric" \
--disable-verbs \
--disable-psm3 \
--disable-opx \
--disable-usnic \
--disable-rstream \
--enable-efa \
--with-cuda=/usr/local/cuda \
--enable-cuda-dlopen \
--with-gdrcopy \
--enable-gdrcopy-dlopen && \
make -j$(nproc) && \
make install && \
/tmp/use-sccache.sh show-stats "LIBFABRIC" && \
echo "/usr/local/libfabric/lib" > /etc/ld.so.conf.d/libfabric.conf && \
ldconfig
# build and install nixl # build and install nixl
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \ --mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
...@@ -324,7 +359,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -324,7 +359,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \ meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \
-Dcudapath_lib="/usr/local/cuda/lib64" \ -Dcudapath_lib="/usr/local/cuda/lib64" \
-Dcudapath_inc="/usr/local/cuda/include" \ -Dcudapath_inc="/usr/local/cuda/include" \
-Ducx_path="/usr/local/ucx" && \ -Ducx_path="/usr/local/ucx" \
-Dlibfabric_path="/usr/local/libfabric" && \
cd build && \ cd build && \
ninja && \ ninja && \
ninja install && \ ninja install && \
......
container/Dockerfile.vllm
View file @ 00b38ded
...@@ -67,6 +67,7 @@ ARG SCCACHE_REGION="" ...@@ -67,6 +67,7 @@ ARG SCCACHE_REGION=""
ARG NIXL_UCX_REF ARG NIXL_UCX_REF
ARG NIXL_REF ARG NIXL_REF
ARG NIXL_GDRCOPY_REF ARG NIXL_GDRCOPY_REF
ARG NIXL_LIBFABRIC_REF
ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda" ARG RUNTIME_IMAGE="nvcr.io/nvidia/cuda"
ARG RUNTIME_IMAGE_TAG="12.9.0-runtime-ubuntu24.04" ARG RUNTIME_IMAGE_TAG="12.9.0-runtime-ubuntu24.04"
...@@ -182,7 +183,10 @@ RUN yum groupinstall -y 'Development Tools' && \ ...@@ -182,7 +183,10 @@ RUN yum groupinstall -y 'Development Tools' && \
libibumad \ libibumad \
libibumad-devel \ libibumad-devel \
librdmacm-devel \ librdmacm-devel \
numactl-devel numactl-devel \
# Libfabric support
hwloc \
hwloc-devel
# Ensure a modern protoc is available (required for --experimental_allow_proto3_optional) # Ensure a modern protoc is available (required for --experimental_allow_proto3_optional)
RUN set -eux; \ RUN set -eux; \
...@@ -310,6 +314,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -310,6 +314,37 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \ echo "/usr/local/ucx/lib/ucx" >> /etc/ld.so.conf.d/ucx.conf && \
ldconfig ldconfig
ARG NIXL_LIBFABRIC_REF
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
export SCCACHE_S3_KEY_PREFIX="${SCCACHE_S3_KEY_PREFIX:-${ARCH}}" && \
if [ "$USE_SCCACHE" = "true" ]; then \
export CMAKE_C_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CXX_COMPILER_LAUNCHER="sccache" && \
export CMAKE_CUDA_COMPILER_LAUNCHER="sccache"; \
fi && \
cd /usr/local/src && \
git clone https://github.com/ofiwg/libfabric.git && \
cd libfabric && \
git checkout $NIXL_LIBFABRIC_REF && \
./autogen.sh && \
./configure --prefix="/usr/local/libfabric" \
--disable-verbs \
--disable-psm3 \
--disable-opx \
--disable-usnic \
--disable-rstream \
--enable-efa \
--with-cuda=/usr/local/cuda \
--enable-cuda-dlopen \
--with-gdrcopy \
--enable-gdrcopy-dlopen && \
make -j$(nproc) && \
make install && \
/tmp/use-sccache.sh show-stats "LIBFABRIC" && \
echo "/usr/local/libfabric/lib" > /etc/ld.so.conf.d/libfabric.conf && \
ldconfig
# build and install nixl # build and install nixl
RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
--mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \ --mount=type=secret,id=aws-secret-id,env=AWS_SECRET_ACCESS_KEY \
...@@ -326,7 +361,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \ ...@@ -326,7 +361,8 @@ RUN --mount=type=secret,id=aws-key-id,env=AWS_ACCESS_KEY_ID \
meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \ meson setup build/ --prefix=/opt/nvidia/nvda_nixl --buildtype=release \
-Dcudapath_lib="/usr/local/cuda/lib64" \ -Dcudapath_lib="/usr/local/cuda/lib64" \
-Dcudapath_inc="/usr/local/cuda/include" \ -Dcudapath_inc="/usr/local/cuda/include" \
-Ducx_path="/usr/local/ucx" && \ -Ducx_path="/usr/local/ucx" \
-Dlibfabric_path="/usr/local/libfabric" && \
cd build && \ cd build && \
ninja && \ ninja && \
ninja install && \ ninja install && \
......
container/build.sh
View file @ 00b38ded
...@@ -121,8 +121,11 @@ SGLANG_FRAMEWORK_IMAGE_TAG="${SGLANG_CUDA_VERSION}-cudnn-devel-ubuntu24.04" ...@@ -121,8 +121,11 @@ SGLANG_FRAMEWORK_IMAGE_TAG="${SGLANG_CUDA_VERSION}-cudnn-devel-ubuntu24.04"
NIXL_REF=0.7.1 NIXL_REF=0.7.1
NIXL_UCX_REF=v1.19.0 NIXL_UCX_REF=v1.19.0
NIXL_UCX_EFA_REF=9d2b88a1f67faf9876f267658bd077b379b8bb76
NIXL_GDRCOPY_REF=v2.5.1 NIXL_GDRCOPY_REF=v2.5.1
NIXL_LIBFABRIC_REF=v2.3.0
# AWS EFA installer version
EFA_VERSION=1.45.1
NO_CACHE="" NO_CACHE=""
...@@ -300,7 +303,7 @@ get_options() { ...@@ -300,7 +303,7 @@ get_options() {
ENABLE_MEDIA_FFMPEG=true ENABLE_MEDIA_FFMPEG=true
;; ;;
--make-efa) --make-efa)
NIXL_UCX_REF=$NIXL_UCX_EFA_REF MAKE_EFA=true
;; ;;
--use-sccache) --use-sccache)
USE_SCCACHE=true USE_SCCACHE=true
...@@ -331,6 +334,14 @@ get_options() { ...@@ -331,6 +334,14 @@ get_options() {
missing_requirement "$1" missing_requirement "$1"
fi fi
;; ;;
--efa-version)
if [ "$2" ]; then
EFA_VERSION=$2
shift
else
missing_requirement "$1"
fi
;;
--no-tag-latest) --no-tag-latest)
NO_TAG_LATEST=true NO_TAG_LATEST=true
;; ;;
...@@ -349,8 +360,8 @@ get_options() { ...@@ -349,8 +360,8 @@ get_options() {
# Validate that --uid and --gid are only used with local-dev target # Validate that --uid and --gid are only used with local-dev target
if [[ -n "${CUSTOM_UID:-}" || -n "${CUSTOM_GID:-}" ]]; then if [[ -n "${CUSTOM_UID:-}" || -n "${CUSTOM_GID:-}" ]]; then
if [[ "${TARGET:-}" != "local-dev" ]]; then if [[ "${TARGET:-}" != "local-dev" && "${TARGET:-}" != "local-dev-aws" ]]; then
error "ERROR: --uid and --gid can only be used with --target local-dev" error "ERROR: --uid and --gid can only be used with --target local-dev or --target local-dev-aws"
fi fi
fi fi
...@@ -458,7 +469,7 @@ show_help() { ...@@ -458,7 +469,7 @@ show_help() {
echo " [--dry-run print docker commands without running]" echo " [--dry-run print docker commands without running]"
echo " [--build-context name=path to add build context]" echo " [--build-context name=path to add build context]"
echo " [--release-build perform a release build]" echo " [--release-build perform a release build]"
echo " [--make-efa Enables EFA support for NIXL]" echo " [--make-efa Adds AWS EFA layer on top of the built image (works with any target)]"
echo " [--enable-kvbm Enables KVBM support in Python 3.12]" echo " [--enable-kvbm Enables KVBM support in Python 3.12]"
echo " [--enable-media-nixl Enable media processing with NIXL support (default: true for frameworks, false for none)]" echo " [--enable-media-nixl Enable media processing with NIXL support (default: true for frameworks, false for none)]"
echo " [--enable-media-ffmpeg Enable media processing with FFMPEG support (default: true for frameworks, false for none)]" echo " [--enable-media-ffmpeg Enable media processing with FFMPEG support (default: true for frameworks, false for none)]"
...@@ -466,6 +477,7 @@ show_help() { ...@@ -466,6 +477,7 @@ show_help() {
echo " [--sccache-bucket S3 bucket name for sccache (required with --use-sccache)]" echo " [--sccache-bucket S3 bucket name for sccache (required with --use-sccache)]"
echo " [--sccache-region S3 region for sccache (required with --use-sccache)]" echo " [--sccache-region S3 region for sccache (required with --use-sccache)]"
echo " [--vllm-max-jobs number of parallel jobs for compilation (only used by vLLM framework)]" echo " [--vllm-max-jobs number of parallel jobs for compilation (only used by vLLM framework)]"
echo " [--efa-version AWS EFA installer version (default: 1.45.1)]"
echo " [--no-tag-latest do not add latest-{framework} tag to built image]" echo " [--no-tag-latest do not add latest-{framework} tag to built image]"
echo "" echo ""
echo " Note: When using --use-sccache, AWS credentials must be set:" echo " Note: When using --use-sccache, AWS credentials must be set:"
...@@ -535,6 +547,10 @@ fi ...@@ -535,6 +547,10 @@ fi
# Add NIXL_REF as a build argument # Add NIXL_REF as a build argument
BUILD_ARGS+=" --build-arg NIXL_REF=${NIXL_REF} " BUILD_ARGS+=" --build-arg NIXL_REF=${NIXL_REF} "
# Add NIXL_LIBFABRIC_REF as a build argument
BUILD_ARGS+=" --build-arg NIXL_LIBFABRIC_REF=${NIXL_LIBFABRIC_REF} "
# Add EFA_VERSION as a build argument
BUILD_ARGS+=" --build-arg EFA_VERSION=${EFA_VERSION} "
# Function to build local-dev image # Function to build local-dev image
build_local_dev_with_header() { build_local_dev_with_header() {
...@@ -595,6 +611,46 @@ build_local_dev_with_header() { ...@@ -595,6 +611,46 @@ build_local_dev_with_header() {
echo " $run_path --image $last_tag --mount-workspace ..." echo " $run_path --image $last_tag --mount-workspace ..."
} }
# Function to build AWS EFA images from base runtime or dev images
build_aws_with_header() {
local base_image="$1"
local tags="$2"
local aws_target="$3" # runtime-aws or dev-aws
local success_msg="$4"
DOCKERFILE_AWS="${SOURCE_DIR}/Dockerfile.aws"
if [[ ! -f "$DOCKERFILE_AWS" ]]; then
echo "ERROR: Dockerfile.aws not found at: $DOCKERFILE_AWS"
exit 1
fi
echo ""
echo "Building AWS EFA image from base: $base_image"
echo "Target stage: $aws_target"
# Show the docker command being executed if not in dry-run mode
if [ -z "$RUN_PREFIX" ]; then
set -x
fi
$RUN_PREFIX docker build --progress=plain \
--build-arg BASE_IMAGE="$base_image" \
--build-arg EFA_VERSION="${EFA_VERSION}" \
--target "$aws_target" \
--file "$DOCKERFILE_AWS" \
$PLATFORM \
$tags \
"$SOURCE_DIR" || {
{ set +x; } 2>/dev/null
echo "ERROR: Failed to build AWS EFA image"
exit 1
}
{ set +x; } 2>/dev/null
echo "$success_msg"
}
# Handle local-dev target # Handle local-dev target
if [[ $TARGET == "local-dev" ]]; then if [[ $TARGET == "local-dev" ]]; then
...@@ -891,32 +947,74 @@ if [ ${BUILD_EXIT_CODE} -ne 0 ]; then ...@@ -891,32 +947,74 @@ if [ ${BUILD_EXIT_CODE} -ne 0 ]; then
exit ${BUILD_EXIT_CODE} exit ${BUILD_EXIT_CODE}
fi fi
# Handle local-dev target # Handle --make-efa flag: add AWS EFA layer on top of the built image
if [[ "${LOCAL_DEV_BUILD:-}" == "true" ]]; then # This runs BEFORE local-dev so the flow is: dev -> dev-aws -> local-dev-aws
# Use the first tag name (TAG) if available, otherwise use latest if [[ "${MAKE_EFA:-}" == "true" ]]; then
if [[ -n "$TAG" ]]; then # Get the base image that was just built (dev or runtime)
DEV_IMAGE=$(echo "$TAG" | sed 's/--tag //' | sed 's/-local-dev$//') BASE_IMAGE_FOR_EFA=$(echo "$TAG" | sed 's/--tag //')
# Determine the EFA stage based on the target
# runtime target -> runtime-aws stage
# dev/local-dev target -> dev-aws stage
if [[ "${TARGET:-dev}" == "runtime" ]]; then
EFA_STAGE="runtime-aws"
else else
DEV_IMAGE="dynamo:latest-${FRAMEWORK,,}" EFA_STAGE="dev-aws"
fi fi
# Build local-dev tags from existing tags # Build AWS tags by appending -aws to existing tags
LOCAL_DEV_TAGS="" AWS_TAGS=""
if [[ -n "$TAG" ]]; then if [[ -n "$TAG" ]]; then
# Extract tag name, remove any existing -local-dev suffix, then add -local-dev AWS_TAG=$(echo "$TAG" | sed 's/--tag //')
TAG_NAME=$(echo "$TAG" | sed 's/--tag //' | sed 's/-local-dev$//') AWS_TAGS+=" --tag ${AWS_TAG}-aws"
LOCAL_DEV_TAGS+=" --tag ${TAG_NAME}-local-dev"
fi fi
if [[ -n "$LATEST_TAG" ]]; then if [[ -n "$LATEST_TAG" ]]; then
# Extract tag name, remove any existing -local-dev suffix, then add -local-dev AWS_LATEST_TAG=$(echo "$LATEST_TAG" | sed 's/--tag //')
LATEST_TAG_NAME=$(echo "$LATEST_TAG" | sed 's/--tag //' | sed 's/-local-dev$//') AWS_TAGS+=" --tag ${AWS_LATEST_TAG}-aws"
LOCAL_DEV_TAGS+=" --tag ${LATEST_TAG_NAME}-local-dev"
fi fi
# Extract first tag for success message build_aws_with_header "$BASE_IMAGE_FOR_EFA" "$AWS_TAGS" "$EFA_STAGE" "Successfully built ${EFA_STAGE} image"
FIRST_TAG=$(echo "$LOCAL_DEV_TAGS" | grep -o -- '--tag [^ ]*' | head -1 | cut -d' ' -f2) fi
build_local_dev_with_header "$DEV_IMAGE" "$LOCAL_DEV_TAGS" "Successfully built $FIRST_TAG" "Building Local-Dev Image"
# Handle local-dev build
if [[ "${LOCAL_DEV_BUILD:-}" == "true" ]]; then
if [[ "${MAKE_EFA:-}" == "true" ]]; then
# With EFA: build local-dev-aws from dev-aws
DEV_AWS_IMAGE=$(echo "$AWS_TAGS" | grep -o -- '--tag [^ ]*' | head -1 | cut -d' ' -f2)
LOCAL_DEV_AWS_TAGS=""
if [[ -n "$TAG" ]]; then
TAG_NAME=$(echo "$TAG" | sed 's/--tag //')
LOCAL_DEV_AWS_TAGS+=" --tag ${TAG_NAME}-local-dev-aws"
fi
if [[ -n "$LATEST_TAG" ]]; then
LATEST_TAG_NAME=$(echo "$LATEST_TAG" | sed 's/--tag //')
LOCAL_DEV_AWS_TAGS+=" --tag ${LATEST_TAG_NAME}-local-dev-aws"
fi
build_local_dev_with_header "$DEV_AWS_IMAGE" "$LOCAL_DEV_AWS_TAGS" "Successfully built local-dev-aws image" "Building Local-Dev-AWS Image"
else
# Without EFA: build regular local-dev from dev
if [[ -n "$TAG" ]]; then
DEV_IMAGE=$(echo "$TAG" | sed 's/--tag //')
else
DEV_IMAGE="dynamo:latest-${FRAMEWORK,,}"
fi
LOCAL_DEV_TAGS=""
if [[ -n "$TAG" ]]; then
TAG_NAME=$(echo "$TAG" | sed 's/--tag //')
LOCAL_DEV_TAGS+=" --tag ${TAG_NAME}-local-dev"
fi
if [[ -n "$LATEST_TAG" ]]; then
LATEST_TAG_NAME=$(echo "$LATEST_TAG" | sed 's/--tag //')
LOCAL_DEV_TAGS+=" --tag ${LATEST_TAG_NAME}-local-dev"
fi
# Extract first tag for success message
FIRST_TAG=$(echo "$LOCAL_DEV_TAGS" | grep -o -- '--tag [^ ]*' | head -1 | cut -d' ' -f2)
build_local_dev_with_header "$DEV_IMAGE" "$LOCAL_DEV_TAGS" "Successfully built $FIRST_TAG" "Building Local-Dev Image"
fi
fi fi
......
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