From 44f8819305012d0584024fd27a13479d443c0b58 Mon Sep 17 00:00:00 2001 From: Valentin Petrov Date: Wed, 28 Apr 2021 12:07:25 +0300 Subject: [PATCH] coll/hcoll: fixes dtypes mapping Signed-off-by: Valentin Petrov (cherry picked from commit 13c8d22cc29bfeeea04874a6a1d714df5746a08c) --- ompi/mca/coll/hcoll/coll_hcoll_dtypes.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ompi/mca/coll/hcoll/coll_hcoll_dtypes.h b/ompi/mca/coll/hcoll/coll_hcoll_dtypes.h index a818e6675ba..c2034f16a36 100644 --- a/ompi/mca/coll/hcoll/coll_hcoll_dtypes.h +++ b/ompi/mca/coll/hcoll/coll_hcoll_dtypes.h @@ -33,7 +33,7 @@ extern mca_coll_hcoll_dtype_t zero_dte_mapping; total 15 types */ -static dte_data_representation_t* ompi_datatype_2_dte_data_rep[OMPI_DATATYPE_MAX_PREDEFINED] = { +static dte_data_representation_t* ompi_datatype_2_dte_data_rep[OPAL_DATATYPE_MAX_PREDEFINED] = { &DTE_ZERO, /*OPAL_DATATYPE_LOOP 0 */ &DTE_ZERO, /*OPAL_DATATYPE_END_LOOP 1 */ #if defined(DTE_LB) @@ -86,7 +86,17 @@ static dte_data_representation_t* ompi_datatype_2_dte_data_rep[OMPI_DATATYPE_MAX #else &DTE_ZERO, #endif - &DTE_ZERO /*OPAL_DATATYPE_UNAVAILABLE 24 */ +#if SIZEOF_LONG == 4 + &DTE_UINT32, +#else + &DTE_UINT64, /*OPAL_DATATYPE_LONG 24 */ +#endif +#if SIZEOF_UNSIGNED_LONG == 4 + &DTE_UINT32, +#else + &DTE_UINT64, /*OPAL_DATATYPE_UNSIGNED_LONG 25 */ +#endif + &DTE_ZERO /*OPAL_DATATYPE_UNAVAILABLE 26 */ }; enum {