From e47cb9636d9fc12a95279abb699ddfd1a6ca644e Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Fri, 22 May 2015 17:25:33 +0900 Subject: [PATCH] Revert "opal_pack_homogeneous_contig_with_gaps_function: correctly handle contiguous ddt made of more than one basic type" This reverts commit e4846746f4d4a746cba5e1b1e62fcd536830f136. --- opal/datatype/opal_datatype_pack.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opal/datatype/opal_datatype_pack.c b/opal/datatype/opal_datatype_pack.c index def2a82e31..45f1213b81 100644 --- a/opal/datatype/opal_datatype_pack.c +++ b/opal/datatype/opal_datatype_pack.c @@ -11,9 +11,7 @@ * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. * Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -120,8 +118,10 @@ opal_pack_homogeneous_contig_with_gaps_function( opal_convertor_t* pConv, assert( (pData->flags & OPAL_DATATYPE_FLAG_CONTIGUOUS) && ((OPAL_PTRDIFF_TYPE)pData->size != extent) ); DO_DEBUG( opal_output( 0, "pack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n", pConv->pBaseBuf, *out_size ); ); - stack[1].type = opal_datatype_uint1.id; - stack[1].count = pData->size; + if( stack[1].type != opal_datatype_uint1.id ) { + stack[1].count *= opal_datatype_basicDatatypes[stack[1].type]->size; + stack[1].type = opal_datatype_uint1.id; + } /* There are some optimizations that can be done if the upper level * does not provide a buffer.