Skip to content

Commit

Permalink
UCT/IB/RDMACM: Disable rdmacm support when verbs is disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
tvegas1 committed Jan 29, 2025
1 parent c4c4254 commit b934e4f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
25 changes: 25 additions & 0 deletions contrib/test_jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,28 @@ set_ucx_common_test_env() {
export ASAN_OPTIONS=protect_shadow_gap=0
}

run_configure_tests() {
echo "==== Run configure tests ===="

rm -f config.log || :
../contrib/configure-release --with-verbs
grep 'build_modules=' config.log
if ! grep -qwE '^build_modules=.*:ib.*:rdmacm.*:mlx5' config.log
then
azure_log_error "missing modules configuring with verbs"
exit 1
fi

rm -f config.log
../contrib/configure-release --without-verbs
grep 'build_modules=' config.log
if grep -wE '^build_modules=.*:(ib|rdmacm|efa|mlx5)' config.log
then
azure_log_error "some modules were not disabled without verbs"
exit 1
fi
}

#
# Run all tests
#
Expand All @@ -1161,6 +1183,9 @@ run_tests() {
# build for devel tests and gtest
build devel --enable-gtest

# configuration related tests
run_configure_tests

# devel mode tests
do_distributed_task 0 4 test_unused_env_var
do_distributed_task 1 4 run_ucx_info
Expand Down
2 changes: 2 additions & 0 deletions src/uct/ib/rdmacm/configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ AC_ARG_WITH([rdmacm],
[AS_HELP_STRING([--with-rdmacm=(DIR)], [Enable the use of RDMACM (default is guess).])],
[], [with_rdmacm=guess])

AS_IF([test "x$with_ib" = xno], [with_rdmacm=no])

AS_IF([test "x$with_rdmacm" != xno],
[AS_IF([test "x$with_rdmacm" = xguess -o "x$with_rdmacm" = xyes -o "x$with_rdmacm" = x],
[ucx_check_rdmacm_dir=/usr],
Expand Down

0 comments on commit b934e4f

Please sign in to comment.