Skip to content

v3.1.x: Allow OPAL DDT to receive size_t count argument. #5703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2018
Merged

v3.1.x: Allow OPAL DDT to receive size_t count argument. #5703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ompi/datatype/ompi_datatype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ OMPI_DECLSPEC int32_t ompi_datatype_destroy( ompi_datatype_t** type);
* Datatype creation functions
*/
static inline int32_t
ompi_datatype_add( ompi_datatype_t* pdtBase, const ompi_datatype_t* pdtAdd, uint32_t count,
ompi_datatype_add( ompi_datatype_t* pdtBase, const ompi_datatype_t* pdtAdd, size_t count,
ptrdiff_t disp, ptrdiff_t extent )
{
return opal_datatype_add( &pdtBase->super, &pdtAdd->super, count, disp, extent );
Expand Down
2 changes: 1 addition & 1 deletion ompi/datatype/ompi_datatype_create_vector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int32_t ompi_datatype_create_vector( int count, int bLength, int stride,

pData = ompi_datatype_create( oldType->super.desc.used + 2 );
if( (bLength == stride) || (1 >= count) ) { /* the elements are contiguous */
ompi_datatype_add( pData, oldType, count * bLength, 0, extent );
ompi_datatype_add( pData, oldType, (size_t)count * bLength, 0, extent );
} else {
if( 1 == bLength ) {
ompi_datatype_add( pData, oldType, count, 0, extent * stride );
Expand Down
2 changes: 1 addition & 1 deletion opal/datatype/opal_datatype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ OPAL_DECLSPEC void opal_datatype_dump( const opal_datatype_t* pData );
OPAL_DECLSPEC int32_t opal_datatype_clone( const opal_datatype_t * src_type, opal_datatype_t * dest_type );
OPAL_DECLSPEC int32_t opal_datatype_create_contiguous( int count, const opal_datatype_t* oldType, opal_datatype_t** newType );
OPAL_DECLSPEC int32_t opal_datatype_resize( opal_datatype_t* type, ptrdiff_t lb, ptrdiff_t extent );
OPAL_DECLSPEC int32_t opal_datatype_add( opal_datatype_t* pdtBase, const opal_datatype_t* pdtAdd, uint32_t count,
OPAL_DECLSPEC int32_t opal_datatype_add( opal_datatype_t* pdtBase, const opal_datatype_t* pdtAdd, size_t count,
ptrdiff_t disp, ptrdiff_t extent );

static inline int32_t
Expand Down
2 changes: 1 addition & 1 deletion opal/datatype/opal_datatype_add.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static inline int IMAX( int a, int b ) { return ( a < b ? b : a ); }
* set to ZERO if it's a empty datatype.
*/
int32_t opal_datatype_add( opal_datatype_t* pdtBase, const opal_datatype_t* pdtAdd,
uint32_t count, ptrdiff_t disp, ptrdiff_t extent )
size_t count, ptrdiff_t disp, ptrdiff_t extent )
{
uint32_t newLength, place_needed = 0, i;
short localFlags = 0; /* no specific options yet */
Expand Down