From 986e1ece7370bed8aebfc01045a5512959c70b96 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Thu, 9 Jan 2025 01:29:48 -0800 Subject: [PATCH] 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 (cherry picked from commit 92881582024f071aa95f275a421e33a2ada2d55f) --- config/ompi_check_ucx.m4 | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/config/ompi_check_ucx.m4 b/config/ompi_check_ucx.m4 index 4c2cd35a412..1da2455f1b7 100644 --- a/config/ompi_check_ucx.m4 +++ b/config/ompi_check_ucx.m4 @@ -61,28 +61,18 @@ AC_DEFUN([OMPI_CHECK_UCX],[ AS_IF([test "$ompi_check_ucx_happy" = yes], [# Turn off UCX version v1.8 due to issue #8321 - AC_CACHE_CHECK([UCX version 1.8.x], - [ompi_check_ucx_cv_have_version_1_8], + AC_CACHE_CHECK([UCX version > 1.9.x], + [ompi_check_ucx_cv_have_version_gt_1_9], [AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ #include ]], [[ -#if (UCP_API_MAJOR == 1) && (UCP_API_MINOR == 8) -#error "Invalid version" -#endif - ]])], - [ompi_check_ucx_cv_have_version_1_8=no], - [ompi_check_ucx_cv_have_version_1_8=yes])]) - AS_IF([test "${ompi_check_ucx_cv_have_version_1_8}" = "yes"], - [AC_MSG_WARN([UCX support skipped because version 1.8.x was found, which has a known catastrophic issue.]) - ompi_check_ucx_happy=no])]) - AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ -#include - ]], [[ #if (UCP_API_MAJOR < 1) || ((UCP_API_MAJOR == 1) && (UCP_API_MINOR < 9)) #error "Version too low" #endif - ]])], - [], [AC_MSG_WARN([UCX version is too old, please upgrade to 1.9 or higher.])]) + ]])], + [ompi_check_ucx_cv_have_version_gt_1_9=yes], + [ompi_check_ucx_cv_have_version_gt_1_9=no + ompi_check_ucx_happy=no])])]) AS_IF([test "$ompi_check_ucx_happy" = yes], [AC_CHECK_DECLS([ucp_tag_send_nbr],