Merge pull request #7839 from hoopoepg/topic/fixed-tag-send-dt-issue-…

…v1.12 UCP/TAG/SEND: fixed datatype issue - v1.12
openucx · Jan 11, 2022 · 2b8c4bd · 2b8c4bd
2 parents 94140fd + 2ab43a0
commit 2b8c4bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -7,7 +7,7 @@
 ##
 #
 
-## 1.12.0 (January 12, 2022)
+## 1.12.0 RC3 (January 11, 2022)
 ### Features:
 #### Core
 * Added beta-level support for Go language bindings
@@ -120,6 +120,7 @@
 * Multiple fixes in general error flow
 * Fixed fallback to PUT pipeline in rendezvous protocol
 * Reduced default value of keep-alive interval to 20 seconds
+* Fixes in tag_send datatype processing
 #### UCT
 * Fixed deadlock in TCP
 * Suppressed EHOSTUNREACH error in TCP sockcm

diff --git a/src/ucp/tag/tag_send.c b/src/ucp/tag/tag_send.c
@@ -264,9 +264,15 @@ UCS_PROFILE_FUNC(ucs_status_ptr_t, ucp_tag_send_nbx,
                                              contig_length, tag);
             ucp_request_send_check_status(status, ret, goto out);
         }
-    } else {
+    } else if (attr_mask == UCP_OP_ATTR_FLAG_NO_IMM_CMPL) {
         datatype      = ucp_dt_make_contig(1);
         contig_length = count;
+    } else {
+        /* UCP_OP_ATTR_FIELD_DATATYPE | UCP_OP_ATTR_FLAG_NO_IMM_CMPL */
+        datatype = param->datatype;
+        if (UCP_DT_IS_CONTIG(datatype)) {
+            contig_length = ucp_contig_dt_length(datatype, count);
+        }
     }
 
     if (ucs_unlikely(param->op_attr_mask & UCP_OP_ATTR_FLAG_FORCE_IMM_CMPL)) {