Blame 0001-Revert-ucx-check-supported-transports-and-devices-fo.patch

Honggang Li 5dda5c
From 63c80c7692e55f634cbca6f67cc5c9cdef3a04d2 Mon Sep 17 00:00:00 2001
Honggang Li 5dda5c
From: Honggang Li <honli@redhat.com>
Honggang Li 5dda5c
Date: Mon, 28 Jun 2021 21:38:13 +0800
Honggang Li 5dda5c
Subject: [PATCH] Revert "ucx: check supported transports and devices for
Honggang Li 5dda5c
 setting priority"
Honggang Li 5dda5c
Honggang Li 5dda5c
This reverts commit c36d7459b6331c4da825cad5a64326e7c1a272aa.
Honggang Li 5dda5c
---
Honggang Li 5dda5c
 contrib/platform/mellanox/optimized.conf |   2 -
Honggang Li 5dda5c
 ompi/mca/pml/ucx/pml_ucx_component.c     |  15 +-
Honggang Li 5dda5c
 opal/mca/common/ucx/common_ucx.c         | 202 +----------------------
Honggang Li 5dda5c
 opal/mca/common/ucx/common_ucx.h         |  15 --
Honggang Li 5dda5c
 opal/mca/common/ucx/configure.m4         |   2 -
Honggang Li 5dda5c
 5 files changed, 2 insertions(+), 234 deletions(-)
Honggang Li 5dda5c
Honggang Li 5dda5c
diff --git a/contrib/platform/mellanox/optimized.conf b/contrib/platform/mellanox/optimized.conf
Honggang Li 5dda5c
index 543fd8d1e224..b86b37c9e2fa 100644
Honggang Li 5dda5c
--- a/contrib/platform/mellanox/optimized.conf
Honggang Li 5dda5c
+++ b/contrib/platform/mellanox/optimized.conf
Honggang Li 5dda5c
@@ -61,8 +61,6 @@
Honggang Li 5dda5c
 coll = ^ml
Honggang Li 5dda5c
 hwloc_base_binding_policy = core
Honggang Li 5dda5c
 btl = self
Honggang Li 5dda5c
-pml_ucx_tls = any
Honggang Li 5dda5c
-pml_ucx_devices = any
Honggang Li 5dda5c
 # Basic behavior to smooth startup
Honggang Li 5dda5c
 mca_base_component_show_load_errors = 0
Honggang Li 5dda5c
 orte_abort_timeout = 10
Honggang Li 5dda5c
diff --git a/ompi/mca/pml/ucx/pml_ucx_component.c b/ompi/mca/pml/ucx/pml_ucx_component.c
Honggang Li 5dda5c
index 6aed6c41d11d..ed9cc6573e8e 100644
Honggang Li 5dda5c
--- a/ompi/mca/pml/ucx/pml_ucx_component.c
Honggang Li 5dda5c
+++ b/ompi/mca/pml/ucx/pml_ucx_component.c
Honggang Li 5dda5c
@@ -107,26 +107,13 @@ static mca_pml_base_module_t*
Honggang Li 5dda5c
 mca_pml_ucx_component_init(int* priority, bool enable_progress_threads,
Honggang Li 5dda5c
                            bool enable_mpi_threads)
