From c4908216576e57a628e6dd3e00d2a99bc56d13dd Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Fri, 15 Jan 2021 15:10:10 +0100
Subject: [PATCH] Removed factor 100 for loss print
---
trainer/src/MacaonTrain.cpp | 4 ++--
trainer/src/Trainer.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/trainer/src/MacaonTrain.cpp b/trainer/src/MacaonTrain.cpp
index 0faad25..bc14ee5 100644
--- a/trainer/src/MacaonTrain.cpp
+++ b/trainer/src/MacaonTrain.cpp
@@ -271,7 +271,7 @@ int MacaonTrain::main()
if (computeDevScore)
toAdd = fmt::format("{}({}{}),", score.second, util::shrink(fmt::format("{:.2f}", std::abs(score.first)),7), score.first >= 0 ? "%" : "");
else
- toAdd = fmt::format("{}({}),", score.second, util::shrink(fmt::format("{}", 100.0*score.first),7));
+ toAdd = fmt::format("{}({}),", score.second, util::shrink(fmt::format("{}", score.first),7));
devScoreMean += score.first;
devScoresStr += toAdd;
@@ -297,7 +297,7 @@ int MacaonTrain::main()
if (printAdvancement)
fmt::print(stderr, "\r{:80}\r", "");
- std::string iterStr = fmt::format("[{}] Epoch {:^5} loss = {:7} dev = {} {:5}", util::getTime(), fmt::format("{}/{}", currentEpoch+1, nbEpoch), util::shrink(fmt::format("{}",100.0*loss), 7), devScoresStr, saved ? "SAVED" : "");
+ std::string iterStr = fmt::format("[{}] Epoch {:^5} loss = {:7} dev = {} {:5}", util::getTime(), fmt::format("{}/{}", currentEpoch+1, nbEpoch), util::shrink(fmt::format("{}",loss), 7), devScoresStr, saved ? "SAVED" : "");
fmt::print(stderr, "{}\n", iterStr);
std::FILE * f = std::fopen(trainInfos.c_str(), "a");
fmt::print(f, "{}\t{}\n", iterStr, devScoreMean);
diff --git a/trainer/src/Trainer.cpp b/trainer/src/Trainer.cpp
index ddb9d0c..5b30270 100644
--- a/trainer/src/Trainer.cpp
+++ b/trainer/src/Trainer.cpp
@@ -252,7 +252,7 @@ float Trainer::processDataset(DataLoader & loader, bool train, bool printAdvance
pastTime = actualTime;
auto speed = (int)(nbExamplesProcessed/seconds);
auto progression = 100.0*totalNbExamplesProcessed / nbExamples;
- auto statusStr = fmt::format("{:6.2f}% loss={:<7.3f} speed={:<6}ex/s", progression, lossSoFar, speed);
+ auto statusStr = fmt::format(lossSoFar/nbExamplesProcessed < 10.0 ? "{:6.2f}% loss={:<7.3f} speed={:<6}ex/s": "{:6.2f}% loss={:<7.0f} speed={:<6}ex/s", progression, lossSoFar / nbExamplesProcessed, speed);
if (train)
fmt::print(stderr, "\r{:80}\rtraining : {}", "", statusStr);
else
--
GitLab