From 93d811622222dd8585da7e210069976ab9675598 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20B=C3=A9daride?= Date: Mon, 8 Apr 2013 14:50:52 +0200 Subject: [PATCH] change collective calls in smpi_replay --- src/smpi/smpi_replay.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/smpi/smpi_replay.c b/src/smpi/smpi_replay.c index dfc0d229e5..930239e84b 100644 --- a/src/smpi/smpi_replay.c +++ b/src/smpi/smpi_replay.c @@ -452,7 +452,7 @@ static void action_reduce(const char *const *action) int root_traced = smpi_group_rank(smpi_comm_group(MPI_COMM_WORLD), 0); TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__); #endif - smpi_mpi_reduce(NULL, NULL, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD); + mpi_coll_reduce_fun(NULL, NULL, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD); smpi_execute_flops(comp_size); #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__); @@ -475,9 +475,9 @@ static void action_allReduce(const char *const *action) { TRACE_smpi_computing_out(rank); TRACE_smpi_collective_in(rank, -1, __FUNCTION__); #endif - smpi_mpi_reduce(NULL, NULL, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, 0, MPI_COMM_WORLD); + mpi_coll_reduce_fun(NULL, NULL, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, 0, MPI_COMM_WORLD); smpi_execute_flops(comp_size); - smpi_mpi_bcast(NULL, comm_size, MPI_CURRENT_TYPE, 0, MPI_COMM_WORLD); + mpi_coll_bcast_fun(NULL, comm_size, MPI_CURRENT_TYPE, 0, MPI_COMM_WORLD); #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); TRACE_smpi_computing_in(rank); @@ -502,20 +502,8 @@ static void action_allToAll(const char *const *action) { TRACE_smpi_computing_out(rank); TRACE_smpi_collective_in(rank, -1, __FUNCTION__); #endif - - if (send_size < 200 && comm_size > 12) { - smpi_coll_tuned_alltoall_bruck(send, send_size, MPI_CURRENT_TYPE, - recv, recv_size, MPI_CURRENT_TYPE, - MPI_COMM_WORLD); - } else if (send_size < 3000) { - smpi_coll_tuned_alltoall_basic_linear(send, send_size, MPI_CURRENT_TYPE, - recv, recv_size, MPI_CURRENT_TYPE, - MPI_COMM_WORLD); - } else { - smpi_coll_tuned_alltoall_pairwise(send, send_size, MPI_CURRENT_TYPE, - recv, recv_size, MPI_CURRENT_TYPE, - MPI_COMM_WORLD); - } + + mpi_coll_alltoall_fun(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE, MPI_COMM_WORLD); #ifdef HAVE_TRACING TRACE_smpi_collective_out(rank, -1, __FUNCTION__); -- 2.20.1