X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f01052cf1a094dd5df8869e4b26431b1efb6abb0..89d7a404bbe64b7f19e6743d2979468f1cac42a2:/src/smpi/colls/smpi_automatic_selector.cpp diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp index 34b9abd33b..77c0b0c90f 100644 --- a/src/smpi/colls/smpi_automatic_selector.cpp +++ b/src/smpi/colls/smpi_automatic_selector.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2023. 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. */ @@ -28,7 +28,7 @@ simgrid::instr::Container::get_root()->get_type()->by_name_or_create( \ _XBT_STRINGIFY(cat)); \ \ - std::string cont_name = std::string("rank-" + std::to_string(simgrid::s4u::this_actor::get_pid())); \ + std::string cont_name = "rank-" + std::to_string(simgrid::s4u::this_actor::get_pid()); \ type->add_entity_value(desc->name, "1.0 1.0 1.0"); \ new simgrid::instr::NewEvent(simgrid::s4u::Engine::get_clock(), simgrid::instr::Container::by_name(cont_name), \ type, type->get_entity_value(desc->name)); \ @@ -63,8 +63,7 @@ return (min_coll != -1) ? MPI_SUCCESS : MPI_ERR_INTERN; \ } -namespace simgrid{ -namespace smpi{ +namespace simgrid::smpi { COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLGATHERV_SIG, (send_buff, send_count, send_type, recv_buff, recv_count, recv_disps, recv_type, comm)) COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_ALLREDUCE_SIG, (sbuf, rbuf, rcount, dtype, op, comm)) @@ -78,5 +77,4 @@ COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_REDUCE_SCATTER_SIG ,(sbuf,rbuf, rcounts,dt COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_SCATTER_SIG ,(sendbuf, sendcount, sendtype,recvbuf, recvcount, recvtype,root, comm)) COLL_APPLY(AUTOMATIC_COLL_BENCH, COLL_BARRIER_SIG,(comm)) -} -} +} // namespace simgrid::smpi