Skip to content

Commit 0cbbe6c

Browse files
authored
Merge pull request #9666 from devreal/uct-1.9.0min-5.0.x
UCT: require at least UCX 1.9.0 [v5.0.x]
2 parents 1189441 + 8bff2e8 commit 0cbbe6c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

opal/mca/btl/uct/configure.m4

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,23 @@ dnl
5151
AC_MSG_RESULT([no])
5252
fi
5353

54-
max_allowed_uct_major=1
55-
max_allowed_uct_minor=9
54+
min_allowed_uct_major=1
55+
min_allowed_uct_minor=9
5656
if test "$btl_uct_happy" = "yes" && test "$enable_uct_version_check" != "no"; then
5757
AC_MSG_CHECKING([UCT version compatibility])
5858
OPAL_VAR_SCOPE_PUSH([CPPFLAGS_save])
5959
CPPFLAGS_save="$CPPFLAGS"
6060
CPPFLAGS="$CPPFLAGS $btl_uct_CPPFLAGS"
6161
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#include <uct/api/version.h>
62-
#if (UCT_VERNO_MAJOR > $max_allowed_uct_major)
63-
#error "UCT MAJOR VERNO > $max_allowed_uct_major"
62+
#if (UCT_VERNO_MAJOR < $min_allowed_uct_major)
63+
#error "UCT MAJOR VERNO < $min_allowed_uct_major"
6464
#endif
65-
#if (UCT_VERNO_MINOR > $max_allowed_uct_minor)
66-
#error "UCT MINOR VERNO > $max_allowed_uct_minor"
65+
#if (UCT_VERNO_MAJOR == $min_allowed_uct_major) &&\
66+
(UCT_VERNO_MINOR < $min_allowed_uct_minor)
67+
#error "UCT MINOR VERNO < $min_allowed_uct_minor"
6768
#endif], [])],
6869
[AC_MSG_RESULT([UCT version compatible])],
69-
[AC_MSG_RESULT([UCT version not compatible - need UCX $max_allowed_uct_major.$max_allowed_uct_minor or older])
70+
[AC_MSG_RESULT([UCT version not compatible - need UCX $min_allowed_uct_major.$min_allowed_uct_minor or newer])
7071
btl_uct_happy="no"])
7172
CPPFLAGS="$CPPFLAGS_save"
7273
OPAL_VAR_SCOPE_POP

0 commit comments

Comments
 (0)