X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84f6ab110aa0bbbb1c02733c276c5ef72d65935e..cc63d7b267be4c20633a0be7db63b3d88030bee6:/src/smpi/colls/reduce-arrival-pattern-aware.c diff --git a/src/smpi/colls/reduce-arrival-pattern-aware.c b/src/smpi/colls/reduce-arrival-pattern-aware.c index 7ae69a8fda..920a15c836 100644 --- a/src/smpi/colls/reduce-arrival-pattern-aware.c +++ b/src/smpi/colls/reduce-arrival-pattern-aware.c @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "colls_private.h" //#include @@ -18,9 +24,7 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf, MPI_Op op, int root, MPI_Comm comm) { - int rank; - rank = smpi_comm_rank(comm); - + int rank = smpi_comm_rank(comm); int tag = -COLL_TAG_REDUCE; MPI_Status status; MPI_Request request; @@ -31,7 +35,7 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf, MPI_Status temp_status_array[MAX_NODE]; - int size; + int size = smpi_comm_size(comm); int i; int sent_count; @@ -48,10 +52,6 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf, /* source and destination */ int to, from; - size=smpi_comm_size(comm); - rank=smpi_comm_rank(comm); - - /* segment is segment size in number of elements (not bytes) */ int segment = reduce_arrival_pattern_aware_segment_size_in_byte / extent; @@ -179,8 +179,7 @@ int smpi_coll_tuned_reduce_arrival_pattern_aware(void *buf, void *rbuf, to = header_buf[myordering + 1]; } from = header_buf[myordering - 1]; - smpi_mpi_recv(tmp_buf, count, datatype, header_buf[myordering - 1], tag, - comm, &status); + smpi_mpi_recv(tmp_buf, count, datatype, from, tag, comm, &status); smpi_op_apply(op, tmp_buf, rbuf, &count, &datatype); smpi_mpi_send(rbuf, count, datatype, to, tag, comm); }