From: Christian Heinrich Date: Thu, 21 Jun 2018 14:11:33 +0000 (+0200) Subject: [TRACING] Rename TIT action reduceScatter -> reducescatter X-Git-Tag: v3.20~29 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/246388d21097723092dfc24d709231ff2b493010?hp=ee0065a64fccf2b975b69537eed87ea499c72dfb [TRACING] Rename TIT action reduceScatter -> reducescatter --- diff --git a/examples/smpi/replay/actions_reducescatter.txt b/examples/smpi/replay/actions_reducescatter.txt index ac91f0f63e..692183a64e 100644 --- a/examples/smpi/replay/actions_reducescatter.txt +++ b/examples/smpi/replay/actions_reducescatter.txt @@ -3,10 +3,10 @@ 2 init 3 init -0 reduceScatter 275427 275427 275427 204020 11349173 0 -1 reduceScatter 275427 275427 275427 204020 12396024 0 -2 reduceScatter 275427 275427 275427 204020 12501522 0 -3 reduceScatter 275427 275427 275427 204020 12403123 0 +0 reducescatter 275427 275427 275427 204020 11349173 0 +1 reducescatter 275427 275427 275427 204020 12396024 0 +2 reducescatter 275427 275427 275427 204020 12501522 0 +3 reducescatter 275427 275427 275427 204020 12403123 0 0 finalize 1 finalize diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/replay.hpp index 1b3152a7a6..9aa711061b 100644 --- a/include/simgrid/smpi/replay.hpp +++ b/include/simgrid/smpi/replay.hpp @@ -313,7 +313,7 @@ public: class ReduceScatterAction : public ReplayAction { public: - explicit ReduceScatterAction() : ReplayAction("reduceScatter") {} + explicit ReduceScatterAction() : ReplayAction("reducescatter") {} void kernel(simgrid::xbt::ReplayAction& action) override; }; diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 241f7c48f7..4bbb1e8fdb 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 c5beb65949..6fa2231507 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -500,7 +500,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat } TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::VarCollTIData( - "reduceScatter", -1, dt_send_size, nullptr, -1, trace_recvcounts, + "reducescatter", -1, dt_send_size, nullptr, -1, trace_recvcounts, simgrid::smpi::Datatype::encode(datatype), "")); simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm); @@ -543,7 +543,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, } TRACE_smpi_comm_in(rank, __func__, - new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts, + new simgrid::instr::VarCollTIData("reducescatter", -1, 0, nullptr, -1, trace_recvcounts, simgrid::smpi::Datatype::encode(datatype), "")); int* recvcounts = new int[count]; diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index f2f7f22995..774cec5574 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -341,7 +341,7 @@ void ScatterVArgParser::parse(simgrid::xbt::ReplayAction& action, std::string na void ReduceScatterArgParser::parse(simgrid::xbt::ReplayAction& action, std::string name) { /* The structure of the reducescatter action for the rank 0 (total 4 processes) is the following: - 0 reduceScatter 275427 275427 275427 204020 11346849 0 + 0 reducescatter 275427 275427 275427 204020 11346849 0 where: 1) The first four values after the name of the action declare the recvcounts array 2) The value 11346849 is the amount of instructions @@ -670,7 +670,7 @@ void ScatterVAction::kernel(simgrid::xbt::ReplayAction& action) void ReduceScatterAction::kernel(simgrid::xbt::ReplayAction& action) { TRACE_smpi_comm_in(my_proc_id, "action_reducescatter", - new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, args.recvcounts, + new simgrid::instr::VarCollTIData("reducescatter", -1, 0, nullptr, -1, args.recvcounts, std::to_string(args.comp_size), /* ugly hack to print comp_size */ Datatype::encode(args.datatype1))); @@ -736,7 +736,7 @@ void smpi_replay_init(int* argc, char*** argv) 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); }); + xbt_replay_action_register("reducescatter", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ReduceScatterAction().execute(action); }); xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().execute(action); }); //if we have a delayed start, sleep here.