Add mpi alltoallv pairwise

[simgrid.git] / src / smpi / colls / colls.h

diff --git a/src/smpi/colls/colls.h b/src/smpi/colls/colls.h
index 43f5de9..5294eda 100644 (file)
--- a/src/smpi/colls/colls.h
+++ b/src/smpi/colls/colls.h
@@ -3,10 +3,9 @@
 
 #include <math.h>
 #include "smpi/mpi.h"
+#include "smpi/private.h"
 #include "xbt.h"
 
-void star_reduction(MPI_Op op, void *src, void *target, int *count, MPI_Datatype *dtype);
-
 #define COLL_DESCRIPTION(cat, ret, args, name) \
   {# name,\
    # cat " " # name " collective",\
@@ -41,12 +40,10 @@ COLL_APPLY(action, COLL_ALLGATHER_SIG, NTSLR) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, NTSLR_NB) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, pair) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, rdb) COLL_sep \
-COLL_APPLY(action, COLL_ALLGATHER_SIG, RDB) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, rhv) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, ring) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, SMP_NTS) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, smp_simple) COLL_sep \
-COLL_APPLY(action, COLL_ALLGATHER_SIG, SMP_simple) COLL_sep \
 COLL_APPLY(action, COLL_ALLGATHER_SIG, spreading_simple)
 
 COLL_ALLGATHERS(COLL_PROTO, COLL_NOsep)
@@ -104,6 +101,18 @@ COLL_APPLY(action, COLL_ALLTOALL_SIG, simple)
 
 COLL_ALLTOALLS(COLL_PROTO, COLL_NOsep)
 
+/*************
+ * ALLTOALLV *
+ *************/
+#define COLL_ALLTOALLV_SIG alltoallv, int, \
+                        (void *send_buff, int *send_counts, int *send_disps, MPI_Datatype send_type, \
+                         void *recv_buff, int *recv_counts, int *recv_disps, MPI_Datatype recv_type, \
+                          MPI_Comm com)
+
+#define COLL_ALLTOALLVS(action, COLL_sep) \
+COLL_APPLY(action, COLL_ALLTOALLV_SIG, pairwise)
+
+COLL_ALLTOALLVS(COLL_PROTO, COLL_NOsep)
 
 /*********
  * BCAST *
@@ -127,8 +136,7 @@ COLL_APPLY(action, COLL_BCAST_SIG, scatter_LR_allgather) COLL_sep \
 COLL_APPLY(action, COLL_BCAST_SIG, scatter_rdb_allgather) COLL_sep \
 COLL_APPLY(action, COLL_BCAST_SIG, SMP_binary) COLL_sep \
 COLL_APPLY(action, COLL_BCAST_SIG, SMP_binomial) COLL_sep \
-COLL_APPLY(action, COLL_BCAST_SIG, SMP_linear) COLL_sep \
-COLL_APPLY(action, COLL_BCAST_SIG, TSB)
+COLL_APPLY(action, COLL_BCAST_SIG, SMP_linear)
 
 COLL_BCASTS(COLL_PROTO, COLL_NOsep)