Merge pull request #1985 from vspetrov/master

jladd-mlnx · web-flow · commit deae1ab375e4 · 2016-08-22T09:18:59.000-04:00
coll/hcoll: Fixes predifined types mapping
diff --git a/ompi/mca/coll/hcoll/coll_hcoll_dtypes.h b/ompi/mca/coll/hcoll/coll_hcoll_dtypes.h
@@ -140,7 +140,8 @@ ompi_dtype_2_hcoll_dtype( ompi_datatype_t *dtype,
     int opal_type_id = dtype->super.id;
     dte_data_representation_t dte_data_rep = DTE_ZERO;
 
-    if (ompi_type_id < OMPI_DATATYPE_MPI_MAX_PREDEFINED) {
+    if (ompi_type_id < OMPI_DATATYPE_MPI_MAX_PREDEFINED &&
+        dtype->super.flags & OMPI_DATATYPE_FLAG_PREDEFINED) {
         if (opal_type_id > 0 && opal_type_id < OPAL_DATATYPE_MAX_PREDEFINED) {
             dte_data_rep =  *ompi_datatype_2_dte_data_rep[opal_type_id];
         }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,8 @@ ompi_dtype_2_hcoll_dtype( ompi_datatype_t *dtype,`
`140`	`140`	`int opal_type_id = dtype->super.id;`
`141`	`141`	`dte_data_representation_t dte_data_rep = DTE_ZERO;`
`142`	`142`
`143`		`- if (ompi_type_id < OMPI_DATATYPE_MPI_MAX_PREDEFINED) {`
	`143`	`+ if (ompi_type_id < OMPI_DATATYPE_MPI_MAX_PREDEFINED &&`
	`144`	`+ dtype->super.flags & OMPI_DATATYPE_FLAG_PREDEFINED) {`
`144`	`145`	`if (opal_type_id > 0 && opal_type_id < OPAL_DATATYPE_MAX_PREDEFINED) {`
`145`	`146`	`dte_data_rep = *ompi_datatype_2_dte_data_rep[opal_type_id];`
`146`	`147`	`}`