Microfrontend warnings (#2296)
Fix for #2295
Fixed warnings when compiling with -Wsigned-compare and -Wdouble-promotion in tflite microfrontend.
BUG=#2295
diff --git a/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.c b/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.c
index 6ce4c7c..ea45d1b 100644
--- a/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.c
+++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.c
@@ -17,7 +17,7 @@
static void PrintArray(FILE* fp, const char* name, const int16_t* values,
size_t size) {
fprintf(fp, "static int16_t filterbank_%s[] = {", name);
- int i;
+ size_t i;
for (i = 0; i < size; ++i) {
fprintf(fp, "%d", values[i]);
if (i < size - 1) {
diff --git a/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.c b/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.c
index f18ebf5..430fc6e 100644
--- a/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.c
+++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.c
@@ -28,7 +28,7 @@
config->output_scale_shift = 7;
}
-static float FreqToMel(float freq) { return 1127.0 * log1p(freq / 700.0); }
+static float FreqToMel(float freq) { return 1127.0f * log1pf(freq / 700.0f); }
static void CalculateCenterFrequencies(const int num_channels,
const float lower_frequency_limit,
@@ -49,8 +49,8 @@
static void QuantizeFilterbankWeights(const float float_weight, int16_t* weight,
int16_t* unweight) {
- *weight = floor(float_weight * (1 << kFilterbankBits) + 0.5);
- *unweight = floor((1.0 - float_weight) * (1 << kFilterbankBits) + 0.5);
+ *weight = floorf(float_weight * (1 << kFilterbankBits) + 0.5f);
+ *unweight = floorf((1.0f - float_weight) * (1 << kFilterbankBits) + 0.5f);
}
int FilterbankPopulateState(const struct FilterbankConfig* config,
@@ -95,8 +95,8 @@
config->upper_band_limit, center_mel_freqs);
// Always exclude DC.
- const float hz_per_sbin = 0.5 * sample_rate / ((float)spectrum_size - 1);
- state->start_index = 1.5 + config->lower_band_limit / hz_per_sbin;
+ const float hz_per_sbin = 0.5f * sample_rate / ((float)spectrum_size - 1);
+ state->start_index = 1.5f + config->lower_band_limit / hz_per_sbin;
state->end_index = 0; // Initialized to zero here, but actually set below.
// For each channel, we need to figure out what frequencies belong to it, and
diff --git a/tensorflow/lite/experimental/microfrontend/lib/frontend_main.c b/tensorflow/lite/experimental/microfrontend/lib/frontend_main.c
index 861778c..60868f8 100644
--- a/tensorflow/lite/experimental/microfrontend/lib/frontend_main.c
+++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_main.c
@@ -56,7 +56,7 @@
audio_file_size -= num_samples_read;
if (output.values != NULL) {
- int i;
+ size_t i;
for (i = 0; i < output.size; ++i) {
printf("%d ", output.values[i]);
}
diff --git a/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.c b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.c
index 19c32b3..8a5d7a4 100644
--- a/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.c
+++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.c
@@ -16,7 +16,7 @@
void NoiseReductionWriteMemmapPreamble(
FILE* fp, const struct NoiseReductionState* state) {
- fprintf(fp, "static uint32_t noise_reduction_estimate[%zu];\n",
+ fprintf(fp, "static uint32_t noise_reduction_estimate[%d];\n",
state->num_channels);
fprintf(fp, "\n");
}
diff --git a/tensorflow/lite/experimental/microfrontend/lib/window_io.c b/tensorflow/lite/experimental/microfrontend/lib/window_io.c
index d12cac2..5a7b047 100644
--- a/tensorflow/lite/experimental/microfrontend/lib/window_io.c
+++ b/tensorflow/lite/experimental/microfrontend/lib/window_io.c
@@ -16,7 +16,7 @@
void WindowWriteMemmapPreamble(FILE* fp, const struct WindowState* state) {
fprintf(fp, "static int16_t window_coefficients[] = {\n");
- int i;
+ size_t i;
for (i = 0; i < state->size; ++i) {
fprintf(fp, "%d", state->coefficients[i]);
if (i < state->size - 1) {
diff --git a/tensorflow/lite/experimental/microfrontend/lib/window_util.c b/tensorflow/lite/experimental/microfrontend/lib/window_util.c
index eee6e7b..6fdffdc 100644
--- a/tensorflow/lite/experimental/microfrontend/lib/window_util.c
+++ b/tensorflow/lite/experimental/microfrontend/lib/window_util.c
@@ -41,13 +41,13 @@
}
// Populate the window values.
- const float arg = M_PI * 2.0 / ((float)state->size);
- int i;
+ const float arg = (float)M_PI * 2.0f / ((float)state->size);
+ size_t i;
for (i = 0; i < state->size; ++i) {
- float float_value = 0.5 - (0.5 * cos(arg * (i + 0.5)));
+ float float_value = 0.5f - (0.5f * cosf(arg * (i + 0.5f)));
// Scale it to fixed point and round it.
state->coefficients[i] =
- floor(float_value * (1 << kFrontendWindowBits) + 0.5);
+ floorf(float_value * (1 << kFrontendWindowBits) + 0.5f);
}
state->input_used = 0;
