Skip to content

Commit 9288158

Browse files
committed
Require UCX > 1.9
Don't just print a warning if the UCX version is too old, bail out and demand a newer version (at least 1.9, now more than 4 years old). Fixes #13017. Signed-off-by: George Bosilca <[email protected]>
1 parent fad3e92 commit 9288158

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

config/ompi_check_ucx.m4

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,18 @@ AC_DEFUN([OMPI_CHECK_UCX],[
6161

6262
AS_IF([test "$ompi_check_ucx_happy" = yes],
6363
[# Turn off UCX version v1.8 due to issue #8321
64-
AC_CACHE_CHECK([UCX version 1.8.x],
65-
[ompi_check_ucx_cv_have_version_1_8],
64+
AC_CACHE_CHECK([UCX version > 1.9.x],
65+
[ompi_check_ucx_cv_have_version_gt_1_9],
6666
[AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
6767
#include <ucp/api/ucp_version.h>
6868
]], [[
69-
#if (UCP_API_MAJOR == 1) && (UCP_API_MINOR == 8)
70-
#error "Invalid version"
71-
#endif
72-
]])],
73-
[ompi_check_ucx_cv_have_version_1_8=no],
74-
[ompi_check_ucx_cv_have_version_1_8=yes])])
75-
AS_IF([test "${ompi_check_ucx_cv_have_version_1_8}" = "yes"],
76-
[AC_MSG_WARN([UCX support skipped because version 1.8.x was found, which has a known catastrophic issue.])
77-
ompi_check_ucx_happy=no])])
78-
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
79-
#include <ucp/api/ucp_version.h>
80-
]], [[
8169
#if (UCP_API_MAJOR < 1) || ((UCP_API_MAJOR == 1) && (UCP_API_MINOR < 9))
8270
#error "Version too low"
8371
#endif
84-
]])],
85-
[], [AC_MSG_WARN([UCX version is too old, please upgrade to 1.9 or higher.])])
72+
]])],
73+
[ompi_check_ucx_cv_have_version_gt_1_9=yes],
74+
[ompi_check_ucx_cv_have_version_gt_1_9=no
75+
ompi_check_ucx_happy=no])])])
8676

8777
AS_IF([test "$ompi_check_ucx_happy" = yes],
8878
[AC_CHECK_DECLS([ucp_tag_send_nbr],

0 commit comments

Comments
 (0)