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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
colls
/
colls.h
diff --git
a/src/smpi/colls/colls.h
b/src/smpi/colls/colls.h
index
ee84cf5
..
be58707
100644
(file)
--- a/
src/smpi/colls/colls.h
+++ b/
src/smpi/colls/colls.h
@@
-9,14
+9,16
@@
#include <math.h>
#include "smpi/mpi.h"
#include <math.h>
#include "smpi/mpi.h"
-#include "smpi/private.h"
+#include "s
rc/s
mpi/private.h"
#include "xbt/ex.h"
#include "xbt.h"
#include "xbt/ex.h"
#include "xbt.h"
+SG_BEGIN_DECL()
+
#define COLL_DESCRIPTION(cat, ret, args, name) \
{# name,\
# cat " " # name " collective",\
#define COLL_DESCRIPTION(cat, ret, args, name) \
{# name,\
# cat " " # name " collective",\
- smpi_coll_tuned_ ## cat ## _ ## name}
+
(void*)
smpi_coll_tuned_ ## cat ## _ ## name}
#define COLL_PROTO(cat, ret, args, name) \
ret smpi_coll_tuned_ ## cat ## _ ## name(COLL_UNPAREN args);
#define COLL_PROTO(cat, ret, args, name) \
ret smpi_coll_tuned_ ## cat ## _ ## name(COLL_UNPAREN args);
@@
-152,6
+154,7
@@
COLL_ALLREDUCES(COLL_PROTO, COLL_NOsep)
#define COLL_ALLTOALLS(action, COLL_sep) \
COLL_APPLY(action, COLL_ALLTOALL_SIG, 2dmesh) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, 3dmesh) COLL_sep \
#define COLL_ALLTOALLS(action, COLL_sep) \
COLL_APPLY(action, COLL_ALLTOALL_SIG, 2dmesh) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, 3dmesh) COLL_sep \
+COLL_APPLY(action, COLL_ALLTOALL_SIG, basic_linear) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, bruck) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, pair) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, pair_rma) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, bruck) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, pair) COLL_sep \
COLL_APPLY(action, COLL_ALLTOALL_SIG, pair_rma) COLL_sep \
@@
-226,6
+229,9
@@
COLL_APPLY(action, COLL_BCAST_SIG, ompi_split_bintree) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, ompi_pipeline) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, mpich) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, mvapich2) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, ompi_pipeline) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, mpich) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, mvapich2) COLL_sep \
+COLL_APPLY(action, COLL_BCAST_SIG, mvapich2_inter_node) COLL_sep \
+COLL_APPLY(action, COLL_BCAST_SIG, mvapich2_intra_node) COLL_sep \
+COLL_APPLY(action, COLL_BCAST_SIG, mvapich2_knomial_intra_node) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, impi) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, automatic)
COLL_APPLY(action, COLL_BCAST_SIG, impi) COLL_sep \
COLL_APPLY(action, COLL_BCAST_SIG, automatic)
@@
-329,5
+335,6
@@
COLL_APPLY(action, COLL_BARRIER_SIG, automatic)
COLL_BARRIERS(COLL_PROTO, COLL_NOsep)
COLL_BARRIERS(COLL_PROTO, COLL_NOsep)
+SG_END_DECL()
#endif
#endif