Merge pull request #13028 from bosilca/topic/require_at_least_ucx_1.9

Don't accept UCX < 1.9
open-mpi · Feb 3, 2025 · b072940 · b072940
2 parents fad3e92 + 9288158
commit b072940
Showing 1 changed file with 6 additions and 16 deletions.
diff --git 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 <ucp/api/ucp_version.h>
                                  ]], [[
-#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 <ucp/api/ucp_version.h>
-                             ]], [[
 #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],