From 6d18625ebd53e7e4218e8892aea37a64449f1f27 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Thu, 21 Jun 2018 16:02:20 +0200 Subject: [PATCH] [TRACING] allGatherV -> allgatherv --- examples/smpi/replay/actions_allgatherv.txt | 8 ++++---- examples/smpi/replay/replay.tesh | 8 ++++---- src/instr/instr_private.hpp | 2 +- src/smpi/bindings/smpi_pmpi_coll.cpp | 2 +- src/smpi/internals/smpi_replay.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/smpi/replay/actions_allgatherv.txt b/examples/smpi/replay/actions_allgatherv.txt index d5d4024aae..106678f11f 100644 --- a/examples/smpi/replay/actions_allgatherv.txt +++ b/examples/smpi/replay/actions_allgatherv.txt @@ -3,10 +3,10 @@ 2 init 3 init -0 allGatherV 275427 275427 275427 275427 204020 0 0 -1 allGatherV 275427 275427 275427 275427 204020 0 0 -2 allGatherV 275427 275427 275427 275427 204020 0 0 -3 allGatherV 204020 275427 275427 275427 204020 0 0 +0 allgatherv 275427 275427 275427 275427 204020 0 0 +1 allgatherv 275427 275427 275427 275427 204020 0 0 +2 allgatherv 275427 275427 275427 275427 204020 0 0 +3 allgatherv 204020 275427 275427 275427 204020 0 0 0 finalize 1 finalize diff --git a/examples/smpi/replay/replay.tesh b/examples/smpi/replay/replay.tesh index 6c7e0c4b95..8f444e4dfe 100644 --- a/examples/smpi/replay/replay.tesh +++ b/examples/smpi/replay/replay.tesh @@ -323,10 +323,10 @@ p Test of AllGatherv replay with SMPI (one trace for all processes) $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -no-privatize -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/simulate-computation:no -np 4 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning -> [Tremblay:0:(1) 1.397261] [smpi_replay/VERBOSE] 0 allGatherV 275427 275427 275427 275427 204020 0 0 1.397261 -> [Ginette:3:(4) 1.760421] [smpi_replay/VERBOSE] 3 allGatherV 204020 275427 275427 275427 204020 0 0 1.760421 -> [Fafard:2:(3) 1.941986] [smpi_replay/VERBOSE] 2 allGatherV 275427 275427 275427 275427 204020 0 0 1.941986 -> [Jupiter:1:(2) 1.941986] [smpi_replay/VERBOSE] 1 allGatherV 275427 275427 275427 275427 204020 0 0 1.941986 +> [Tremblay:0:(1) 1.397261] [smpi_replay/VERBOSE] 0 allgatherv 275427 275427 275427 275427 204020 0 0 1.397261 +> [Ginette:3:(4) 1.760421] [smpi_replay/VERBOSE] 3 allgatherv 204020 275427 275427 275427 204020 0 0 1.760421 +> [Fafard:2:(3) 1.941986] [smpi_replay/VERBOSE] 2 allgatherv 275427 275427 275427 275427 204020 0 0 1.941986 +> [Jupiter:1:(2) 1.941986] [smpi_replay/VERBOSE] 1 allgatherv 275427 275427 275427 275427 204020 0 0 1.941986 > [Jupiter:1:(2) 1.941986] [smpi_replay/INFO] Simulation time 1.941986 $ rm -f replay/one_trace diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 502ffb311e..c3a35b6f4a 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 ce321238a3..21b287c18b 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -224,7 +224,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::VarCollTIData( - "allGatherV", -1, sendtype->is_replayable() ? sendcount : sendcount * sendtype->size(), + "allgatherv", -1, sendtype->is_replayable() ? sendcount : sendcount * sendtype->size(), nullptr, dt_size_recv, 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 ca1cbe2582..f01b7f2e3a 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -735,7 +735,7 @@ void smpi_replay_init(int* argc, char*** argv) 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("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("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("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().execute(action); }); -- 2.20.1