Skip to content
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.

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

TL/MLX5: ci #806

Merged
merged 18 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
3 changes: 2 additions & 1 deletion .ci/scripts/build_ucc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ cd "${UCC_SRC_DIR}"
mkdir -p "${UCC_SRC_DIR}/build"
cd "${UCC_SRC_DIR}/build"
"${UCC_SRC_DIR}/configure" --with-ucx="${UCX_INSTALL_DIR}" --with-cuda="${CUDA_HOME}" \
--prefix="${UCC_INSTALL_DIR}" --enable-gtest --with-mpi
--prefix="${UCC_INSTALL_DIR}" --enable-gtest --with-mpi \
--with-tls=cuda,nccl,self,ucp,mlx5,sharp,rccl
samnordmann marked this conversation as resolved.
Show resolved Hide resolved
make -j install
echo "${UCC_INSTALL_DIR}/lib" > /etc/ld.so.conf.d/ucc.conf
ldconfig
Expand Down
23 changes: 21 additions & 2 deletions .ci/scripts/run_tests_ucc_mpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,20 @@ export MASTER_ADDR=${HEAD_NODE}

NNODES=$(wc --lines "$HOSTFILE" | awk '{print $1}')
DEV=""
CX7_DEV=""

# Find first available active device
for d in $(ssh $HEAD_NODE "ibstat -l"); do
state=$(ssh $HEAD_NODE "ibstat $d" | grep 'State:' | awk '{print $2}')
type=$(ssh $HEAD_NODE "ibstat $d" | grep 'CA type:' | awk '{print $3}')
if [ $state == 'Active' ]; then
DEV=$d
break
if [ "x$DEV" == "x" ]; then
samnordmann marked this conversation as resolved.
Show resolved Hide resolved
DEV=$d
fi
if [ $type == 'MT4129' ]; then
samnordmann marked this conversation as resolved.
Show resolved Hide resolved
CX7_DEV=$d
break
fi
fi
done

Expand Down Expand Up @@ -101,6 +108,18 @@ for MT in "" "-T"; do
mpirun $(mpi_params $PPN 1) $ucx_tls_no_cuda_ipc $tlcuda_args $EXE $MT $TG --mtypes cuda -c $tlcuda_colls
echo "INFO: UCC MPI unit tests (TL/CUDA) ... DONE"

echo "INFO: UCC MPI unit tests (TL/MLX5) ..."
# shellcheck disable=SC2086
if [ "x$CX7_DEV" == "x" ]; then
echo "No active CX7 devices found on $HEAD_NODE"
samnordmann marked this conversation as resolved.
Show resolved Hide resolved
elif [ $NNODES -lt 2 ]; then
echo "At least two nodes are required, but only $NNODES are available"
else
tlmlx5_args=" -x UCC_CLS=basic -x UCC_CL_BASIC_TLS=ucp,mlx5 -x UCC_TL_MLXS_NET_DEVICES=$CX7_DEV:1 -x UCC_TL_MLX5_TUNE=inf -x UCX_RC_MLX5_DM_COUNT=0 -x UCX_DC_MLX5_DM_COUNT=0 "
Sergei-Lebedev marked this conversation as resolved.
Show resolved Hide resolved
tlmlx5_colls="alltoall"
mpirun $(mpi_params $PPN) $tlmlx5_args $EXE $MT $TG --mtypes host,cuda -c $tlmlx5_colls -t world -d uint8 -O 0 -m 1:128
Sergei-Lebedev marked this conversation as resolved.
Show resolved Hide resolved
fi
echo "INFO: UCC MPI unit tests (TL/MLX5) ... DONE"

echo "INFO: UCC MPI unit tests (CL/HIER) ..."
# shellcheck disable=SC2086
Expand Down
2 changes: 1 addition & 1 deletion src/components/tl/mlx5/tl_mlx5_team.c
samnordmann marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ ucc_status_t ucc_tl_mlx5_team_get_scores(ucc_base_team_t * tl_team,
team_info.num_mem_types = 2;
team_info.supported_mem_types = mt;
team_info.supported_colls =
(UCC_COLL_TYPE_ALLTOALL * (team->a2a_status.local == UCC_OK)) |
(UCC_COLL_TYPE_ALLTOALL * 0) |
UCC_COLL_TYPE_BCAST;
team_info.size = UCC_TL_TEAM_SIZE(team);

Expand Down
Loading