Merge pull request open-mpi#9074 from hjelmn/btl_uct_1_10

btl/uct: add support for UCX 1.10.x
hppritcha · Jun 16, 2021 · c7dfde3 · c7dfde3
2 parents 2daacdf + 8fbee98
commit c7dfde3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/opal/mca/btl/uct/btl_uct_endpoint.c b/opal/mca/btl/uct/btl_uct_endpoint.c
@@ -182,12 +182,22 @@ struct mca_btl_uct_conn_completion_t {
 };
 typedef struct mca_btl_uct_conn_completion_t mca_btl_uct_conn_completion_t;
 
+#if UCT_API >= ((1L<<UCT_MAJOR_BIT)|(10L << UCT_MINOR_BIT))
+static void mca_btl_uct_endpoint_flush_complete(uct_completion_t *self)
+{
+    mca_btl_uct_conn_completion_t *completion = (mca_btl_uct_conn_completion_t *) self;
+    BTL_VERBOSE(("connection flush complete"));
+    completion->complete = true;
+}
+#else
 static void mca_btl_uct_endpoint_flush_complete(uct_completion_t *self, ucs_status_t status)
 {
     mca_btl_uct_conn_completion_t *completion = (mca_btl_uct_conn_completion_t *) self;
+    (void) status;
     BTL_VERBOSE(("connection flush complete"));
     completion->complete = true;
 }
+#endif
 
 static int mca_btl_uct_endpoint_send_conn_req(mca_btl_uct_module_t *uct_btl,
                                               mca_btl_base_endpoint_t *endpoint,

diff --git a/opal/mca/btl/uct/btl_uct_frag.c b/opal/mca/btl/uct/btl_uct_frag.c
@@ -11,7 +11,7 @@
 
 #include "btl_uct_frag.h"
 
-static void mca_btl_uct_frag_completion(uct_completion_t *uct_comp, ucs_status_t status)
+static void mca_btl_uct_frag_completion_compat(uct_completion_t *uct_comp, ucs_status_t status)
 {
     mca_btl_uct_uct_completion_t *comp = (mca_btl_uct_uct_completion_t
                                               *) ((uintptr_t) uct_comp
@@ -24,6 +24,16 @@ static void mca_btl_uct_frag_completion(uct_completion_t *uct_comp, ucs_status_t
     opal_fifo_push(&comp->dev_context->completion_fifo, &comp->super.super);
 }
 
+#if UCT_API >= ((1L<<UCT_MAJOR_BIT)|(10L << UCT_MINOR_BIT))
+static void mca_btl_uct_frag_completion(uct_completion_t *uct_comp) {
+    mca_btl_uct_frag_completion_compat(uct_comp, uct_comp->status);
+}
+#else
+static void mca_btl_uct_frag_completion(uct_completion_t *uct_comp, ucs_status_t status) {
+    mca_btl_uct_frag_completion_compat(uct_comp, status);
+}
+#endif
+
 static void mca_btl_uct_base_frag_constructor(mca_btl_uct_base_frag_t *frag)
 {
     mca_btl_uct_reg_t *reg = (mca_btl_uct_reg_t *) frag->base.super.registration;

diff --git a/opal/mca/btl/uct/btl_uct_rdma.c b/opal/mca/btl/uct/btl_uct_rdma.c
@@ -11,7 +11,7 @@
 
 #include "btl_uct_device_context.h"
 
-void mca_btl_uct_uct_completion(uct_completion_t *uct_comp, ucs_status_t status)
+static void mca_btl_uct_uct_completion_compat(uct_completion_t *uct_comp, ucs_status_t status)
 {
     mca_btl_uct_uct_completion_t *comp = (mca_btl_uct_uct_completion_t
                                               *) ((uintptr_t) uct_comp
@@ -24,6 +24,16 @@ void mca_btl_uct_uct_completion(uct_completion_t *uct_comp, ucs_status_t status)
     opal_fifo_push(&comp->dev_context->completion_fifo, &comp->super.super);
 }
 
+#if UCT_API >= ((1L<<UCT_MAJOR_BIT)|(10L << UCT_MINOR_BIT))
+static void mca_btl_uct_uct_completion(uct_completion_t *uct_comp) {
+    mca_btl_uct_uct_completion_compat(uct_comp, uct_comp->status);
+}
+#else
+static void mca_btl_uct_uct_completion(uct_completion_t *uct_comp, ucs_status_t status) {
+     mca_btl_uct_uct_completion_compat(uct_comp, status);
+}
+#endif
+
 static void mca_btl_uct_uct_completion_construct(mca_btl_uct_uct_completion_t *comp)
 {
     comp->frag = NULL;

diff --git a/opal/mca/btl/uct/btl_uct_rdma.h b/opal/mca/btl/uct/btl_uct_rdma.h
@@ -28,8 +28,6 @@ mca_btl_uct_uct_completion_t *mca_btl_uct_uct_completion_alloc(
  */
 void mca_btl_uct_uct_completion_release(mca_btl_uct_uct_completion_t *comp);
 
-void mca_btl_uct_uct_completion(uct_completion_t *uct_comp, ucs_status_t status);
-
 /**
  * @brief unpack the registration key and ensure the endpoint is connected
  *
-Original file line number
+Diff line change
@@ Expand Up @@
      */
     void mca_btl_uct_uct_completion_release(mca_btl_uct_uct_completion_t *comp);
-    void mca_btl_uct_uct_completion(uct_completion_t *uct_comp, ucs_status_t status);
     /**
      * @brief unpack the registration key and ensure the endpoint is connected
      *
@@ Expand Down @@