Honggang Li 5dda5c
 {
Honggang Li 5dda5c
-    opal_common_ucx_support_level_t support_level;
Honggang Li 5dda5c
     int ret;
Honggang Li 5dda5c
 
Honggang Li 5dda5c
-    support_level = opal_common_ucx_support_level(ompi_pml_ucx.ucp_context);
Honggang Li 5dda5c
-    if (support_level == OPAL_COMMON_UCX_SUPPORT_NONE) {
Honggang Li 5dda5c
-        return NULL;
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
     if ( (ret = mca_pml_ucx_init(enable_mpi_threads)) != 0) {
Honggang Li 5dda5c
         return NULL;
Honggang Li 5dda5c
     }
Honggang Li 5dda5c
 
Honggang Li 5dda5c
-    /*
Honggang Li 5dda5c
-     * If found supported devices - set to the configured (high) priority.
Honggang Li 5dda5c
-     * Otherwise - Found only supported transports (which could be exposed by
Honggang Li 5dda5c
-     *             unsupported devices), so set a priority lower than ob1.
Honggang Li 5dda5c
-     */
Honggang Li 5dda5c
-    *priority = (support_level == OPAL_COMMON_UCX_SUPPORT_DEVICE) ?
Honggang Li 5dda5c
-                ompi_pml_ucx.priority : 19;
Honggang Li 5dda5c
-    PML_UCX_VERBOSE(2, "returning priority %d", *priority);
Honggang Li 5dda5c
+    *priority = ompi_pml_ucx.priority;
Honggang Li 5dda5c
     return &ompi_pml_ucx.super;
Honggang Li 5dda5c
 }
Honggang Li 5dda5c
 
Honggang Li 5dda5c
diff --git a/opal/mca/common/ucx/common_ucx.c b/opal/mca/common/ucx/common_ucx.c
Honggang Li 5dda5c
index ac7a17d799a5..ae8e66877ab6 100644
Honggang Li 5dda5c
--- a/opal/mca/common/ucx/common_ucx.c
Honggang Li 5dda5c
+++ b/opal/mca/common/ucx/common_ucx.c
Honggang Li 5dda5c
@@ -14,11 +14,8 @@
Honggang Li 5dda5c
 #include "opal/mca/base/mca_base_framework.h"
Honggang Li 5dda5c
 #include "opal/mca/pmix/pmix.h"
Honggang Li 5dda5c
 #include "opal/memoryhooks/memory.h"
Honggang Li 5dda5c
-#include "opal/util/argv.h"
Honggang Li 5dda5c
 
Honggang Li 5dda5c
 #include <ucm/api/ucm.h>
Honggang Li 5dda5c
-#include <fnmatch.h>
Honggang Li 5dda5c
-#include <stdio.h>
Honggang Li 5dda5c
 
Honggang Li 5dda5c
 /***********************************************************************/
Honggang Li 5dda5c
 
Honggang Li 5dda5c
@@ -28,8 +25,7 @@ opal_common_ucx_module_t opal_common_ucx = {
Honggang Li 5dda5c
     .verbose             = 0,
Honggang Li 5dda5c
     .progress_iterations = 100,
Honggang Li 5dda5c
     .registered          = 0,
Honggang Li 5dda5c
-    .opal_mem_hooks      = 0,
Honggang Li 5dda5c
-    .tls                 = NULL
Honggang Li 5dda5c
+    .opal_mem_hooks      = 0
Honggang Li 5dda5c
 };
Honggang Li 5dda5c
 
Honggang Li 5dda5c
 static void opal_common_ucx_mem_release_cb(void *buf, size_t length,
Honggang Li 5dda5c
@@ -40,15 +36,10 @@ static void opal_common_ucx_mem_release_cb(void *buf, size_t length,
Honggang Li 5dda5c
 
Honggang Li 5dda5c
 OPAL_DECLSPEC void opal_common_ucx_mca_var_register(const mca_base_component_t *component)
Honggang Li 5dda5c
 {
Honggang Li 5dda5c
-    static const char *default_tls     = "rc_verbs,ud_verbs,rc_mlx5,dc_mlx5,cuda_ipc,rocm_ipc";
Honggang Li 5dda5c
-    static const char *default_devices = "mlx*";
Honggang Li 5dda5c
     static int registered = 0;
Honggang Li 5dda5c
     static int hook_index;
Honggang Li 5dda5c
     static int verbose_index;
Honggang Li 5dda5c
     static int progress_index;
Honggang Li 5dda5c
-    static int tls_index;
Honggang Li 5dda5c
-    static int devices_index;
Honggang Li 5dda5c
-
Honggang Li 5dda5c
     if (!registered) {
Honggang Li 5dda5c
         verbose_index = mca_base_var_register("opal", "opal_common", "ucx", "verbose",
Honggang Li 5dda5c
                                               "Verbose level of the UCX components",
Honggang Li 5dda5c
@@ -69,29 +60,6 @@ OPAL_DECLSPEC void opal_common_ucx_mca_var_register(const mca_base_component_t *
Honggang Li 5dda5c
                                            OPAL_INFO_LVL_3,
Honggang Li 5dda5c
                                            MCA_BASE_VAR_SCOPE_LOCAL,
Honggang Li 5dda5c
                                            &opal_common_ucx.opal_mem_hooks);
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-        opal_common_ucx.tls  = malloc(sizeof(*opal_common_ucx.tls));
Honggang Li 5dda5c
-        *opal_common_ucx.tls = strdup(default_tls);
Honggang Li 5dda5c
-        tls_index = mca_base_var_register("opal", "opal_common", "ucx", "tls",
Honggang Li 5dda5c
-                                          "List of UCX transports which should be supported on the system, to enable "
Honggang Li 5dda5c
-                                          "selecting the UCX component. Special values: any (any available). "
Honggang Li 5dda5c
-                                          "A '^' prefix negates the list. "
Honggang Li 5dda5c
-                                          "For example, in order to exclude on shared memory and TCP transports, "
Honggang Li 5dda5c
-                                          "please set to '^posix,sysv,self,tcp,cma,knem,xpmem'.",
Honggang Li 5dda5c
-                                          MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
Honggang Li 5dda5c
-                                          OPAL_INFO_LVL_3,
Honggang Li 5dda5c
-                                          MCA_BASE_VAR_SCOPE_LOCAL,
Honggang Li 5dda5c
-                                          opal_common_ucx.tls);
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-        opal_common_ucx.devices  = malloc(sizeof(*opal_common_ucx.devices));
Honggang Li 5dda5c
-        *opal_common_ucx.devices = strdup(default_devices);
Honggang Li 5dda5c
-        devices_index = mca_base_var_register("opal", "opal_common", "ucx", "devices",
Honggang Li 5dda5c
-                                              "List of device driver pattern names, which, if supported by UCX, will "
Honggang Li 5dda5c
-                                              "bump its priority above ob1. Special values: any (any available)",
Honggang Li 5dda5c
-                                              MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
Honggang Li 5dda5c
-                                              OPAL_INFO_LVL_3,
Honggang Li 5dda5c
-                                              MCA_BASE_VAR_SCOPE_LOCAL,
Honggang Li 5dda5c
-                                              opal_common_ucx.devices);
Honggang Li 5dda5c
         registered = 1;
Honggang Li 5dda5c
     }
Honggang Li 5dda5c
     if (component) {
Honggang Li 5dda5c
@@ -107,14 +75,6 @@ OPAL_DECLSPEC void opal_common_ucx_mca_var_register(const mca_base_component_t *
Honggang Li 5dda5c
                                       component->mca_type_name,
Honggang Li 5dda5c
                                       component->mca_component_name,
Honggang Li 5dda5c
                                       "opal_mem_hooks", 0);
Honggang Li 5dda5c
-        mca_base_var_register_synonym(tls_index, component->mca_project_name,
Honggang Li 5dda5c
-                                      component->mca_type_name,
Honggang Li 5dda5c
-                                      component->mca_component_name,
Honggang Li 5dda5c
-                                      "tls", 0);
Honggang Li 5dda5c
-        mca_base_var_register_synonym(devices_index, component->mca_project_name,
Honggang Li 5dda5c
-                                      component->mca_type_name,
Honggang Li 5dda5c
-                                      component->mca_component_name,
Honggang Li 5dda5c
-                                      "devices", 0);
Honggang Li 5dda5c
     }
Honggang Li 5dda5c
 }
Honggang Li 5dda5c
 
Honggang Li 5dda5c
@@ -163,166 +123,6 @@ OPAL_DECLSPEC void opal_common_ucx_mca_deregister(void)
Honggang Li 5dda5c
     opal_output_close(opal_common_ucx.output);
Honggang Li 5dda5c
 }
Honggang Li 5dda5c
 
Honggang Li 5dda5c
-#if HAVE_DECL_OPEN_MEMSTREAM
Honggang Li 5dda5c
-static bool opal_common_ucx_check_device(const char *device_name, char **device_list)
Honggang Li 5dda5c
-{
Honggang Li 5dda5c
-    char sysfs_driver_link[PATH_MAX];
Honggang Li 5dda5c
-    char driver_path[PATH_MAX];
Honggang Li 5dda5c
-    char *ib_device_name;
Honggang Li 5dda5c
-    char *driver_name;
Honggang Li 5dda5c
-    char **list_item;
Honggang Li 5dda5c
-    ssize_t ret;
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* mlx5_0:1 */
Honggang Li 5dda5c
-    ret = sscanf(device_name, "%m[^:]%*d", &ib_device_name);
Honggang Li 5dda5c
-    if (ret != 1) {
Honggang Li 5dda5c
-        return false;
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    sysfs_driver_link[sizeof(sysfs_driver_link) - 1] = '\0';
Honggang Li 5dda5c
-    snprintf(sysfs_driver_link, sizeof(sysfs_driver_link) - 1,
Honggang Li 5dda5c
-             "/sys/class/infiniband/%s/device/driver", ib_device_name);
Honggang Li 5dda5c
-    free(ib_device_name);
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    driver_path[sizeof(driver_path) - 1] = '\0';
Honggang Li 5dda5c
-    ret = readlink(sysfs_driver_link, driver_path, sizeof(driver_path) - 1);
Honggang Li 5dda5c
-    if (ret < 0) {
Honggang Li 5dda5c
-        MCA_COMMON_UCX_VERBOSE(2, "readlink(%s) failed: %s", sysfs_driver_link,
Honggang Li 5dda5c
-                               strerror(errno));
Honggang Li 5dda5c
-        return false;
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    driver_name = basename(driver_path);
Honggang Li 5dda5c
-    for (list_item = device_list; *list_item != NULL; ++list_item) {
Honggang Li 5dda5c
-        if (!fnmatch(*list_item, driver_name, 0)) {
Honggang Li 5dda5c
-            MCA_COMMON_UCX_VERBOSE(2, "driver '%s' matched by '%s'",
Honggang Li 5dda5c
-                                   driver_path, *list_item);
Honggang Li 5dda5c
-            return true;
Honggang Li 5dda5c
-        }
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    return false;
Honggang Li 5dda5c
-}
Honggang Li 5dda5c
-#endif
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-OPAL_DECLSPEC opal_common_ucx_support_level_t
Honggang Li 5dda5c
-opal_common_ucx_support_level(ucp_context_h context)
Honggang Li 5dda5c
-{
Honggang Li 5dda5c
-    opal_common_ucx_support_level_t support_level = OPAL_COMMON_UCX_SUPPORT_NONE;
Honggang Li 5dda5c
-    static const char *support_level_names[] = {
Honggang Li 5dda5c
-        [OPAL_COMMON_UCX_SUPPORT_NONE]      = "none",
Honggang Li 5dda5c
-        [OPAL_COMMON_UCX_SUPPORT_TRANSPORT] = "transports only",
Honggang Li 5dda5c
-        [OPAL_COMMON_UCX_SUPPORT_DEVICE]    = "transports and devices"
Honggang Li 5dda5c
-    };
Honggang Li 5dda5c
-#if HAVE_DECL_OPEN_MEMSTREAM
Honggang Li 5dda5c
-    char *rsc_tl_name, *rsc_device_name;
Honggang Li 5dda5c
-    char **tl_list, **device_list, **list_item;
Honggang Li 5dda5c
-    bool is_any_tl, is_any_device;
Honggang Li 5dda5c
-    bool found_tl, negate;
Honggang Li 5dda5c
-    char line[128];
Honggang Li 5dda5c
-    FILE *stream;
Honggang Li 5dda5c
-    char *buffer;
Honggang Li 5dda5c
-    size_t size;
Honggang Li 5dda5c
-    int ret;
Honggang Li 5dda5c
-#endif
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    is_any_tl     = !strcmp(*opal_common_ucx.tls, "any");
Honggang Li 5dda5c
-    is_any_device = !strcmp(*opal_common_ucx.devices, "any");
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* Check for special value "any" */
Honggang Li 5dda5c
-    if (is_any_tl && is_any_device) {
Honggang Li 5dda5c
-        MCA_COMMON_UCX_VERBOSE(1, "ucx is enabled on any transport or device",
Honggang Li 5dda5c
-                               *opal_common_ucx.tls);
Honggang Li 5dda5c
-        support_level = OPAL_COMMON_UCX_SUPPORT_DEVICE;
Honggang Li 5dda5c
-        goto out;
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-#if HAVE_DECL_OPEN_MEMSTREAM
Honggang Li 5dda5c
-    /* Split transports list */
Honggang Li 5dda5c
-    negate  = ('^' == (*opal_common_ucx.tls)[0]);
Honggang Li 5dda5c
-    tl_list = opal_argv_split(*opal_common_ucx.tls + (negate ? 1 : 0), ',');
Honggang Li 5dda5c
-    if (tl_list == NULL) {
Honggang Li 5dda5c
-        MCA_COMMON_UCX_VERBOSE(1, "failed to split tl list '%s', ucx is disabled",
Honggang Li 5dda5c
-                               *opal_common_ucx.tls);
Honggang Li 5dda5c
-        goto out;
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* Split devices list */
Honggang Li 5dda5c
-    device_list = opal_argv_split(*opal_common_ucx.devices, ',');
Honggang Li 5dda5c
-    if (device_list == NULL) {
Honggang Li 5dda5c
-        MCA_COMMON_UCX_VERBOSE(1, "failed to split devices list '%s', ucx is disabled",
Honggang Li 5dda5c
-                               *opal_common_ucx.devices);
Honggang Li 5dda5c
-        goto out_free_tl_list;
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* Open memory stream to dump UCX information to */
Honggang Li 5dda5c
-    stream = open_memstream(&buffer, &size);
Honggang Li 5dda5c
-    if (stream == NULL) {
Honggang Li 5dda5c
-        MCA_COMMON_UCX_VERBOSE(1, "failed to open memory stream for ucx info (%s), "
Honggang Li 5dda5c
-                               "ucx is disabled", strerror(errno));
Honggang Li 5dda5c
-        goto out_free_device_list;
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* Print ucx transports information to the memory stream */
Honggang Li 5dda5c
-    ucp_context_print_info(context, stream);
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* Rewind and read transports/devices list from the stream */
Honggang Li 5dda5c
-    fseek(stream, 0, SEEK_SET);
Honggang Li 5dda5c
-    while ((support_level != OPAL_COMMON_UCX_SUPPORT_DEVICE) &&
Honggang Li 5dda5c
-           (fgets(line, sizeof(line), stream) != NULL)) {
Honggang Li 5dda5c
-        rsc_tl_name = NULL;
Honggang Li 5dda5c
-        ret = sscanf(line,
Honggang Li 5dda5c
-                     /* "# resource 6  :  md 5  dev 4  flags -- rc_verbs/mlx5_0:1" */
Honggang Li 5dda5c
-                     "# resource %*d : md %*d dev %*d flags -- %m[^/ \n\r]/%m[^/ \n\r]",
Honggang Li 5dda5c
-                     &rsc_tl_name, &rsc_device_name);
Honggang Li 5dda5c
-        if (ret != 2) {
Honggang Li 5dda5c
-            free(rsc_tl_name);
Honggang Li 5dda5c
-            continue;
Honggang Li 5dda5c
-        }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-        /* Check if 'rsc_tl_name' is found  provided list */
Honggang Li 5dda5c
-        found_tl = is_any_tl;
Honggang Li 5dda5c
-        for (list_item = tl_list; !found_tl && (*list_item != NULL); ++list_item) {
Honggang Li 5dda5c
-            found_tl = !strcmp(*list_item, rsc_tl_name);
Honggang Li 5dda5c
-        }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-        /* Check if the transport has a match (either positive or negative) */
Honggang Li 5dda5c
-        assert(!(is_any_tl && negate));
Honggang Li 5dda5c
-        if (found_tl != negate) {
Honggang Li 5dda5c
-            if (is_any_device ||
Honggang Li 5dda5c
-                opal_common_ucx_check_device(rsc_device_name, device_list)) {
Honggang Li 5dda5c
-                MCA_COMMON_UCX_VERBOSE(2, "%s/%s: matched both transport and device list",
Honggang Li 5dda5c
-                                    rsc_tl_name, rsc_device_name);
Honggang Li 5dda5c
-                support_level = OPAL_COMMON_UCX_SUPPORT_DEVICE;
Honggang Li 5dda5c
-            } else {
Honggang Li 5dda5c
-                MCA_COMMON_UCX_VERBOSE(2, "%s/%s: matched transport list but not device list",
Honggang Li 5dda5c
-                                    rsc_tl_name, rsc_device_name);
Honggang Li 5dda5c
-                support_level = OPAL_COMMON_UCX_SUPPORT_TRANSPORT;
Honggang Li 5dda5c
-            }
Honggang Li 5dda5c
-        } else {
Honggang Li 5dda5c
-            MCA_COMMON_UCX_VERBOSE(2, "%s/%s: did not match transport list",
Honggang Li 5dda5c
-                                   rsc_tl_name, rsc_device_name);
Honggang Li 5dda5c
-        }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-        free(rsc_device_name);
Honggang Li 5dda5c
-        free(rsc_tl_name);
Honggang Li 5dda5c
-    }
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    MCA_COMMON_UCX_VERBOSE(2, "support level is %s", support_level_names[support_level]);
Honggang Li 5dda5c
-    fclose(stream);
Honggang Li 5dda5c
-    free(buffer);
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-out_free_device_list:
Honggang Li 5dda5c
-    opal_argv_free(device_list);
Honggang Li 5dda5c
-out_free_tl_list:
Honggang Li 5dda5c
-    opal_argv_free(tl_list);
Honggang Li 5dda5c
-out:
Honggang Li 5dda5c
-#else
Honggang Li 5dda5c
-    MCA_COMMON_UCX_VERBOSE(2, "open_memstream() was not found, ucx is disabled");
Honggang Li 5dda5c
-#endif
Honggang Li 5dda5c
-    return support_level;
Honggang Li 5dda5c
-}
Honggang Li 5dda5c
-
Honggang Li 5dda5c
 void opal_common_ucx_empty_complete_cb(void *request, ucs_status_t status)
Honggang Li 5dda5c
 {
Honggang Li 5dda5c
 }
Honggang Li 5dda5c
diff --git a/opal/mca/common/ucx/common_ucx.h b/opal/mca/common/ucx/common_ucx.h
Honggang Li 5dda5c
index 92cdd738ef98..202131ac8907 100644
Honggang Li 5dda5c
--- a/opal/mca/common/ucx/common_ucx.h
Honggang Li 5dda5c
+++ b/opal/mca/common/ucx/common_ucx.h
Honggang Li 5dda5c
@@ -88,8 +88,6 @@ typedef struct opal_common_ucx_module {
Honggang Li 5dda5c
     int  progress_iterations;
Honggang Li 5dda5c
     int  registered;
Honggang Li 5dda5c
     bool opal_mem_hooks;
Honggang Li 5dda5c
-    char **tls;
Honggang Li 5dda5c
-    char **devices;
Honggang Li 5dda5c
 } opal_common_ucx_module_t;
Honggang Li 5dda5c
 
Honggang Li 5dda5c
 typedef struct opal_common_ucx_del_proc {
Honggang Li 5dda5c
@@ -97,23 +95,10 @@ typedef struct opal_common_ucx_del_proc {
Honggang Li 5dda5c
     size_t   vpid;
Honggang Li 5dda5c
 } opal_common_ucx_del_proc_t;
Honggang Li 5dda5c
 
Honggang Li 5dda5c
-typedef enum {
Honggang Li 5dda5c
-    /* No supported transports found (according to configured list of supported
Honggang Li 5dda5c
-       transports) */
Honggang Li 5dda5c
-    OPAL_COMMON_UCX_SUPPORT_NONE,
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* Have supported transports but not supported devices */
Honggang Li 5dda5c
-    OPAL_COMMON_UCX_SUPPORT_TRANSPORT,
Honggang Li 5dda5c
-
Honggang Li 5dda5c
-    /* Have both supported transports and supported devices */
Honggang Li 5dda5c
-    OPAL_COMMON_UCX_SUPPORT_DEVICE,
Honggang Li 5dda5c
-} opal_common_ucx_support_level_t;
Honggang Li 5dda5c
-
Honggang Li 5dda5c
 extern opal_common_ucx_module_t opal_common_ucx;
Honggang Li 5dda5c
 
Honggang Li 5dda5c
 OPAL_DECLSPEC void opal_common_ucx_mca_register(void);
Honggang Li 5dda5c
 OPAL_DECLSPEC void opal_common_ucx_mca_deregister(void);
Honggang Li 5dda5c
-OPAL_DECLSPEC opal_common_ucx_support_level_t opal_common_ucx_support_level(ucp_context_h context);
Honggang Li 5dda5c
 OPAL_DECLSPEC void opal_common_ucx_mca_proc_added(void);
Honggang Li 5dda5c
 OPAL_DECLSPEC void opal_common_ucx_empty_complete_cb(void *request, ucs_status_t status);
Honggang Li 5dda5c
 OPAL_DECLSPEC int opal_common_ucx_mca_pmix_fence(ucp_worker_h worker);
Honggang Li 5dda5c
diff --git a/opal/mca/common/ucx/configure.m4 b/opal/mca/common/ucx/configure.m4
Honggang Li 5dda5c
index af8628a889c6..27e07c2005b2 100644
Honggang Li 5dda5c
--- a/opal/mca/common/ucx/configure.m4
Honggang Li 5dda5c
+++ b/opal/mca/common/ucx/configure.m4
Honggang Li 5dda5c
@@ -18,8 +18,6 @@ AC_DEFUN([MCA_opal_common_ucx_CONFIG],[
Honggang Li 5dda5c
                [common_ucx_happy="yes"],
Honggang Li 5dda5c
                [common_ucx_happy="no"])
Honggang Li 5dda5c
 
Honggang Li 5dda5c
-    AC_CHECK_DECLS([open_memstream], [], [], [[#include <stdio.h>]])
Honggang Li 5dda5c
-
Honggang Li 5dda5c
     AS_IF([test "$common_ucx_happy" = "yes"],
Honggang Li 5dda5c
           [$1],
Honggang Li 5dda5c
           [$2])
Honggang Li 5dda5c
-- 
Honggang Li 5dda5c
2.31.1
Honggang Li 5dda5c