X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..611d822b02f836d7abe031cced6adc4281ef4356:/src/smpi/colls/allgather/allgather-rhv.cpp diff --git a/src/smpi/colls/allgather/allgather-rhv.cpp b/src/smpi/colls/allgather/allgather-rhv.cpp index e0d180c7f0..77d845d66f 100644 --- a/src/smpi/colls/allgather/allgather-rhv.cpp +++ b/src/smpi/colls/allgather/allgather-rhv.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2013-2017. The SimGrid Team. +/* Copyright (c) 2013-2018. 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 "../colls_private.hpp" namespace simgrid{ namespace smpi{ @@ -28,7 +28,7 @@ Coll_allgather_rhv::allgather(void *sbuf, int send_count, unsigned int mask; int curr_count; - // get size of the communicator, followed by rank + // get size of the communicator, followed by rank unsigned int num_procs = comm->size(); if((num_procs&(num_procs-1))) @@ -45,10 +45,10 @@ Coll_allgather_rhv::allgather(void *sbuf, int send_count, recv_chunk = r_extent * recv_count; if (send_chunk != recv_chunk) { - XBT_WARN("MPI_allgather_rhv use default MPI_allgather."); + XBT_WARN("MPI_allgather_rhv use default MPI_allgather."); Coll_allgather_default::allgather(sbuf, send_count, send_type, rbuf, recv_count, recv_type, comm); - return MPI_SUCCESS; + return MPI_SUCCESS; } // compute starting offset location to perform local copy @@ -94,10 +94,8 @@ Coll_allgather_rhv::allgather(void *sbuf, int send_count, // printf("node %d send to %d in phase %d s_offset = %d r_offset = %d count = %d\n",rank,dst,phase, send_base_offset, recv_base_offset, curr_count); - Request::sendrecv((char *)rbuf + send_offset, curr_count, recv_type, dst, tag, - (char *)rbuf + recv_offset, curr_count, recv_type, dst, tag, - comm, &status); - + Request::sendrecv((char*)rbuf + send_offset, curr_count, recv_type, dst, tag, (char*)rbuf + recv_offset, curr_count, + recv_type, dst, tag, comm, &status); curr_count *= 2; i *= 2;