Skip to content

CollectiveX: keep PCI discovery in the bundled hwloc for aws-ofi-nccl / CollectiveX：在 aws-ofi-nccl 自带的 hwloc 中保留 PCI 发现 #4612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Oseltamivir merged 2 commits into from
Oct 28, 2026
Merged

CollectiveX: keep PCI discovery in the bundled hwloc for aws-ofi-nccl / CollectiveX：在 aws-ofi-nccl 自带的 hwloc 中保留 PCI 发现 #4612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92f1dbc
CollectiveX: keep hwloc's PCI discovery in the bundled aws-ofi-nccl b…
Oseltamivir Oct 28, 2026
157db21
CollectiveX: carry libpciaccess inside the bundled static hwloc
Oseltamivir Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions collectivex/runtime/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ COLLX_OFI_NCCL_SHA256="2533d1ec179a86dcf0470fc39800b06cd9169cd854c0c913cc4782a42
# has no runtime hwloc dependency. 2.10.0 is the h100-dgxc hosts' distro version.
COLLX_HWLOC_VERSION="2.10.0"
COLLX_HWLOC_SHA256="c7fd8a1404a9719c76aadc642864b9f77aed1dc1fc8882d6af861a9260ba240d"
COLLX_PCIACCESS_VERSION="0.16"
COLLX_PCIACCESS_SHA256="84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27"

collx_log_tail() {
local log_path="$1"
Expand Down
41 changes: 35 additions & 6 deletions collectivex/runtime/prepare_backend.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,21 +605,47 @@ ofi_nccl_ready() { [ -f "$1/.ready" ] && [ -r "$1/lib/libnccl-net-ofi.so" ]; }

# Static hwloc for images without its headers (see COLLX_HWLOC_VERSION).
ofi_nccl_build_hwloc() {
local root="$1" version="$COLLX_HWLOC_VERSION" tarball
local root="$1" version="$COLLX_HWLOC_VERSION" tarball pciaccess
pciaccess="libpciaccess-$COLLX_PCIACCESS_VERSION"
curl -sSfL --connect-timeout 30 --max-time 300 --retry 3 -o "$root/$pciaccess.tar.gz" \
"https://www.x.org/releases/individual/lib/$pciaccess.tar.gz" \
&& printf '%s %s\n' "$COLLX_PCIACCESS_SHA256" "$root/$pciaccess.tar.gz" | sha256sum -c --quiet \
&& tar -xzf "$root/$pciaccess.tar.gz" -C "$root" \
|| { collx_log "ERROR: libpciaccess source fetch failed"; return 1; }
(
cd "$root/$pciaccess" \
&& ./configure -q --prefix="$root/pciaccess" --enable-static --disable-shared --with-pic \
&& make -s -j"$(nproc)" && make -s install
) >&2 2>&1 || { collx_log "ERROR: libpciaccess build failed"; return 1; }
rm -rf "${root:?}/$pciaccess" "${root:?}/$pciaccess.tar.gz"
tarball="hwloc-$version.tar.gz"
curl -sSfL --connect-timeout 30 --max-time 300 --retry 3 -o "$root/$tarball" \
"https://download.open-mpi.org/release/hwloc/v${version%.*}/$tarball" \
&& printf '%s %s\n' "$COLLX_HWLOC_SHA256" "$root/$tarball" | sha256sum -c --quiet \
&& tar -xzf "$root/$tarball" -C "$root" \
|| { collx_log "ERROR: hwloc source fetch failed"; return 1; }
# The plugin groups each GPU with its nearest EFA NICs from hwloc's PCI tree, so I/O discovery
# must stay on (without it every group is empty and the RDMA protocol, the only one GIN supports,
# fails to start). hwloc reads the PCI tree through libpciaccess, built static alongside it; the
# GPU-vendor components would only link vendor libraries into the static archive.
collx_log "aws-ofi-nccl: building hwloc $version (the image has no hwloc headers)"
(
cd "$root/hwloc-$version" \
&& ./configure -q --prefix="$root/hwloc" --enable-static --disable-shared --with-pic \
--disable-libxml2 --disable-cairo --disable-io --disable-plugins \
&& HWLOC_PCIACCESS_CFLAGS="-I$root/pciaccess/include" \
HWLOC_PCIACCESS_LIBS="$root/pciaccess/lib/libpciaccess.a" \
./configure -q --prefix="$root/hwloc" --enable-static --disable-shared --with-pic \
--disable-libxml2 --disable-cairo --disable-plugins --disable-libudev \
--disable-cuda --disable-nvml --disable-opencl --disable-rsmi --disable-levelzero \
&& make -s -j"$(nproc)" && make -s install
) >&2 2>&1 || { collx_log "ERROR: hwloc build failed"; return 1; }
rm -rf "${root:?}/hwloc-$version" "${root:?}/$tarball"
# libtool cannot pass a bare static archive through to a shared plugin, so libpciaccess's objects
# join libhwloc.a and -lhwloc carries both; without hwloc's .la, libtool takes the archive as is.
(
mkdir "$root/pciaccess/objects" && cd "$root/pciaccess/objects" \
&& ar x ../lib/libpciaccess.a && ar rs "$root/hwloc/lib/libhwloc.a" ./*.o
) >&2 2>&1 || { collx_log "ERROR: hwloc archive merge failed"; return 1; }
rm -f "$root/hwloc/lib/libhwloc.la"
rm -rf "${root:?}/hwloc-$version" "${root:?}/$tarball" "${root:?}/pciaccess/objects"
}

ofi_nccl_install() {
Expand Down Expand Up @@ -660,8 +686,11 @@ ofi_nccl_prepare() {
collx_log "aws-ofi-nccl: using the host plugin"
return 0
fi
root="$(backend_cache_root ofi-nccl efa "$COLLX_OFI_NCCL_VERSION")" \
|| root="/tmp/collectivex-ofi-nccl-$COLLX_OFI_NCCL_VERSION"
# A plugin built on the bundled hwloc keys its own cache, so a change to that build replaces it.
local variant="$COLLX_OFI_NCCL_VERSION"
[ -r /usr/include/hwloc.h ] || variant+="-hwloc$COLLX_HWLOC_VERSION-pciaccess$COLLX_PCIACCESS_VERSION-merged"
root="$(backend_cache_root ofi-nccl efa "$variant")" \
|| root="/tmp/collectivex-ofi-nccl-$variant"
with_cache_lock "aws-ofi-nccl" "$root" ofi_nccl_ready ofi_nccl_install || return 1
export COLLX_OFI_NCCL_LIB_DIR="$root/lib"
collx_log "aws-ofi-nccl $COLLX_OFI_NCCL_VERSION ready"
Expand Down
Loading