Commit f5663151 for tesseract
commit f5663151448b167c643f0059579c27e5535be056
Author: Stefan Weil <sw@weilnetz.de>
Date: Sun Jun 21 08:17:59 2026 +0200
Remove more unused function parameters
Signed-off-by: Stefan Weil <sw@weilnetz.de>
diff --git a/src/lstm/convolve.cpp b/src/lstm/convolve.cpp
index 6cfaa06e..23c59313 100644
--- a/src/lstm/convolve.cpp
+++ b/src/lstm/convolve.cpp
@@ -52,8 +52,9 @@ bool Convolve::DeSerialize(TFile *fp) {
// Runs forward propagation of activations on the input line.
// See NetworkCpp for a detailed discussion of the arguments.
-void Convolve::Forward(bool debug, const NetworkIO &input, const TransposedArray *input_transpose,
- NetworkScratch *scratch, NetworkIO *output) {
+void Convolve::Forward(bool debug, const NetworkIO &input,
+ const TransposedArray * /*input_transpose*/,
+ NetworkScratch * /*scratch*/, NetworkIO *output) {
output->Resize(input, no_);
int y_scale = 2 * half_y_ + 1;
StrideMap::Index dest_index(output->stride_map());
@@ -89,7 +90,7 @@ void Convolve::Forward(bool debug, const NetworkIO &input, const TransposedArray
// Runs backward propagation of errors on the deltas line.
// See NetworkCpp for a detailed discussion of the arguments.
-bool Convolve::Backward(bool debug, const NetworkIO &fwd_deltas, NetworkScratch *scratch,
+bool Convolve::Backward(bool /*debug*/, const NetworkIO &fwd_deltas, NetworkScratch *scratch,
NetworkIO *back_deltas) {
back_deltas->Resize(fwd_deltas, ni_);
NetworkScratch::IO delta_sum;
diff --git a/src/lstm/fullyconnected.cpp b/src/lstm/fullyconnected.cpp
index 16204344..a0ee1b02 100644
--- a/src/lstm/fullyconnected.cpp
+++ b/src/lstm/fullyconnected.cpp
@@ -158,7 +158,7 @@ void FullyConnected::Forward(bool debug, const NetworkIO &input,
#endif
TFloat *temp_line = temp_lines[thread_id];
if (input.int_mode()) {
- ForwardTimeStep(input.i(t), t, temp_line);
+ ForwardTimeStep(input.i(t), temp_line);
} else {
input.ReadTimeStep(t, curr_input[thread_id]);
ForwardTimeStep(curr_input[thread_id], t, temp_line);
@@ -227,7 +227,7 @@ void FullyConnected::ForwardTimeStep(const TFloat *d_input, int t, TFloat *outpu
ForwardTimeStep(output_line);
}
-void FullyConnected::ForwardTimeStep(const int8_t *i_input, int t, TFloat *output_line) {
+void FullyConnected::ForwardTimeStep(const int8_t *i_input, TFloat *output_line) {
// input is copied to source_ line-by-line for cache coherency.
weights_.MatrixDotVector(i_input, output_line);
ForwardTimeStep(output_line);
diff --git a/src/lstm/fullyconnected.h b/src/lstm/fullyconnected.h
index 599913a5..45c42062 100644
--- a/src/lstm/fullyconnected.h
+++ b/src/lstm/fullyconnected.h
@@ -93,7 +93,7 @@ public:
void SetupForward(const NetworkIO &input, const TransposedArray *input_transpose);
void ForwardTimeStep(TFloat *output_line);
void ForwardTimeStep(const TFloat *d_input, int t, TFloat *output_line);
- void ForwardTimeStep(const int8_t *i_input, int t, TFloat *output_line);
+ void ForwardTimeStep(const int8_t *i_input, TFloat *output_line);
// Runs backward propagation of errors on the deltas line.
// See Network for a detailed discussion of the arguments.
diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp
index 06ebf803..33c05cbc 100644
--- a/src/lstm/input.cpp
+++ b/src/lstm/input.cpp
@@ -61,15 +61,16 @@ void Input::CacheXScaleFactor(int factor) {
// Runs forward propagation of activations on the input line.
// See Network for a detailed discussion of the arguments.
-void Input::Forward(bool debug, const NetworkIO &input, const TransposedArray *input_transpose,
- NetworkScratch *scratch, NetworkIO *output) {
+void Input::Forward(bool /*debug*/, const NetworkIO &input,
+ const TransposedArray * /*input_transpose*/,
+ NetworkScratch * /*scratch*/, NetworkIO *output) {
*output = input;
}
// Runs backward propagation of errors on the deltas line.
// See NetworkCpp for a detailed discussion of the arguments.
-bool Input::Backward(bool debug, const NetworkIO &fwd_deltas, NetworkScratch *scratch,
- NetworkIO *back_deltas) {
+bool Input::Backward(bool /*debug*/, const NetworkIO & /*fwd_deltas*/,
+ NetworkScratch * /*scratch*/, NetworkIO * /*back_deltas*/) {
tprintf("Input::Backward should not be called!!\n");
return false;
}
diff --git a/src/lstm/lstm.cpp b/src/lstm/lstm.cpp
index 11722d79..7bfd19b5 100644
--- a/src/lstm/lstm.cpp
+++ b/src/lstm/lstm.cpp
@@ -288,7 +288,8 @@ bool LSTM::DeSerialize(TFile *fp) {
// Runs forward propagation of activations on the input line.
// See NetworkCpp for a detailed discussion of the arguments.
-void LSTM::Forward(bool debug, const NetworkIO &input, const TransposedArray *input_transpose,
+void LSTM::Forward(bool debug, const NetworkIO &input,
+ const TransposedArray * /*input_transpose*/,
NetworkScratch *scratch, NetworkIO *output) {
input_map_ = input.stride_map();
input_width_ = input.Width();
@@ -458,7 +459,7 @@ void LSTM::Forward(bool debug, const NetworkIO &input, const TransposedArray *in
if (softmax_ != nullptr) {
if (input.int_mode()) {
int_output->WriteTimeStepPart(0, 0, ns_, curr_output);
- softmax_->ForwardTimeStep(int_output->i(0), t, softmax_output);
+ softmax_->ForwardTimeStep(int_output->i(0), softmax_output);
} else {
softmax_->ForwardTimeStep(curr_output, t, softmax_output);
}
diff --git a/src/lstm/maxpool.cpp b/src/lstm/maxpool.cpp
index ccd5f9b9..72f09d97 100644
--- a/src/lstm/maxpool.cpp
+++ b/src/lstm/maxpool.cpp
@@ -34,8 +34,9 @@ bool Maxpool::DeSerialize(TFile *fp) {
// Runs forward propagation of activations on the input line.
// See NetworkCpp for a detailed discussion of the arguments.
-void Maxpool::Forward(bool debug, const NetworkIO &input, const TransposedArray *input_transpose,
- NetworkScratch *scratch, NetworkIO *output) {
+void Maxpool::Forward(bool /*debug*/, const NetworkIO &input,
+ const TransposedArray * /*input_transpose*/,
+ NetworkScratch * /*scratch*/, NetworkIO *output) {
output->ResizeScaled(input, x_scale_, y_scale_, no_);
maxes_.ResizeNoInit(output->Width(), ni_);
back_map_ = input.stride_map();
@@ -67,7 +68,7 @@ void Maxpool::Forward(bool debug, const NetworkIO &input, const TransposedArray
// Runs backward propagation of errors on the deltas line.
// See NetworkCpp for a detailed discussion of the arguments.
-bool Maxpool::Backward(bool debug, const NetworkIO &fwd_deltas, NetworkScratch *scratch,
+bool Maxpool::Backward(bool /*debug*/, const NetworkIO &fwd_deltas, NetworkScratch * /*scratch*/,
NetworkIO *back_deltas) {
back_deltas->ResizeToMap(fwd_deltas.int_mode(), back_map_, ni_);
back_deltas->MaxpoolBackward(fwd_deltas, maxes_);
diff --git a/src/lstm/parallel.cpp b/src/lstm/parallel.cpp
index 83ac0eb1..e310339b 100644
--- a/src/lstm/parallel.cpp
+++ b/src/lstm/parallel.cpp
@@ -49,7 +49,8 @@ StaticShape Parallel::OutputShape(const StaticShape &input_shape) const {
// Runs forward propagation of activations on the input line.
// See NetworkCpp for a detailed discussion of the arguments.
-void Parallel::Forward(bool debug, const NetworkIO &input, const TransposedArray *input_transpose,
+void Parallel::Forward(bool debug, const NetworkIO &input,
+ const TransposedArray * /*input_transpose*/,
NetworkScratch *scratch, NetworkIO *output) {
bool parallel_debug = false;
// If this parallel is a replicator of convolvers, or holds a 1-d LSTM pair,
diff --git a/src/lstm/reconfig.cpp b/src/lstm/reconfig.cpp
index 2f49d63e..a4bda0e5 100644
--- a/src/lstm/reconfig.cpp
+++ b/src/lstm/reconfig.cpp
@@ -66,8 +66,9 @@ bool Reconfig::DeSerialize(TFile *fp) {
// Runs forward propagation of activations on the input line.
// See NetworkCpp for a detailed discussion of the arguments.
-void Reconfig::Forward(bool debug, const NetworkIO &input, const TransposedArray *input_transpose,
- NetworkScratch *scratch, NetworkIO *output) {
+void Reconfig::Forward(bool /*debug*/, const NetworkIO &input,
+ const TransposedArray * /*input_transpose*/,
+ NetworkScratch * /*scratch*/, NetworkIO *output) {
output->ResizeScaled(input, x_scale_, y_scale_, no_);
back_map_ = input.stride_map();
StrideMap::Index dest_index(output->stride_map());
@@ -90,7 +91,7 @@ void Reconfig::Forward(bool debug, const NetworkIO &input, const TransposedArray
// Runs backward propagation of errors on the deltas line.
// See NetworkCpp for a detailed discussion of the arguments.
-bool Reconfig::Backward(bool debug, const NetworkIO &fwd_deltas, NetworkScratch *scratch,
+bool Reconfig::Backward(bool /*debug*/, const NetworkIO &fwd_deltas, NetworkScratch * /*scratch*/,
NetworkIO *back_deltas) {
back_deltas->ResizeToMap(fwd_deltas.int_mode(), back_map_, ni_);
StrideMap::Index src_index(fwd_deltas.stride_map());
diff --git a/src/lstm/reversed.cpp b/src/lstm/reversed.cpp
index 1ba3169d..e85d3e62 100644
--- a/src/lstm/reversed.cpp
+++ b/src/lstm/reversed.cpp
@@ -49,7 +49,8 @@ void Reversed::SetNetwork(Network *network) {
// Runs forward propagation of activations on the input line.
// See NetworkCpp for a detailed discussion of the arguments.
-void Reversed::Forward(bool debug, const NetworkIO &input, const TransposedArray *input_transpose,
+void Reversed::Forward(bool debug, const NetworkIO &input,
+ const TransposedArray * /*input_transpose*/,
NetworkScratch *scratch, NetworkIO *output) {
NetworkScratch::IO rev_input(input, scratch);
ReverseData(input, rev_input);
@@ -60,7 +61,8 @@ void Reversed::Forward(bool debug, const NetworkIO &input, const TransposedArray
// Runs backward propagation of errors on the deltas line.
// See NetworkCpp for a detailed discussion of the arguments.
-bool Reversed::Backward(bool debug, const NetworkIO &fwd_deltas, NetworkScratch *scratch,
+bool Reversed::Backward(bool debug, const NetworkIO &fwd_deltas,
+ NetworkScratch *scratch,
NetworkIO *back_deltas) {
NetworkScratch::IO rev_input(fwd_deltas, scratch);
ReverseData(fwd_deltas, rev_input);
diff --git a/src/lstm/weightmatrix.cpp b/src/lstm/weightmatrix.cpp
index 86255266..d3ca2fcc 100644
--- a/src/lstm/weightmatrix.cpp
+++ b/src/lstm/weightmatrix.cpp
@@ -339,7 +339,8 @@ bool WeightMatrix::DeSerialize(bool training, TFile *fp) {
// As DeSerialize, but reads an old (float) format WeightMatrix for
// backward compatibility.
-bool WeightMatrix::DeSerializeOld(bool training, TFile *fp) {
+bool WeightMatrix::DeSerializeOld([[maybe_unused]] bool training,
+ [[maybe_unused]] TFile *fp) {
#ifdef FAST_FLOAT
// Not implemented.
ASSERT_HOST(!"not implemented");
@@ -427,7 +428,7 @@ void WeightMatrix::VectorDotMatrix(const TFloat *u, TFloat *v) const {
// Note that (matching MatrixDotVector) v[last][] is missing, presumed 1.0.
// Runs parallel if requested. Note that u and v must be transposed.
void WeightMatrix::SumOuterTransposed(const TransposedArray &u, const TransposedArray &v,
- bool in_parallel) {
+ [[maybe_unused]] bool in_parallel) {
assert(!int_mode_);
int num_outputs = dw_.dim1();
assert(u.dim1() == num_outputs);
diff --git a/src/lstm/weightmatrix.h b/src/lstm/weightmatrix.h
index a2cdaa52..eaca3ffb 100644
--- a/src/lstm/weightmatrix.h
+++ b/src/lstm/weightmatrix.h
@@ -126,7 +126,7 @@ public:
bool DeSerialize(bool training, TFile *fp);
// As DeSerialize, but reads an old (float) format WeightMatrix for
// backward compatibility.
- bool DeSerializeOld(bool training, TFile *fp);
+ bool DeSerializeOld(bool /*training*/, TFile * /*fp*/);
// Computes matrix.vector v = Wu.
// u is of size W.dim2() - 1 and the output v is of size W.dim1().