From: Christian Heinrich Date: Thu, 21 Jun 2018 14:17:03 +0000 (+0200) Subject: [TRACING] Rename TIT action allToAllV -> alltoallv X-Git-Tag: v3.20~25 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ad9d30d1d8263ea293be8a4ec7146a39079fa976?hp=ed8665d72a06a57d93a5aded32ebd4ae4dc46e11 [TRACING] Rename TIT action allToAllV -> alltoallv --- diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/replay.hpp index 9aa711061b..b933032d8f 100644 --- a/include/simgrid/smpi/replay.hpp +++ b/include/simgrid/smpi/replay.hpp @@ -319,7 +319,7 @@ public: class AllToAllVAction : public ReplayAction { public: - explicit AllToAllVAction() : ReplayAction("allToAllV") {} + explicit AllToAllVAction() : ReplayAction("alltoallv") {} void kernel(simgrid::xbt::ReplayAction& action) override; }; } diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index d2e367535c..2535d096f0 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -76,7 +76,7 @@ public: , recv_size(recv_size) , send_type(send_type) , recv_type(recv_type){}; - // VarCollTI: gatherv, scatterv, allgatherv, allToAllV (+ reducescatter out of laziness) + // VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness) explicit TIData(std::string name, int root, int send_size, std::vector* sendcounts, int recv_size, std::vector* recvcounts, std::string send_type, std::string recv_type) : TIData(name, root, send_size, std::shared_ptr>(sendcounts), recv_size, diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index 4e0e8bf173..a29ba4d7c9 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -657,7 +657,7 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype } TRACE_smpi_comm_in(rank, __func__, - new simgrid::instr::VarCollTIData("allToAllV", -1, send_size, trace_sendcounts, recv_size, + new simgrid::instr::VarCollTIData("alltoallv", -1, send_size, trace_sendcounts, recv_size, trace_recvcounts, simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index ee61fe5712..5d5bf7f981 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -362,8 +362,8 @@ void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::stri void AllToAllVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) { - /* The structure of the allToAllV action for the rank 0 (total 4 processes) is the following: - 0 allToAllV 100 1 7 10 12 100 1 70 10 5 + /* The structure of the alltoallv action for the rank 0 (total 4 processes) is the following: + 0 alltoallv 100 1 7 10 12 100 1 70 10 5 where: 1) 100 is the size of the send buffer *sizeof(int), 2) 1 7 10 12 is the sendcounts array @@ -686,7 +686,7 @@ void AllToAllVAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::VarCollTIData( - "allToAllV", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, + "alltoallv", -1, args.send_size_sum, args.sendcounts, args.recv_size_sum, args.recvcounts, Datatype::encode(args.datatype1), Datatype::encode(args.datatype2))); Colls::alltoallv(send_buffer(args.send_buf_size * args.datatype1->size()), args.sendcounts->data(), args.senddisps.data(), args.datatype1, @@ -729,7 +729,7 @@ void smpi_replay_init(int* argc, char*** argv) xbt_replay_action_register("reduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceAction().execute(action); }); xbt_replay_action_register("allreduce", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllReduceAction().execute(action); }); xbt_replay_action_register("allToAll", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllAction().execute(action); }); - xbt_replay_action_register("allToAllV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllVAction().execute(action); }); + xbt_replay_action_register("alltoallv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::AllToAllVAction().execute(action); }); xbt_replay_action_register("gather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("gather").execute(action); }); xbt_replay_action_register("scatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterAction().execute(action); }); xbt_replay_action_register("gatherv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("gatherv").execute(action); });