From ecd07b18c118fc1e52ea30d9a91d7dc6f049258c Mon Sep 17 00:00:00 2001 From: Iestyn Pryce Date: Fri, 19 May 2017 22:31:56 +0100 Subject: [PATCH] Fix log_* formats which expect size_t but receive uint32_t. --- src/address_dictionary.c | 2 +- src/ftrl.c | 8 ++++---- src/language_classifier_test.c | 4 ++-- src/language_classifier_train.c | 4 ++-- src/libpostal.c | 4 ++-- src/log/log.h | 1 + src/logistic_regression.c | 4 ++-- src/stochastic_gradient_descent.c | 6 +++--- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/address_dictionary.c b/src/address_dictionary.c index a6df42a6..ed1116f6 100644 --- a/src/address_dictionary.c +++ b/src/address_dictionary.c @@ -15,7 +15,7 @@ address_dictionary_t *get_address_dictionary(void) { address_expansion_value_t *address_dictionary_get_expansions(uint32_t i) { if (address_dict == NULL || address_dict->values == NULL || i > address_dict->values->n) { - log_error("i=%zu, address_dict->values->n=%zu\n", i, address_dict->values->n); + log_error("i=%" PRIu32 ", address_dict->values->n=%zu\n", i, address_dict->values->n); log_error(ADDRESS_DICTIONARY_SETUP_ERROR); return NULL; } diff --git a/src/ftrl.c b/src/ftrl.c index 8f44d368..8405730f 100644 --- a/src/ftrl.c +++ b/src/ftrl.c @@ -243,7 +243,7 @@ sparse_matrix_t *ftrl_weights_finalize_sparse(ftrl_trainer_t *self) { double lambda2 = self->lambda2; sparse_matrix_t *weights = sparse_matrix_new(); - log_info("weights->m = %zu\n", weights->m); + log_info("weights->m = %" PRIu32 "\n", weights->m); size_t i_start = 0; @@ -259,7 +259,7 @@ sparse_matrix_t *ftrl_weights_finalize_sparse(ftrl_trainer_t *self) { sparse_matrix_finalize_row(weights); i_start = 1; } - log_info("after intercept weights->m = %zu\n", weights->m); + log_info("after intercept weights->m = %" PRIu32 "\n", weights->m); for (size_t i = i_start; i < m; i++) { double *row = double_matrix_get_row(self->z, (size_t)i); @@ -275,7 +275,7 @@ sparse_matrix_t *ftrl_weights_finalize_sparse(ftrl_trainer_t *self) { sparse_matrix_finalize_row(weights); if (i % 1000 == 0 && i > 0) { - log_info("adding rows, weights->m = %zu\n", weights->m); + log_info("adding rows, weights->m = %" PRIu32 "\n", weights->m); } } @@ -295,4 +295,4 @@ void ftrl_trainer_destroy(ftrl_trainer_t *self) { } free(self); -} \ No newline at end of file +} diff --git a/src/language_classifier_test.c b/src/language_classifier_test.c index 729e5d12..55f9a548 100644 --- a/src/language_classifier_test.c +++ b/src/language_classifier_test.c @@ -53,7 +53,7 @@ double test_accuracy(char *filename) { } - log_info("total=%zu\n", total); + log_info("total=%" PRIu32 "\n", total); trie_destroy(label_ids); @@ -85,4 +85,4 @@ int main(int argc, char **argv) { double accuracy = test_accuracy(filename); log_info("Done. Accuracy: %f\n", accuracy); -} \ No newline at end of file +} diff --git a/src/language_classifier_train.c b/src/language_classifier_train.c index 03cd4c1d..b5306f4a 100644 --- a/src/language_classifier_train.c +++ b/src/language_classifier_train.c @@ -599,13 +599,13 @@ static language_classifier_t *trainer_finalize(logistic_regression_trainer_t *tr sparse_matrix_t *sparse_weights = logistic_regression_trainer_final_weights_sparse(trainer); classifier->weights_type = MATRIX_SPARSE; classifier->weights.sparse = sparse_weights; - log_info("Weights sparse: %zu rows (m=%u), %zu cols, %zu elements\n", sparse_weights->indptr->n, sparse_weights->m, sparse_weights->n, sparse_weights->data->n); + log_info("Weights sparse: %zu rows (m=%u), %" PRIu32 " cols, %zu elements\n", sparse_weights->indptr->n, sparse_weights->m, sparse_weights->n, sparse_weights->data->n); } } else if (trainer->optimizer_type == LOGISTIC_REGRESSION_OPTIMIZER_FTRL) { sparse_matrix_t *sparse_weights = logistic_regression_trainer_final_weights_sparse(trainer); classifier->weights_type = MATRIX_SPARSE; classifier->weights.sparse = sparse_weights; - log_info("Weights sparse: %zu rows (m=%u), %zu cols, %zu elements\n", sparse_weights->indptr->n, sparse_weights->m, sparse_weights->n, sparse_weights->data->n); + log_info("Weights sparse: %zu rows (m=%u), %" PRIu32 " cols, %zu elements\n", sparse_weights->indptr->n, sparse_weights->m, sparse_weights->n, sparse_weights->data->n); } diff --git a/src/libpostal.c b/src/libpostal.c index b05acea5..b68aacb7 100644 --- a/src/libpostal.c +++ b/src/libpostal.c @@ -665,7 +665,7 @@ static bool add_affix_expansions(string_tree_t *tree, char *str, char *lang, tok } } else if (have_suffix) { - log_debug("suffix.start=%zu\n", suffix.start); + log_debug("suffix.start=%" PRId32 "\n", suffix.start); root_len = suffix.start; root_token = (token_t){token.offset, root_len, token.type}; log_debug("root_len=%zu\n", root_len); @@ -887,7 +887,7 @@ static void expand_alternative(cstring_array *strings, khash_t(str_set) *unique_ log_debug("Adding alternatives for single normalization\n"); alternatives = add_string_alternatives(tokenized_str, options); - log_debug("num strings = %zu\n", string_tree_num_strings(alternatives)); + log_debug("num strings = %" PRIu32 "\n", string_tree_num_strings(alternatives)); if (alternatives == NULL) { log_debug("alternatives = NULL\n"); diff --git a/src/log/log.h b/src/log/log.h index d971ed40..7e5e454c 100644 --- a/src/log/log.h +++ b/src/log/log.h @@ -3,6 +3,7 @@ #include #include +#include #include #define LOG_LEVEL_DEBUG 10 diff --git a/src/logistic_regression.c b/src/logistic_regression.c index 08d340fc..329c0c0b 100644 --- a/src/logistic_regression.c +++ b/src/logistic_regression.c @@ -13,7 +13,7 @@ bool logistic_regression_model_expectation_sparse(sparse_matrix_t *theta, sparse } if (sparse_matrix_dot_sparse(x, theta, p_y) != 0) { - log_error("x->m = %zu, x->n = %zu, theta->m = %zu, theta->n = %zu, p_y->m = %zu, p_y->n = %zu\n", x->m, x->n, theta->m, theta->n, p_y->m, p_y->n); + log_error("x->m = %" PRIu32 ", x->n = %" PRIu32 ", theta->m = %" PRIu32 ", theta->n = %" PRIu32 ", p_y->m = %zu, p_y->n = %zu\n", x->m, x->n, theta->m, theta->n, p_y->m, p_y->n); return false; } @@ -31,7 +31,7 @@ bool logistic_regression_model_expectation(double_matrix_t *theta, sparse_matrix } if (sparse_matrix_dot_dense(x, theta, p_y) != 0) { - log_error("x->m = %zu, x->n = %zu, theta->m = %zu, theta->n = %zu, p_y->m = %zu, p_y->n = %zu\n", x->m, x->n, theta->m, theta->n, p_y->m, p_y->n); + log_error("x->m = %" PRIu32 ", x->n = %" PRIu32 ", theta->m = %" PRIu32 ", theta->n = %" PRIu32 ", p_y->m = %zu, p_y->n = %zu\n", x->m, x->n, theta->m, theta->n, p_y->m, p_y->n); return false; } diff --git a/src/stochastic_gradient_descent.c b/src/stochastic_gradient_descent.c index e94ffc55..19bca2a7 100644 --- a/src/stochastic_gradient_descent.c +++ b/src/stochastic_gradient_descent.c @@ -203,7 +203,7 @@ bool stochastic_gradient_descent_update_sparse(sgd_trainer_t *self, double_matri lambda_update = lambda / (double)batch_size * gamma_t; if (t > self->penalties->n) { - log_info("t = %zu, penalties->n = %zu\n", t, self->penalties->n); + log_info("t = %" PRIu32 ", penalties->n = %zu\n", t, self->penalties->n); return false; } penalty = self->penalties->a[t]; @@ -219,7 +219,7 @@ bool stochastic_gradient_descent_update_sparse(sgd_trainer_t *self, double_matri if (self->iterations > 0) { if (last_updated >= self->penalties->n) { - log_info("col = %u, t = %zu, last_updated = %zu, penalties->n = %zu\n", col, t, last_updated, self->penalties->n); + log_info("col = %u, t = %" PRIu32 ", last_updated = %" PRIu32 ", penalties->n = %zu\n", col, t, last_updated, self->penalties->n); return false; } @@ -376,7 +376,7 @@ bool stochastic_gradient_descent_set_regularized_weights(sgd_trainer_t *self, do uint32_t last_updated = updates[i]; if (last_updated >= self->penalties->n) { - log_error("last_updated (%zu) >= self->penalties-> (%zu)\n", last_updated, self->penalties->n); + log_error("last_updated (%" PRIu32 ") >= self->penalties-> (%zu)\n", last_updated, self->penalties->n); return false; } double last_update_penalty = penalties[last_updated];