Skip to content
Snippets Groups Projects
Commit c4908216 authored by Franck Dary's avatar Franck Dary
Browse files

Removed factor 100 for loss print

parent 5c948074
Branches
No related tags found
No related merge requests found
...@@ -271,7 +271,7 @@ int MacaonTrain::main() ...@@ -271,7 +271,7 @@ int MacaonTrain::main()
if (computeDevScore) if (computeDevScore)
toAdd = fmt::format("{}({}{}),", score.second, util::shrink(fmt::format("{:.2f}", std::abs(score.first)),7), score.first >= 0 ? "%" : ""); toAdd = fmt::format("{}({}{}),", score.second, util::shrink(fmt::format("{:.2f}", std::abs(score.first)),7), score.first >= 0 ? "%" : "");
else 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; devScoreMean += score.first;
devScoresStr += toAdd; devScoresStr += toAdd;
...@@ -297,7 +297,7 @@ int MacaonTrain::main() ...@@ -297,7 +297,7 @@ int MacaonTrain::main()
if (printAdvancement) if (printAdvancement)
fmt::print(stderr, "\r{:80}\r", ""); 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); fmt::print(stderr, "{}\n", iterStr);
std::FILE * f = std::fopen(trainInfos.c_str(), "a"); std::FILE * f = std::fopen(trainInfos.c_str(), "a");
fmt::print(f, "{}\t{}\n", iterStr, devScoreMean); fmt::print(f, "{}\t{}\n", iterStr, devScoreMean);
......
...@@ -252,7 +252,7 @@ float Trainer::processDataset(DataLoader & loader, bool train, bool printAdvance ...@@ -252,7 +252,7 @@ float Trainer::processDataset(DataLoader & loader, bool train, bool printAdvance
pastTime = actualTime; pastTime = actualTime;
auto speed = (int)(nbExamplesProcessed/seconds); auto speed = (int)(nbExamplesProcessed/seconds);
auto progression = 100.0*totalNbExamplesProcessed / nbExamples; 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) if (train)
fmt::print(stderr, "\r{:80}\rtraining : {}", "", statusStr); fmt::print(stderr, "\r{:80}\rtraining : {}", "", statusStr);
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment