Add mpi alltoallv pairwise

[simgrid.git] / src / smpi / smpi_coll.c

diff --git a/src/smpi/smpi_coll.c b/src/smpi/smpi_coll.c
index af699b9..7c4c30e 100644 (file)
--- a/src/smpi/smpi_coll.c
+++ b/src/smpi/smpi_coll.c
@@ -13,51 +13,27 @@
 #include "private.h"
 #include "colls/colls.h"
 
+s_mpi_coll_description_t mpi_coll_allgather_description[] = {
+  {"default",
+   "allgather default collective",
+   smpi_mpi_allgather},
+COLL_ALLGATHERS(COLL_DESCRIPTION, COLL_COMMA),
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
+
+s_mpi_coll_description_t mpi_coll_allreduce_description[] = {
+  {"default",
+   "allreduce default collective",
+   smpi_mpi_allreduce},
+COLL_ALLREDUCES(COLL_DESCRIPTION, COLL_COMMA),
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
+
 s_mpi_coll_description_t mpi_coll_alltoall_description[] = {
   {"ompi",
    "Ompi alltoall default collective",
    smpi_coll_tuned_alltoall_ompi},
-
-  {"2dmesh",
-   "Alltoall 2dmesh collective",
-   smpi_coll_tuned_alltoall_2dmesh},
-  {"3dmesh",
-   "Alltoall 3dmesh collective",
-   smpi_coll_tuned_alltoall_3dmesh},
-  /*{"bruck",
-   "Alltoall Bruck collective",
-   smpi_coll_tuned_alltoall_bruck},*/
-  {"pair",
-   "Alltoall pair collective",
-   smpi_coll_tuned_alltoall_pair},
-  {"pair_light_barrier",
-   "Alltoall pair_light_barrier collective",
-   smpi_coll_tuned_alltoall_pair_light_barrier},
-  {"pair_mpi_barrier",
-   "Alltoall pair_mpi_barrier collective",
-   smpi_coll_tuned_alltoall_pair_mpi_barrier},
-  {"rdb",
-   "Alltoall rdb collective",
-   smpi_coll_tuned_alltoall_rdb},
-  {"ring",
-   "Alltoall ring collective",
-   smpi_coll_tuned_alltoall_ring},
-  {"ring_light_barrier",
-   "Alltoall ring_light_barrier collective",
-   smpi_coll_tuned_alltoall_ring_light_barrier},
-  {"ring_light_barrier",
-   "Alltoall ring_light_barrier collective",
-   smpi_coll_tuned_alltoall_ring_light_barrier},
-  {"ring_mpi_barrier",
-   "Alltoall ring_mpi_barrier collective",
-   smpi_coll_tuned_alltoall_ring_mpi_barrier},
-  {"ring_one_barrier",
-   "Alltoall ring_one_barrier collective",
-   smpi_coll_tuned_alltoall_ring_one_barrier},
-  {"simple",
-   "Alltoall simple collective",
-   smpi_coll_tuned_alltoall_simple},
-
+COLL_ALLTOALLS(COLL_DESCRIPTION, COLL_COMMA),
   {"bruck",
    "Alltoall Bruck (SG) collective",
    smpi_coll_tuned_alltoall_bruck},
@@ -67,19 +43,35 @@ s_mpi_coll_description_t mpi_coll_alltoall_description[] = {
   {"pairwise",
    "Alltoall pairwise (SG) collective",
    smpi_coll_tuned_alltoall_pairwise},
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
 
+s_mpi_coll_description_t mpi_coll_alltoallv_description[] = {
+  {"default",
+   "Ompi alltoallv default collective",
+   smpi_coll_basic_alltoallv},
+COLL_ALLTOALLVS(COLL_DESCRIPTION, COLL_COMMA),
   {NULL, NULL, NULL}      /* this array must be NULL terminated */
 };
 
-s_mpi_coll_description_t mpi_coll_allgather_description[] = {
+s_mpi_coll_description_t mpi_coll_bcast_description[] = {
   {"default",
    "allgather default collective",
-   smpi_mpi_gather},
+   smpi_mpi_bcast},
+COLL_BCASTS(COLL_DESCRIPTION, COLL_COMMA),
+  {NULL, NULL, NULL}      /* this array must be NULL terminated */
+};
 
+s_mpi_coll_description_t mpi_coll_reduce_description[] = {
+  {"default",
+   "allgather default collective",
+   smpi_mpi_reduce},
+COLL_REDUCES(COLL_DESCRIPTION, COLL_COMMA),
   {NULL, NULL, NULL}      /* this array must be NULL terminated */
 };
 
 
+
 /** Displays the long description of all registered models, and quit */
 void coll_help(const char *category, s_mpi_coll_description_t * table)
 {
@@ -117,6 +109,13 @@ int find_coll_description(s_mpi_coll_description_t * table,
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi,
                                 "Logging specific to SMPI (coll)");
 
+int (*mpi_coll_allgather_fun)(void *, int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm);
+int (*mpi_coll_allreduce_fun)(void *sbuf, void *rbuf, int rcount, MPI_Datatype dtype, MPI_Op op, MPI_Comm comm);
+int (*mpi_coll_alltoall_fun)(void *, int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm);
+int (*mpi_coll_alltoallv_fun)(void *, int*, int*, MPI_Datatype, void*, int*, int*, MPI_Datatype, MPI_Comm);
+int (*mpi_coll_bcast_fun)(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm com);
+int (*mpi_coll_reduce_fun)(void *buf, void *rbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm);
+
 struct s_proc_tree {
   int PROCTREE_A;
   int numChildren;