Skip to content

Commit 1dcda1a

Browse files
committed
LSTMRecognizer: Use new serialization API
Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 45a7ccf commit 1dcda1a

File tree

1 file changed

+14
-22
lines changed

1 file changed

+14
-22
lines changed

src/lstm/lstmrecognizer.cpp

+14-22
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,13 @@ bool LSTMRecognizer::Serialize(const TessdataManager* mgr, TFile* fp) const {
8484
if (!network_->Serialize(fp)) return false;
8585
if (include_charsets && !GetUnicharset().save_to_file(fp)) return false;
8686
if (!network_str_.Serialize(fp)) return false;
87-
if (fp->FWrite(&training_flags_, sizeof(training_flags_), 1) != 1)
88-
return false;
89-
if (fp->FWrite(&training_iteration_, sizeof(training_iteration_), 1) != 1)
90-
return false;
91-
if (fp->FWrite(&sample_iteration_, sizeof(sample_iteration_), 1) != 1)
92-
return false;
93-
if (fp->FWrite(&null_char_, sizeof(null_char_), 1) != 1) return false;
94-
if (fp->FWrite(&adam_beta_, sizeof(adam_beta_), 1) != 1) return false;
95-
if (fp->FWrite(&learning_rate_, sizeof(learning_rate_), 1) != 1) return false;
96-
if (fp->FWrite(&momentum_, sizeof(momentum_), 1) != 1) return false;
87+
if (!fp->Serialize(&training_flags_)) return false;
88+
if (!fp->Serialize(&training_iteration_)) return false;
89+
if (!fp->Serialize(&sample_iteration_)) return false;
90+
if (!fp->Serialize(&null_char_)) return false;
91+
if (!fp->Serialize(&adam_beta_)) return false;
92+
if (!fp->Serialize(&learning_rate_)) return false;
93+
if (!fp->Serialize(&momentum_)) return false;
9794
if (include_charsets && IsRecoding() && !recoder_.Serialize(fp)) return false;
9895
return true;
9996
}
@@ -109,18 +106,13 @@ bool LSTMRecognizer::DeSerialize(const TessdataManager* mgr, TFile* fp) {
109106
if (include_charsets && !ccutil_.unicharset.load_from_file(fp, false))
110107
return false;
111108
if (!network_str_.DeSerialize(fp)) return false;
112-
if (fp->FReadEndian(&training_flags_, sizeof(training_flags_), 1) != 1)
113-
return false;
114-
if (fp->FReadEndian(&training_iteration_, sizeof(training_iteration_), 1) !=
115-
1)
116-
return false;
117-
if (fp->FReadEndian(&sample_iteration_, sizeof(sample_iteration_), 1) != 1)
118-
return false;
119-
if (fp->FReadEndian(&null_char_, sizeof(null_char_), 1) != 1) return false;
120-
if (fp->FReadEndian(&adam_beta_, sizeof(adam_beta_), 1) != 1) return false;
121-
if (fp->FReadEndian(&learning_rate_, sizeof(learning_rate_), 1) != 1)
122-
return false;
123-
if (fp->FReadEndian(&momentum_, sizeof(momentum_), 1) != 1) return false;
109+
if (!fp->DeSerialize(&training_flags_)) return false;
110+
if (!fp->DeSerialize(&training_iteration_)) return false;
111+
if (!fp->DeSerialize(&sample_iteration_)) return false;
112+
if (!fp->DeSerialize(&null_char_)) return false;
113+
if (!fp->DeSerialize(&adam_beta_)) return false;
114+
if (!fp->DeSerialize(&learning_rate_)) return false;
115+
if (!fp->DeSerialize(&momentum_)) return false;
124116
if (include_charsets && !LoadRecoder(fp)) return false;
125117
if (!include_charsets && !LoadCharsets(mgr)) return false;
126118
network_->SetRandomizer(&randomizer_);

0 commit comments

Comments
 (0)