A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- MPI_Scatter() /* untested */
[simgrid.git]
/
include
/
smpi
/
smpi.h
diff --git
a/include/smpi/smpi.h
b/include/smpi/smpi.h
index
25a59ac
..
fbbbe9f
100644
(file)
--- a/
include/smpi/smpi.h
+++ b/
include/smpi/smpi.h
@@
-21,7
+21,6
@@
SG_BEGIN_DECL()
#define MPI_ERR_COUNT 6
#define MPI_ERR_RANK 7
#define MPI_ERR_TAG 8
#define MPI_ERR_COUNT 6
#define MPI_ERR_RANK 7
#define MPI_ERR_TAG 8
-
// MPI_Comm
typedef struct smpi_mpi_communicator_t *smpi_mpi_communicator_t;
typedef smpi_mpi_communicator_t MPI_Comm;
// MPI_Comm
typedef struct smpi_mpi_communicator_t *smpi_mpi_communicator_t;
typedef smpi_mpi_communicator_t MPI_Comm;
@@
-53,6
+52,7
@@
SG_BEGIN_DECL()
smpi_mpi_communicator_t mpi_comm_world;
smpi_mpi_datatype_t mpi_byte;
smpi_mpi_communicator_t mpi_comm_world;
smpi_mpi_datatype_t mpi_byte;
+ smpi_mpi_datatype_t mpi_char;
smpi_mpi_datatype_t mpi_int;
smpi_mpi_datatype_t mpi_float;
smpi_mpi_datatype_t mpi_double;
smpi_mpi_datatype_t mpi_int;
smpi_mpi_datatype_t mpi_float;
smpi_mpi_datatype_t mpi_double;
@@
-72,6
+72,7
@@
SG_BEGIN_DECL()
#define MPI_STATUS_IGNORE NULL
#define MPI_BYTE (smpi_mpi_global->mpi_byte)
#define MPI_STATUS_IGNORE NULL
#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_INT (smpi_mpi_global->mpi_int)
#define MPI_FLOAT (smpi_mpi_global->mpi_float)
#define MPI_DOUBLE (smpi_mpi_global->mpi_double)
@@
-100,6
+101,8
@@
SG_BEGIN_DECL()
#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_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)
// SMPI Functions
XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
// SMPI Functions
XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
@@
-123,14
+126,22
@@
XBT_PUBLIC(int) SMPI_MPI_Send(void *buf, int count, MPI_Datatype datatype,
XBT_PUBLIC(int) SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype,
int root, MPI_Comm comm);
XBT_PUBLIC(int) SMPI_MPI_Wait(MPI_Request * request, MPI_Status * status);
XBT_PUBLIC(int) SMPI_MPI_Bcast(void *buf, int count, MPI_Datatype datatype,
int root, MPI_Comm comm);
XBT_PUBLIC(int) SMPI_MPI_Wait(MPI_Request * request, MPI_Status * status);
-XBT_PUBLIC(int) SMPI_MPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]);
-XBT_PUBLIC(int) SMPI_MPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status status[]);
+XBT_PUBLIC(int) SMPI_MPI_Waitall(int count, MPI_Request requests[],
+ MPI_Status status[]);
+XBT_PUBLIC(int) SMPI_MPI_Waitany(int count, MPI_Request requests[],
+ int *index, MPI_Status status[]);
XBT_PUBLIC(int) SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key,
MPI_Comm * comm_out);
XBT_PUBLIC(double) SMPI_MPI_Wtime(void);
XBT_PUBLIC(int) SMPI_MPI_Reduce(void *sendbuf, void *recvbuf, int count,
XBT_PUBLIC(int) SMPI_MPI_Comm_split(MPI_Comm comm, int color, int key,
MPI_Comm * comm_out);
XBT_PUBLIC(double) SMPI_MPI_Wtime(void);
XBT_PUBLIC(int) SMPI_MPI_Reduce(void *sendbuf, void *recvbuf, int count,
- MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm);
+ MPI_Datatype datatype, MPI_Op op, int root,
+ MPI_Comm comm);
+XBT_PUBLIC(int) SMPI_MPI_Allreduce(void *sendbuf, void *recvbuf, int count,
+ MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
+
+XBT_PUBLIC(int) SMPI_MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype datatype,
+ void *recvbuf, int recvcount, MPI_Datatype recvtype,int root, MPI_Comm comm);
// smpi functions
XBT_IMPORT_NO_EXPORT(int) smpi_simulated_main(int argc, char **argv);
// smpi functions
XBT_IMPORT_NO_EXPORT(int) smpi_simulated_main(int argc, char **argv);