Merge pull request #7061 from ggouaillardet/topic/ucx_zero_size_ddt

ggouaillardet · web-flow · commit 096da7b3b52e · 2019-10-09T17:28:18.000+09:00
pml/ucx: correctly handle zero size datatypes
diff --git a/ompi/mca/pml/ucx/pml_ucx_datatype.c b/ompi/mca/pml/ucx/pml_ucx_datatype.c
@@ -1,5 +1,7 @@
 /*
  * Copyright (C) Mellanox Technologies Ltd. 2001-2011.  ALL RIGHTS RESERVED.
+ * Copyright (c) 2019      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -155,7 +157,6 @@ ucp_datatype_t mca_pml_ucx_init_datatype(ompi_datatype_t *datatype)
         (lb == 0))
     {
         ompi_datatype_type_size(datatype, &size);
-        PML_UCX_ASSERT(size > 0);
         datatype->pml_data = ucp_dt_make_contig(size);
         return datatype->pml_data;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* Copyright (C) Mellanox Technologies Ltd. 2001-2011. ALL RIGHTS RESERVED.`
	`3`	`+ * Copyright (c) 2019 Research Organization for Information Science`
	`4`	`+ * and Technology (RIST). All rights reserved.`
`3`	`5`	`* $COPYRIGHT$`
`4`	`6`	`*`
`5`	`7`	`* Additional copyrights may follow`
`@@ -155,7 +157,6 @@ ucp_datatype_t mca_pml_ucx_init_datatype(ompi_datatype_t *datatype)`
`155`	`157`	`(lb == 0))`
`156`	`158`	`{`
`157`	`159`	`ompi_datatype_type_size(datatype, &size);`
`158`		`- PML_UCX_ASSERT(size > 0);`
`159`	`160`	`datatype->pml_data = ucp_dt_make_contig(size);`
`160`	`161`	`return datatype->pml_data;`
`161`	`162`	`}`