From: Christian Heinrich Date: Thu, 21 Jun 2018 14:10:16 +0000 (+0200) Subject: [TRACING] Rename TIT action scatterV -> scatterv X-Git-Tag: v3.20~30 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ee0065a64fccf2b975b69537eed87ea499c72dfb?hp=dabc974c900a0e86479655752a6c915385d670e7 [TRACING] Rename TIT action scatterV -> scatterv --- diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/replay.hpp index e933f6bd73..1b3152a7a6 100644 --- a/include/simgrid/smpi/replay.hpp +++ b/include/simgrid/smpi/replay.hpp @@ -307,7 +307,7 @@ public: class ScatterVAction : public ReplayAction { public: - explicit ScatterVAction() : ReplayAction("scatterV") {} + explicit ScatterVAction() : ReplayAction("scatterv") {} void kernel(simgrid::xbt::ReplayAction& action) override; }; diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 48fc023878..241f7c48f7 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 21b287c18b..c5beb65949 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -307,7 +307,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::VarCollTIData( - "scatterV", root, dt_size_send, trace_sendcounts, + "scatterv", root, dt_size_send, trace_sendcounts, recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), nullptr, 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 b52b9ba74d..f2f7f22995 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -733,7 +733,7 @@ void smpi_replay_init(int* argc, char*** argv) 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); }); - xbt_replay_action_register("scatterV", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterVAction().execute(action); }); + xbt_replay_action_register("scatterv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ScatterVAction().execute(action); }); xbt_replay_action_register("allGather", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherAction("allGather").execute(action); }); xbt_replay_action_register("allgatherv", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::GatherVAction("allgatherv").execute(action); }); xbt_replay_action_register("reduceScatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceScatterAction().execute(action); });