Merge pull request #4106 from AboorvaDevarajan/v1.6.x_v1

UCP/PROTO: Fix mem type support with generic datatype
openucx · Sep 1, 2019 · b7f1940 · b7f1940
2 parents 6e6cc17 + ebb4c94
commit b7f1940
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/ucp/proto/proto_am.inl b/src/ucp/proto/proto_am.inl
@@ -349,12 +349,8 @@ ucp_proto_get_zcopy_threshold(const ucp_request_t *req,
         return max_zcopy;
     }
 
-    if (ucs_unlikely(!UCP_MEM_IS_HOST(req->send.mem_type))) {
-        return ucs_min(max_zcopy, msg_config->mem_type_zcopy_thresh[req->send.mem_type]);
-    }
-
     if (ucs_likely(UCP_DT_IS_CONTIG(req->send.datatype))) {
-        return ucs_min(max_zcopy, msg_config->zcopy_thresh[0]);
+        return ucs_min(max_zcopy, msg_config->mem_type_zcopy_thresh[req->send.mem_type]);
     } else if (UCP_DT_IS_IOV(req->send.datatype)) {
         if (0 == count) {
             /* disable zcopy */