X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee52f84fe512219acf534c4d4654c3df56659e91..91bb8b44ef09735fc79f40a3d9eeb69456a46909:/src/smpi/colls/colls.h diff --git a/src/smpi/colls/colls.h b/src/smpi/colls/colls.h index a2091b10e2..b70a313966 100644 --- a/src/smpi/colls/colls.h +++ b/src/smpi/colls/colls.h @@ -54,7 +54,6 @@ 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 \ 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 \ @@ -89,6 +88,7 @@ COLL_APPLY(action, COLL_ALLGATHERV_SIG, ompi_neighborexchange) COLL_sep \ COLL_APPLY(action, COLL_ALLGATHERV_SIG, ompi_bruck) COLL_sep \ COLL_APPLY(action, COLL_ALLGATHERV_SIG, mpich) COLL_sep \ COLL_APPLY(action, COLL_ALLGATHERV_SIG, mpich_rdb) COLL_sep \ +COLL_APPLY(action, COLL_ALLGATHERV_SIG, mpich_ring) COLL_sep \ COLL_APPLY(action, COLL_ALLGATHERV_SIG, automatic) COLL_ALLGATHERVS(COLL_PROTO, COLL_NOsep) @@ -102,12 +102,9 @@ COLL_ALLGATHERVS(COLL_PROTO, COLL_NOsep) #define COLL_ALLREDUCES(action, COLL_sep) \ 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_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_APPLY(action, COLL_ALLREDUCE_SIG, smp_binomial_pipeline) COLL_sep \ @@ -145,10 +142,8 @@ 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_sep \ COLL_APPLY(action, COLL_ALLTOALL_SIG, ompi) COLL_sep \ COLL_APPLY(action, COLL_ALLTOALL_SIG, mpich) COLL_sep \ -COLL_APPLY(action, COLL_ALLTOALL_SIG, ompi_pairwise) COLL_sep \ COLL_APPLY(action, COLL_ALLTOALL_SIG, automatic) COLL_ALLTOALLS(COLL_PROTO, COLL_NOsep) @@ -186,7 +181,6 @@ COLL_ALLTOALLVS(COLL_PROTO, COLL_NOsep) int root, MPI_Comm comm) #define COLL_BCASTS(action, COLL_sep) \ -COLL_APPLY(action, COLL_BCAST_SIG, arrival_nb) COLL_sep \ COLL_APPLY(action, COLL_BCAST_SIG, arrival_pattern_aware) COLL_sep \ COLL_APPLY(action, COLL_BCAST_SIG, arrival_pattern_aware_wait) COLL_sep \ COLL_APPLY(action, COLL_BCAST_SIG, arrival_scatter) COLL_sep \