Skip to content

Commit a630f5c

Browse files
UCT/GDA: Add --without-gda (#11394)
1 parent b4d8e71 commit a630f5c

4 files changed

Lines changed: 28 additions & 4 deletions

File tree

buildlib/tools/builds.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,20 @@ build_fuse() {
425425
fi
426426
}
427427

428+
#
429+
# Build without GDA-KI
430+
#
431+
build_no_gda() {
432+
echo "==== Build without GDA-KI ===="
433+
${WORKSPACE}/contrib/configure-release --prefix=$ucx_inst --without-gda
434+
$MAKEP
435+
436+
if [ -f ${ucx_build_dir}/src/uct/ib/mlx5/gdaki/.libs/libuct_ib_mlx5_gda.so ] ; then
437+
azure_log_error "build --without-gda created GDA-KI SO"
438+
exit 1
439+
fi
440+
}
441+
428442
az_init_modules
429443
prepare_build
430444

@@ -437,7 +451,8 @@ tests=('build_docs' \
437451
'build_no_verbs' \
438452
'build_release_pkg' \
439453
'build_cmake_examples' \
440-
'build_fuse')
454+
'build_fuse' \
455+
'build_no_gda')
441456
if [ "${long_test}" = "yes" ]
442457
then
443458
tests+=('check_config_h' \

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ AS_IF([test "x$with_docs_only" = xyes],
230230
AM_CONDITIONAL([HAVE_LCOV], [false])
231231
AM_CONDITIONAL([HAVE_ZE], [false])
232232
AM_CONDITIONAL([HAVE_GAUDI], [false])
233+
AM_CONDITIONAL([HAVE_GDA], [false])
233234
],
234235
[
235236
AM_CONDITIONAL([DOCS_ONLY], [false])

src/uct/ib/mlx5/gdaki/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# See file LICENSE for terms.
44
#
55

6-
if HAVE_CUDA
6+
if HAVE_GDA
77

88
module_LTLIBRARIES = libuct_ib_mlx5_gda.la
99
libuct_ib_mlx5_gda_la_CPPFLAGS = $(BASE_CPPFLAGS) $(IBVERBS_CPPFLAGS) \

src/uct/ib/mlx5/gdaki/configure.m4

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@
55

66
UCX_CHECK_CUDA
77

8-
AS_IF([test "x$cuda_happy" = "xyes"], [
9-
uct_ib_mlx5_modules="${uct_ib_mlx5_modules}:gda"])
8+
AC_ARG_WITH([gda],
9+
[AS_HELP_STRING([--without-gda], [Disable GDA-KI])],
10+
[], [with_gda=yes])
1011

12+
AS_IF([test "x$with_gda" = "xyes"] && [test "x$cuda_happy" = "xyes"],
13+
[gda_happy=yes], [gda_happy=no])
14+
15+
AS_IF([test "x$gda_happy" = "xyes"],
16+
[uct_ib_mlx5_modules="${uct_ib_mlx5_modules}:gda"])
17+
18+
AM_CONDITIONAL([HAVE_GDA], [test "x$gda_happy" != "xno"])
1119
AC_CONFIG_FILES([src/uct/ib/mlx5/gdaki/Makefile
1220
src/uct/ib/mlx5/gdaki/ucx-ib-mlx5-gda.pc])

0 commit comments

Comments
 (0)