-#define MPI_Aint ptrdiff_t
-
-#define MPI_BYTE (smpi_mpi_global->mpi_byte)
-#define MPI_CHAR (smpi_mpi_global->mpi_char)
-#define MPI_INT (smpi_mpi_global->mpi_int)
-#define MPI_FLOAT (smpi_mpi_global->mpi_float)
-#define MPI_DOUBLE (smpi_mpi_global->mpi_double)
-
-#define MPI_LAND (smpi_mpi_global->mpi_land)
-#define MPI_SUM (smpi_mpi_global->mpi_sum)
-#define MPI_PROD (smpi_mpi_global->mpi_prod)
-#define MPI_MIN (smpi_mpi_global->mpi_min)
-#define MPI_MAX (smpi_mpi_global->mpi_max)
-
-// MPI macros
-#define MPI_Init(a, b) SMPI_MPI_Init(a, b)
-#define MPI_Finalize() SMPI_MPI_Finalize()
-#define MPI_Abort(a, b) SMPI_MPI_Abort(a, b)
-#define MPI_Comm_size(a, b) SMPI_MPI_Comm_size(a, b)
-#define MPI_Comm_split(a, b, c, d) SMPI_MPI_Comm_split(a, b, c, d)
-#define MPI_Comm_rank(a, b) SMPI_MPI_Comm_rank(a, b)
-#define MPI_Type_size(a, b) SMPI_MPI_Type_size(a, b)
-#define MPI_Type_get_extent(a, b, c) SMPI_MPI_Type_get_extent(a, b, c)
-#define MPI_Type_lb(a, b) SMPI_MPI_Type_lb(a, b)
-#define MPI_Type_ub(a, b) SMPI_MPI_Type_ub(a, b)
-
-#define MPI_Barrier(a) SMPI_MPI_Barrier(a)
-#define MPI_Irecv(a, b, c, d, e, f, g) SMPI_MPI_Irecv(a, b, c, d, e, f, g)
-#define MPI_Recv(a, b, c, d, e, f, g) SMPI_MPI_Recv(a, b, c, d, e, f, g)
-#define MPI_Isend(a, b, c, d, e, f, g) SMPI_MPI_Isend(a, b, c, d, e, f, g)
-#define MPI_Send(a, b, c, d, e, f) SMPI_MPI_Send(a, b, c, d, e, f)
-#define MPI_Sendrecv( a, b, c, d, e, f, g, h, i, j, k, l) SMPI_MPI_Sendrecv(a, b, c, d, e, f, g, h, i, j, k, l)
-#define MPI_Bcast(a, b, c, d, e) SMPI_MPI_Bcast(a, b, c, d, e)
-#define MPI_Wait(a, b) SMPI_MPI_Wait(a, b)
-#define MPI_Waitall(a, b, c) SMPI_MPI_Waitall(a, b, c)
-#define MPI_Waitany(a, b, c, d) SMPI_MPI_Waitany(a, b, c, d)
-#define MPI_Wtime() SMPI_MPI_Wtime()
-#define MPI_Reduce(a, b, c, d, e, f, g) SMPI_MPI_Reduce(a, b, c, d, e, f, g)
-#define MPI_Allreduce(a, b, c, d, e, f) SMPI_MPI_Allreduce(a, b, c, d, e, f)
-#define MPI_Scatter(a, b, c, d, e, f, g, h ) SMPI_MPI_Scatter(a, b, c, d, e, f, g, h)
-#define MPI_Alltoall(a, b, c, d, e, f, g ) SMPI_MPI_Alltoall(a, b, c, d, e, f, g)
-#define MPI_Alltoallv(a, b, c, d, e, f, g, h, i) SMPI_MPI_Alltoallv(a, b, c, d, e, f, g, h, i)
-#define MPI_Gather(a, b, c, d, e, f, g, h) SMPI_MPI_Gather(a, b, c, d, e, f, g, h)
-#define MPI_Gatherv(a, b, c, d, e, f, g, h, i) SMPI_MPI_Gatherv(a, b, c, d, e, f, g, h, i)
-#define MPI_Scatterv(a, b, c, d, e, f, g, h, i) SMPI_MPI_Scatterv(a, b, c, d, e, f, g, h, i)
-#define MPI_Reduce_scatter(a, b, c, d, e, f) SMPI_MPI_Reduce_scatter(a, b, c, d, e, f)
-#define MPI_Allgather(a, b, c, d, e, f, g) SMPI_MPI_Allgather(a, b, c, d, e, f, g)
-#define MPI_Allgatherv(a, b, c, d, e, f, g, h) SMPI_MPI_Allgatherv(a, b, c, d, e, f, g, h)
-
-// SMPI Functions
-XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
-XBT_PUBLIC(int) SMPI_MPI_Finalize(void);
-XBT_PUBLIC(int) SMPI_MPI_Abort(MPI_Comm comm, int errorcode);
-XBT_PUBLIC(int) SMPI_MPI_Comm_size(MPI_Comm comm, int *size);
-XBT_PUBLIC(int) SMPI_MPI_Comm_rank(MPI_Comm comm, int *rank);
-XBT_PUBLIC(int) SMPI_MPI_Type_size(MPI_Datatype datatype, size_t * size);
-XBT_PUBLIC(int) SMPI_MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint* lb, MPI_Aint *extent);
-XBT_PUBLIC(int) SMPI_MPI_Type_lb(MPI_Datatype datatype, MPI_Aint* disp);
-XBT_PUBLIC(int) SMPI_MPI_Type_ub(MPI_Datatype datatype, MPI_Aint* disp);
-
-
-XBT_PUBLIC(int) SMPI_MPI_Barrier(MPI_Comm comm);
-XBT_PUBLIC(int) SMPI_MPI_Irecv(void *buf, int count, MPI_Datatype datatype,
- int src, int tag, MPI_Comm comm,
- MPI_Request * request);
-XBT_PUBLIC(int) SMPI_MPI_Recv(void *buf, int count, MPI_Datatype datatype,
+
+#define MPI_DATATYPE_NULL NULL
+extern MPI_Datatype MPI_CHAR;
+extern MPI_Datatype MPI_SHORT;
+extern MPI_Datatype MPI_INT;
+extern MPI_Datatype MPI_LONG;
+extern MPI_Datatype MPI_LONG_LONG;
+#define MPI_LONG_LONG_INT MPI_LONG_LONG
+extern MPI_Datatype MPI_SIGNED_CHAR;
+extern MPI_Datatype MPI_UNSIGNED_CHAR;
+extern MPI_Datatype MPI_UNSIGNED_SHORT;
+extern MPI_Datatype MPI_UNSIGNED;
+extern MPI_Datatype MPI_UNSIGNED_LONG;
+extern MPI_Datatype MPI_UNSIGNED_LONG_LONG;
+extern MPI_Datatype MPI_FLOAT;
+extern MPI_Datatype MPI_DOUBLE;
+extern MPI_Datatype MPI_LONG_DOUBLE;
+extern MPI_Datatype MPI_WCHAR;
+extern MPI_Datatype MPI_C_BOOL;
+extern MPI_Datatype MPI_INT8_T;
+extern MPI_Datatype MPI_INT16_T;
+extern MPI_Datatype MPI_INT32_T;
+extern MPI_Datatype MPI_INT64_T;
+extern MPI_Datatype MPI_UINT8_T;
+#define MPI_BYTE MPI_UINT8_T
+extern MPI_Datatype MPI_UINT16_T;
+extern MPI_Datatype MPI_UINT32_T;
+extern MPI_Datatype MPI_UINT64_T;
+extern MPI_Datatype MPI_C_FLOAT_COMPLEX;
+#define MPI_C_COMPLEX MPI_C_FLOAT_COMPLEX
+extern MPI_Datatype MPI_C_DOUBLE_COMPLEX;
+extern MPI_Datatype MPI_C_LONG_DOUBLE_COMPLEX;
+extern MPI_Datatype MPI_AINT;
+extern MPI_Datatype MPI_OFFSET;
+
+//The following are datatypes for the MPI functions MPI_MAXLOC and MPI_MINLOC.
+extern MPI_Datatype MPI_FLOAT_INT;
+extern MPI_Datatype MPI_LONG_INT;
+extern MPI_Datatype MPI_DOUBLE_INT;
+extern MPI_Datatype MPI_SHORT_INT;
+extern MPI_Datatype MPI_2INT;
+extern MPI_Datatype MPI_LONG_DOUBLE_INT;
+
+
+typedef void MPI_User_function(void *invec, void *inoutvec, int *len,
+ MPI_Datatype * datatype);
+struct s_smpi_mpi_op;
+typedef struct s_smpi_mpi_op *MPI_Op;
+
+#define MPI_OP_NULL NULL
+extern MPI_Op MPI_MAX;
+extern MPI_Op MPI_MIN;
+extern MPI_Op MPI_MAXLOC;
+extern MPI_Op MPI_MINLOC;
+extern MPI_Op MPI_SUM;
+extern MPI_Op MPI_PROD;
+extern MPI_Op MPI_LAND;
+extern MPI_Op MPI_LOR;
+extern MPI_Op MPI_LXOR;
+extern MPI_Op MPI_BAND;
+extern MPI_Op MPI_BOR;
+extern MPI_Op MPI_BXOR;
+
+struct s_smpi_mpi_group;
+typedef struct s_smpi_mpi_group *MPI_Group;
+
+#define MPI_GROUP_NULL NULL
+
+extern MPI_Group MPI_GROUP_EMPTY;
+
+struct s_smpi_mpi_communicator;
+typedef struct s_smpi_mpi_communicator *MPI_Comm;
+
+#define MPI_COMM_NULL NULL
+extern MPI_Comm MPI_COMM_WORLD;
+#define MPI_COMM_SELF smpi_process_comm_self()
+
+struct s_smpi_mpi_request;
+typedef struct s_smpi_mpi_request *MPI_Request;
+
+#define MPI_REQUEST_NULL NULL
+
+XBT_PUBLIC(int) MPI_Init(int *argc, char ***argv);
+XBT_PUBLIC(int) MPI_Finalize(void);
+XBT_PUBLIC(int) MPI_Init_thread(int *argc, char ***argv, int required,
+ int *provided);
+XBT_PUBLIC(int) MPI_Query_thread(int *provided);
+XBT_PUBLIC(int) MPI_Is_thread_main(int *flag);
+XBT_PUBLIC(int) MPI_Abort(MPI_Comm comm, int errorcode);
+XBT_PUBLIC(double) MPI_Wtime(void);
+
+XBT_PUBLIC(int) MPI_Address(void *location, MPI_Aint * address);
+
+XBT_PUBLIC(int) MPI_Type_free(MPI_Datatype * datatype);
+XBT_PUBLIC(int) MPI_Type_size(MPI_Datatype datatype, int *size);
+XBT_PUBLIC(int) MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb,
+ MPI_Aint * extent);
+XBT_PUBLIC(int) MPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent);
+XBT_PUBLIC(int) MPI_Type_lb(MPI_Datatype datatype, MPI_Aint * disp);
+XBT_PUBLIC(int) MPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp);
+
+XBT_PUBLIC(int) MPI_Op_create(MPI_User_function * function, int commute,
+ MPI_Op * op);
+XBT_PUBLIC(int) MPI_Op_free(MPI_Op * op);
+
+XBT_PUBLIC(int) MPI_Group_free(MPI_Group * group);
+XBT_PUBLIC(int) MPI_Group_size(MPI_Group group, int *size);
+XBT_PUBLIC(int) MPI_Group_rank(MPI_Group group, int *rank);
+XBT_PUBLIC(int) MPI_Group_translate_ranks(MPI_Group group1, int n,
+ int *ranks1, MPI_Group group2,
+ int *ranks2);
+XBT_PUBLIC(int) MPI_Group_compare(MPI_Group group1, MPI_Group group2,
+ int *result);
+XBT_PUBLIC(int) MPI_Group_union(MPI_Group group1, MPI_Group group2,
+ MPI_Group * newgroup);
+XBT_PUBLIC(int) MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
+ MPI_Group * newgroup);
+XBT_PUBLIC(int) MPI_Group_difference(MPI_Group group1, MPI_Group group2,
+ MPI_Group * newgroup);
+XBT_PUBLIC(int) MPI_Group_incl(MPI_Group group, int n, int *ranks,
+ MPI_Group * newgroup);
+XBT_PUBLIC(int) MPI_Group_excl(MPI_Group group, int n, int *ranks,
+ MPI_Group * newgroup);
+XBT_PUBLIC(int) MPI_Group_range_incl(MPI_Group group, int n,
+ int ranges[][3],
+ MPI_Group * newgroup);
+XBT_PUBLIC(int) MPI_Group_range_excl(MPI_Group group, int n,
+ int ranges[][3],
+ MPI_Group * newgroup);
+
+XBT_PUBLIC(int) MPI_Comm_rank(MPI_Comm comm, int *rank);
+XBT_PUBLIC(int) MPI_Comm_size(MPI_Comm comm, int *size);
+XBT_PUBLIC(int) MPI_Get_processor_name(char *name, int *resultlen);
+XBT_PUBLIC(int) MPI_Get_count(MPI_Status * status, MPI_Datatype datatype,
+ int *count);
+
+XBT_PUBLIC(int) MPI_Comm_group(MPI_Comm comm, MPI_Group * group);
+XBT_PUBLIC(int) MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2,
+ int *result);
+XBT_PUBLIC(int) MPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm);
+XBT_PUBLIC(int) MPI_Comm_create(MPI_Comm comm, MPI_Group group,
+ MPI_Comm * newcomm);
+XBT_PUBLIC(int) MPI_Comm_free(MPI_Comm * comm);
+XBT_PUBLIC(int) MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out);
+
+XBT_PUBLIC(int) MPI_Send_init(void *buf, int count, MPI_Datatype datatype,
+ int dst, int tag, MPI_Comm comm,
+ MPI_Request * request);
+XBT_PUBLIC(int) MPI_Recv_init(void *buf, int count, MPI_Datatype datatype,