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
Oops. Forgot to commit the header.
[simgrid.git]
/
include
/
smpi
/
smpi.h
diff --git
a/include/smpi/smpi.h
b/include/smpi/smpi.h
index
bf11472
..
af5a3e2
100644
(file)
--- a/
include/smpi/smpi.h
+++ b/
include/smpi/smpi.h
@@
-52,11
+52,15
@@
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_int;
+ smpi_mpi_datatype_t mpi_float;
smpi_mpi_datatype_t mpi_double;
smpi_mpi_op_t mpi_land;
smpi_mpi_op_t mpi_sum;
smpi_mpi_datatype_t mpi_double;
smpi_mpi_op_t mpi_land;
smpi_mpi_op_t mpi_sum;
+ smpi_mpi_op_t mpi_min;
+ smpi_mpi_op_t mpi_max;
} s_smpi_mpi_global_t;
typedef struct smpi_mpi_global_t *smpi_mpi_global_t;
} s_smpi_mpi_global_t;
typedef struct smpi_mpi_global_t *smpi_mpi_global_t;
@@
-68,11
+72,15
@@
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_
DOUBLE (smpi_mpi_global->mpi_double
)
+#define MPI_
CHAR (smpi_mpi_global->mpi_char
)
#define MPI_INT (smpi_mpi_global->mpi_int)
#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_LAND (smpi_mpi_global->mpi_land)
#define MPI_SUM (smpi_mpi_global->mpi_sum)
+#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)
// MPI macros
#define MPI_Init(a, b) SMPI_MPI_Init(a, b)
@@
-88,7
+96,12
@@
SG_BEGIN_DECL()
#define MPI_Send(a, b, c, d, e, f) SMPI_MPI_Send(a, b, c, d, e, f)
#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_Send(a, b, c, d, e, f) SMPI_MPI_Send(a, b, c, d, e, f)
#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_Comm_split(a, b, c, d) SMPI_MPI_Comm_split(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)
// SMPI Functions
XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
// SMPI Functions
XBT_PUBLIC(int) SMPI_MPI_Init(int *argc, char ***argv);
@@
-112,8
+125,20
@@
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_Comm_split(MPI_Comm comm, int color, int key,
MPI_Comm * comm_out);
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);
+XBT_PUBLIC(int) SMPI_MPI_Allreduce(void *sendbuf, void *recvbuf, int count,
+ MPI_Datatype datatype, MPI_Op op, 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);