From dc4f5607adcfdcf513725646bad3a70251663688 Mon Sep 17 00:00:00 2001 From: Andrey Maslennikov Date: Wed, 22 May 2019 11:59:27 +0000 Subject: [PATCH 1/2] SPEC: disable ibcm on fedora30+ (cherry picked from commit f09d6356650c9b36800deef6a73e042ddae8b9d9) --- ucx.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ucx.spec.in b/ucx.spec.in index 145d1d59c16..26b3b045b1d 100644 --- a/ucx.spec.in +++ b/ucx.spec.in @@ -3,7 +3,11 @@ %bcond_with cuda %bcond_with gdrcopy %bcond_without ib +%if 0%{?fedora} >= 30 +%bcond_with ib_cm +%else %bcond_without ib_cm +%endif %bcond_with knem %bcond_without rdmacm %bcond_with rocm From 2567455c687efaa2be6683681cc23dff738d83ef Mon Sep 17 00:00:00 2001 From: Andrey Maslennikov Date: Mon, 20 May 2019 12:58:26 +0000 Subject: [PATCH 2/2] CM/CONFIGURE: fail if no ibcm found and --with-cm set (cherry picked from commit 1bb31d473f31907d21d22c2a278911e7bbeba08e) --- src/uct/ib/cm/configure.m4 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/uct/ib/cm/configure.m4 b/src/uct/ib/cm/configure.m4 index f40f8c29a63..e85d404d998 100644 --- a/src/uct/ib/cm/configure.m4 +++ b/src/uct/ib/cm/configure.m4 @@ -9,18 +9,25 @@ # # CM (IB connection manager) Support # +cm_happy="no" + AC_ARG_WITH([cm], [AC_HELP_STRING([--with-cm], [Compile with IB Connection Manager support])], [], - [with_cm=yes]) + [with_cm=guess]) AS_IF([test "x$with_cm" != xno], [save_LIBS="$LIBS" AC_CHECK_LIB([ibcm], [ib_cm_send_req], [AC_SUBST(IBCM_LIBS, [-libcm]) - uct_ib_modules+=":cm"], - [with_cm=no]) + uct_ib_modules+=":cm" + cm_happy="yes"], + [AS_IF([test "x$with_cm" = xyes], + [AC_MSG_ERROR([CM requested but lib ibcm not found])], + [AC_MSG_WARN([CM support not found, skipping])] + ) + ]) LIBS="$save_LIBS"]) -AM_CONDITIONAL([HAVE_TL_CM], [test "x$with_cm" != xno]) +AM_CONDITIONAL([HAVE_TL_CM], [test "x$cm_happy" != xno]) AC_CONFIG_FILES([src/uct/ib/cm/Makefile])