From f6db0e8487d57bfb4d5fe4d156ae12437c75d13b Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Sun, 14 Apr 2019 16:07:55 +0200 Subject: [PATCH] Support MPI3 datatype MPI_Count --- include/smpi/smpi.h | 5 ++--- src/smpi/mpi/smpi_datatype.cpp | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 7017692100..605a37ac48 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -212,6 +212,7 @@ enum ERROR_ENUM { typedef ptrdiff_t MPI_Aint; typedef long long MPI_Offset; +typedef long long MPI_Count; struct s_MPI_File; typedef struct s_MPI_File *MPI_File; @@ -292,9 +293,7 @@ XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER4; XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER8; XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER16; -//for now we only send int values at max -#define MPI_Count int -#define MPI_COUNT MPI_INT +XBT_PUBLIC_DATA const MPI_Datatype MPI_COUNT; //defines for fortran compatibility #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp index e0686a1ce3..1aa590876f 100644 --- a/src/smpi/mpi/smpi_datatype.cpp +++ b/src/smpi/mpi/smpi_datatype.cpp @@ -95,6 +95,8 @@ CREATE_MPI_DATATYPE_NULL(MPI_LB, 52); CREATE_MPI_DATATYPE(MPI_PACKED, 53, char); // Internal use only CREATE_MPI_DATATYPE(MPI_PTR, 54, void*); +CREATE_MPI_DATATYPE(MPI_COUNT, 55, long long); + namespace simgrid{ namespace smpi{ -- 2.20.1