X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2f1b23687f04169144f4ffb4f20dc4fc5c28395..9631558b72f9b30b510f23a391d77c61c0541bd5:/src/smpi/colls/colls.h diff --git a/src/smpi/colls/colls.h b/src/smpi/colls/colls.h index 43f5de93b8..24cd91cac8 100644 --- a/src/smpi/colls/colls.h +++ b/src/smpi/colls/colls.h @@ -3,10 +3,9 @@ #include #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",\ @@ -31,9 +30,9 @@ void star_reduction(MPI_Op op, void *src, void *target, int *count, MPI_Datatype MPI_Comm comm) #define COLL_ALLGATHERS(action, COLL_sep) \ -COLL_NOTHING(COLL_APPLY(action, COLL_ALLGATHER_SIG, 2dmesh) COLL_sep) \ -COLL_NOTHING(COLL_APPLY(action, COLL_ALLGATHER_SIG, 3dmesh) COLL_sep) \ -COLL_NOTHING(COLL_APPLY(action, COLL_ALLGATHER_SIG, bruck) COLL_sep) \ +COLL_APPLY(action, COLL_ALLGATHER_SIG, 2dmesh) COLL_sep \ +COLL_APPLY(action, COLL_ALLGATHER_SIG, 3dmesh) COLL_sep \ +COLL_APPLY(action, COLL_ALLGATHER_SIG, bruck) COLL_sep \ COLL_APPLY(action, COLL_ALLGATHER_SIG, GB) COLL_sep \ COLL_APPLY(action, COLL_ALLGATHER_SIG, loosely_lr) COLL_sep \ COLL_APPLY(action, COLL_ALLGATHER_SIG, lr) COLL_sep \ @@ -41,16 +40,30 @@ 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_APPLY(action, COLL_ALLGATHER_SIG, spreading_simple) COLL_sep \ +COLL_APPLY(action, COLL_ALLGATHER_SIG, ompi) COLL_ALLGATHERS(COLL_PROTO, COLL_NOsep) +/************** + * ALLGATHERV * + **************/ +#define COLL_ALLGATHERV_SIG allgatherv, int, \ + (void *send_buff, int send_count, MPI_Datatype send_type, \ + void *recv_buff, int *recv_count, int *recv_disps, \ + MPI_Datatype recv_type, MPI_Comm comm) + +#define COLL_ALLGATHERVS(action, COLL_sep) \ +COLL_APPLY(action, COLL_ALLGATHERV_SIG, GB) COLL_sep \ +COLL_APPLY(action, COLL_ALLGATHERV_SIG, pair) COLL_sep \ +COLL_APPLY(action, COLL_ALLGATHERV_SIG, ring) COLL_sep \ +COLL_APPLY(action, COLL_ALLGATHERV_SIG, ompi) + +COLL_ALLGATHERVS(COLL_PROTO, COLL_NOsep) /************* * ALLREDUCE * @@ -64,17 +77,19 @@ COLL_APPLY(action, COLL_ALLREDUCE_SIG, lr) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, NTS) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, rab1) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, rab2) COLL_sep \ -COLL_NOTHING(COLL_APPLY(action, COLL_ALLREDUCE_SIG, rab_rdb) COLL_sep) \ +COLL_APPLY(action, COLL_ALLREDUCE_SIG, rab_rdb) COLL_sep \ COLL_NOTHING(COLL_APPLY(action, COLL_ALLREDUCE_SIG, rab_reduce_scatter) COLL_sep) \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, rab_rsag) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, rdb) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, smp_binomial) COLL_sep \ -COLL_NOTHING(COLL_APPLY(action, COLL_ALLREDUCE_SIG, smp_binomial_pipeline) COLL_sep) \ +COLL_APPLY(action, COLL_ALLREDUCE_SIG, smp_binomial_pipeline) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, smp_rdb) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, smp_rsag) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, smp_rsag_lr) COLL_sep \ COLL_APPLY(action, COLL_ALLREDUCE_SIG, smp_rsag_rab) COLL_sep \ -COLL_APPLY(action, COLL_ALLREDUCE_SIG, redbcast) +COLL_APPLY(action, COLL_ALLREDUCE_SIG, redbcast) COLL_sep \ +COLL_APPLY(action, COLL_ALLREDUCE_SIG, ompi) COLL_sep \ +COLL_APPLY(action, COLL_ALLREDUCE_SIG, ompi_ring_segmented) COLL_ALLREDUCES(COLL_PROTO, COLL_NOsep) @@ -100,10 +115,32 @@ COLL_APPLY(action, COLL_ALLTOALL_SIG, ring) COLL_sep \ COLL_APPLY(action, COLL_ALLTOALL_SIG, ring_light_barrier) COLL_sep \ COLL_APPLY(action, COLL_ALLTOALL_SIG, ring_mpi_barrier) COLL_sep \ COLL_APPLY(action, COLL_ALLTOALL_SIG, ring_one_barrier) COLL_sep \ -COLL_APPLY(action, COLL_ALLTOALL_SIG, simple) +COLL_APPLY(action, COLL_ALLTOALL_SIG, simple) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALL_SIG, ompi) 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, bruck) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, pair) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, pair_light_barrier) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, pair_mpi_barrier) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, pair_one_barrier) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, ring) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, ring_light_barrier) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, ring_mpi_barrier) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, ring_one_barrier) COLL_sep \ +COLL_APPLY(action, COLL_ALLTOALLV_SIG, ompi) + +COLL_ALLTOALLVS(COLL_PROTO, COLL_NOsep) /********* * BCAST * @@ -128,7 +165,9 @@ 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, ompi) COLL_sep \ +COLL_APPLY(action, COLL_BCAST_SIG, ompi_split_bintree) COLL_sep \ +COLL_APPLY(action, COLL_BCAST_SIG, ompi_pipeline) COLL_BCASTS(COLL_PROTO, COLL_NOsep) @@ -145,7 +184,8 @@ COLL_APPLY(action, COLL_REDUCE_SIG, arrival_pattern_aware) COLL_sep \ COLL_APPLY(action, COLL_REDUCE_SIG, binomial) COLL_sep \ COLL_APPLY(action, COLL_REDUCE_SIG, flat_tree) COLL_sep \ COLL_APPLY(action, COLL_REDUCE_SIG, NTSL) COLL_sep \ -COLL_APPLY(action, COLL_REDUCE_SIG, scatter_gather) +COLL_APPLY(action, COLL_REDUCE_SIG, scatter_gather) COLL_sep \ +COLL_APPLY(action, COLL_REDUCE_SIG, ompi) COLL_REDUCES(COLL_PROTO, COLL_NOsep)