tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #214 from iestynpryce/master

Browse Source 
Fix remaining log_* compile format warnings
This commit is contained in:
Al Barrentine
2017-05-30 08:45:28 -04:00
committed by GitHub
parent 8dd84b71ba b96a687182
commit 50cf14846c
14 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/address_dictionary.c
View File

@@ -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;
}

8
src/address_parser_train.c
View File

@@ -662,7 +662,7 @@ address_parser_t *address_parser_init(char *filename) {
}
log_info("Done with vocab, total size=%zu\n", kh_size(vocab));
log_info("Done with vocab, total size=%" PRIkh32 "\n", kh_size(vocab));
for (k = kh_begin(vocab); k != kh_end(vocab); ++k) {
token = (char *)kh_key(vocab, k);
@@ -676,7 +676,7 @@ address_parser_t *address_parser_init(char *filename) {
}
}
log_info("After pruning vocab size=%zu\n", kh_size(vocab));
log_info("After pruning vocab size=%" PRIkh32 "\n", kh_size(vocab));
log_info("Creating phrases trie\n");
@@ -1090,7 +1090,7 @@ bool address_parser_train_epoch(address_parser_t *self, void *trainer, char *fil
uint64_t prev_errors = errors;
errors = address_parser_train_num_errors(self, trainer);
log_info("Iter %d: Did %zu examples with %llu errors\n", iteration, examples, errors - prev_errors);
log_info("Iter %d: Did %zu examples with %" PRIu64 " errors\n", iteration, examples, errors - prev_errors);
}
}
@@ -1211,7 +1211,7 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}
min_updates = arg_min_updates;
log_info("min_updates = %llu\n", min_updates);
log_info("min_updates = %" PRIu64 "\n", min_updates);
} else if (kwarg == ADDRESS_PARSER_TRAIN_ARG_MODEL_TYPE) {
if (string_equals(arg, "crf")) {
model_type = ADDRESS_PARSER_TYPE_CRF;

2
src/averaged_perceptron_trainer.c
View File

@@ -148,7 +148,7 @@ averaged_perceptron_t *averaged_perceptron_trainer_finalize(averaged_perceptron_
log_info("Finalizing trainer, num_features=%u\n", self->num_features);
log_info("Pruning weights with < min_updates = %llu\n", self->min_updates);
log_info("Pruning weights with < min_updates = %" PRIu64 "\n", self->min_updates);
for (feature_id = 0; feature_id < self->num_features; feature_id++) {
k = kh_get(feature_class_weights, self->weights, feature_id);

2
src/crf_trainer_averaged_perceptron.c
View File

@@ -755,7 +755,7 @@ crf_t *crf_averaged_perceptron_trainer_finalize(crf_averaged_perceptron_trainer_
uint32_t next_feature_id = 0;
uint64_t *update_counts = self->update_counts->a;
log_info("Pruning weights with < min_updates = %llu\n", self->min_updates);
log_info("Pruning weights with < min_updates = %" PRIu64 "\n", self->min_updates);
for (feature_id = 0; feature_id < num_features; feature_id++) {
k = kh_get(feature_class_weights, self->weights, feature_id);

8
src/ftrl.c
View File

@@ -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);
}
}

4
src/klib/khash.h
View File

@@ -101,14 +101,18 @@ int main() {
#if UINT_MAX == 0xffffffffu
typedef unsigned int khint32_t;
#define PRIkh32 "u"
#elif ULONG_MAX == 0xffffffffu
typedef unsigned long khint32_t;
#define PRIkh32 "lu"
#endif
#if ULONG_MAX == ULLONG_MAX
typedef unsigned long khint64_t;
#define PRIkh64 "lu"
#else
typedef unsigned long long khint64_t;
#define PRIkh64 "llu"
#endif
#ifndef kh_inline

4
src/language_classifier_test.c
View File

@@ -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);
}
}

4
src/language_classifier_train.c
View File

@@ -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);
}

4
src/libpostal.c
View File

@@ -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");

1
src/log/log.h
View File

@@ -3,6 +3,7 @@
#include <stdio.h>
#include <errno.h>
#include <inttypes.h>
#include <string.h>
#define LOG_LEVEL_DEBUG 10

4
src/logistic_regression.c
View File

@@ -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 = %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);
return false;
}

4
src/numex.c
View File

@@ -421,7 +421,7 @@ bool numex_table_read(FILE *f) {
goto exit_numex_table_load_error;
}
log_debug("read num_languages = %llu\n", num_languages);
log_debug("read num_languages = %" PRIu64 "\n", num_languages);
int i = 0;
@@ -443,7 +443,7 @@ bool numex_table_read(FILE *f) {
goto exit_numex_table_load_error;
}
log_debug("read num_rules = %llu\n", num_rules);
log_debug("read num_rules = %" PRIu64 "\n", num_rules);
numex_rule_t rule;

6
src/stochastic_gradient_descent.c
View File

@@ -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];

6
src/trie_search.c
View File

@@ -800,17 +800,17 @@ bool token_phrase_memberships(phrase_array *phrases, int64_array *phrase_members
for (; i < phrase.start; i++) {
int64_array_push(phrase_memberships, NULL_PHRASE_MEMBERSHIP);
log_debug("token i=%lld, null phrase membership\n", i);
log_debug("token i=%" PRId64 ", null phrase membership\n", i);
}
for (i = phrase.start; i < phrase.start + phrase.len; i++) {
log_debug("token i=%lld, phrase membership=%lld\n", i, j);
log_debug("token i=%" PRId64 ", phrase membership=%" PRId64 "\n", i, j);
int64_array_push(phrase_memberships, j);
}
}
for (; i < len; i++) {
log_debug("token i=%lld, null phrase membership\n", i);
log_debug("token i=%" PRId64 ", null phrase membership\n", i);
int64_array_push(phrase_memberships, NULL_PHRASE_MEMBERSHIP);
}