X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5089a0a98b27f5eeee62321dff4f025f1648f025..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp diff --git a/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp b/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp index 0ceb9d8168..c55600838e 100644 --- a/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp +++ b/src/smpi/colls/bcast/bcast-NTSL-Isend.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. +/* Copyright (c) 2013-2023. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,8 +11,7 @@ static int bcast_NTSL_segment_size_in_byte = 8192; /* Non-topology-specific pipelined linear-bcast function 0->1, 1->2 ,2->3, ....., ->last node : in a pipeline fashion */ -namespace simgrid{ -namespace smpi{ +namespace simgrid::smpi { int bcast__NTSL_Isend(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) { @@ -72,10 +71,10 @@ int bcast__NTSL_Isend(void *buf, int count, MPI_Datatype datatype, /* pipeline bcast */ else { - MPI_Request* send_request_array = new MPI_Request[size + pipe_length]; - MPI_Request* recv_request_array = new MPI_Request[size + pipe_length]; - MPI_Status* send_status_array = new MPI_Status[size + pipe_length]; - MPI_Status* recv_status_array = new MPI_Status[size + pipe_length]; + auto* send_request_array = new MPI_Request[size + pipe_length]; + auto* recv_request_array = new MPI_Request[size + pipe_length]; + auto* send_status_array = new MPI_Status[size + pipe_length]; + auto* recv_status_array = new MPI_Status[size + pipe_length]; /* root send data */ if (rank == 0) { @@ -115,15 +114,12 @@ int bcast__NTSL_Isend(void *buf, int count, MPI_Datatype datatype, delete[] recv_status_array; } /* end pipeline */ - /* when count is not divisible by block size, use default BCAST for the remainder */ if ((remainder != 0) && (count > segment)) { - XBT_WARN("MPI_bcast_NTSL_Isend_nb use default MPI_bcast."); - Colls::bcast((char *) buf + (pipe_length * increment), remainder, datatype, - root, comm); + XBT_INFO("MPI_bcast_NTSL_Isend_nb: count is not divisible by block size, use default MPI_bcast for remainder."); + colls::bcast((char*)buf + (pipe_length * increment), remainder, datatype, root, comm); } return MPI_SUCCESS; } -} -} +} // namespace simgrid::smpi