started alltoallv(). Still some bugs.

[simgrid.git] / include / smpi / smpi.h

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index d4e4fee..928d16c 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -21,6 +21,7 @@ SG_BEGIN_DECL()
 #define MPI_ERR_COUNT   6
 #define MPI_ERR_RANK    7
 #define MPI_ERR_TAG     8
+#define MPI_ERR_TRUNCATE 9
 // MPI_Comm
      typedef struct smpi_mpi_communicator_t *smpi_mpi_communicator_t;
      typedef smpi_mpi_communicator_t MPI_Comm;
@@ -71,6 +72,7 @@ SG_BEGIN_DECL()
 #define MPI_COMM_NULL     NULL
 
 #define MPI_STATUS_IGNORE NULL
+#define MPI_Aint          ptrdiff_t
 
 #define MPI_BYTE          (smpi_mpi_global->mpi_byte)
 #define MPI_CHAR          (smpi_mpi_global->mpi_char)
@@ -89,8 +91,13 @@ SG_BEGIN_DECL()
 #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)
@@ -101,12 +108,13 @@ SG_BEGIN_DECL()
 #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_Comm_split(a, b, c, d) SMPI_MPI_Comm_split(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_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)
+
 
 // SMPI Functions
 XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
@@ -115,6 +123,11 @@ 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,
@@ -154,6 +167,10 @@ XBT_PUBLIC(int) SMPI_MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype data
 
 XBT_PUBLIC(int) SMPI_MPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype datatype,
                                     void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm);
+XBT_PUBLIC(int) SMPI_MPI_Alltoallv(void *sendbuf, int *scounts, int *sdisps, MPI_Datatype datatype, 
+                          void *recvbuf, int *rcounts, int *rdisps, MPI_Datatype recvtype,
+                            MPI_Comm comm);
+
 
 // smpi functions
 XBT_IMPORT_NO_EXPORT(int) smpi_simulated_main(int argc, char **argv);