diff --git a/reading_machine/include/ReadingMachine.hpp b/reading_machine/include/ReadingMachine.hpp index 8a51466a99a84e5b05bc334e8c4d8918082f6897..34f174569e1336d7417c29a63dc9b9a54f9f8d34 100644 --- a/reading_machine/include/ReadingMachine.hpp +++ b/reading_machine/include/ReadingMachine.hpp @@ -53,6 +53,7 @@ class ReadingMachine void saveLast() const; void saveDicts() const; bool dictsAreNew() const; + void loadLastSaved(); }; #endif diff --git a/reading_machine/src/ReadingMachine.cpp b/reading_machine/src/ReadingMachine.cpp index 70d81237d1e1f6663142a21eff8e25f163941a30..ec05ad56819e8c8be1de133c86bfbd0622c7e7eb 100644 --- a/reading_machine/src/ReadingMachine.cpp +++ b/reading_machine/src/ReadingMachine.cpp @@ -5,10 +5,7 @@ ReadingMachine::ReadingMachine(std::filesystem::path path) : path(path) { readFromFile(path); - auto lastSavedModel = util::findFilesByExtension(path.parent_path(), fmt::format(ReadingMachine::lastModelFilename, "")); auto savedDicts = util::findFilesByExtension(path.parent_path(), fmt::format(ReadingMachine::defaultDictFilename, "")); - if (!lastSavedModel.empty()) - torch::load(classifier->getNN(), lastSavedModel[0]); for (auto path : savedDicts) this->dicts.emplace(path.stem().string(), Dict{path.c_str(), Dict::State::Open}); @@ -207,3 +204,10 @@ bool ReadingMachine::dictsAreNew() const return _dictsAreNew; } +void ReadingMachine::loadLastSaved() +{ + auto lastSavedModel = util::findFilesByExtension(path.parent_path(), fmt::format(ReadingMachine::lastModelFilename, "")); + if (!lastSavedModel.empty()) + torch::load(classifier->getNN(), lastSavedModel[0]); +} + diff --git a/trainer/src/MacaonTrain.cpp b/trainer/src/MacaonTrain.cpp index 3bb18a2f6a97575949daac332bc82eb8d32748f6..86acd6b662778321277fbe7e9254fa49147b1d61 100644 --- a/trainer/src/MacaonTrain.cpp +++ b/trainer/src/MacaonTrain.cpp @@ -106,8 +106,6 @@ int MacaonTrain::main() ReadingMachine machine(machinePath.string()); - fmt::print(stderr, "[{}] Model has {} parameters\n", util::getTime(), util::int2HumanStr(machine.getClassifier()->getNbParameters())); - BaseConfig goldConfig(mcdFile, trainTsvFile, trainRawFile); BaseConfig devGoldConfig(mcdFile, computeDevScore ? (devRawFile.empty() ? devTsvFile : "") : devTsvFile, devRawFile); @@ -136,8 +134,11 @@ int MacaonTrain::main() for (auto & it : machine.getDicts()) maxDictSize = std::max<std::size_t>(maxDictSize, it.second.size()); machine.getClassifier()->getNN()->registerEmbeddings(maxDictSize); + machine.loadLastSaved(); machine.getClassifier()->getNN()->to(NeuralNetworkImpl::device); + fmt::print(stderr, "[{}] Model has {} parameters\n", util::getTime(), util::int2HumanStr(machine.getClassifier()->getNbParameters())); + float bestDevScore = computeDevScore ? std::numeric_limits<float>::min() : std::numeric_limits<float>::max(); auto trainInfos = machinePath.parent_path() / "train.info";