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

[io] Sparse matrix using array I/O methods

Browse Source
This commit is contained in:
Al
2016-01-17 20:38:16 -05:00
parent 46b35c5202
commit cba2acc21f
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/sparse_matrix.c
View File

@@ -113,7 +113,7 @@ void sparse_matrix_sort_indices(sparse_matrix_t *self) {
inline int sparse_matrix_dot_vector(sparse_matrix_t *self, double *vec, size_t n, double *result) { inline int sparse_matrix_dot_vector(sparse_matrix_t *self, double *vec, size_t n, double *result) {
if (n != self->n) {printf("self->n=%zu, n=%zu\n", self->n, n); return -1; } if (n != self->n) return -1;
uint32_t row, row_start, row_len; uint32_t row, row_start, row_len;
double val; double val;
@@ -331,22 +331,18 @@ sparse_matrix_t *sparse_matrix_read(FILE *f) {
uint64_t len_indptr; uint64_t len_indptr;
if (!file_read_uint64(f, &len_indptr)) { if (!file_read_uint64(f, &len_indptr)) {
printf("len_indptr\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
uint32_array *indptr = uint32_array_new_size(len_indptr); uint32_array *indptr = uint32_array_new_size(len_indptr);
if (indptr == NULL) { if (indptr == NULL) {
printf("indptr alloc\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
for (int i = 0; i < len_indptr; i++) { if (!file_read_uint32_array(f, indptr->a, len_indptr)) {
if (!file_read_uint32(f, indptr->a + i)) { uint32_array_destroy(indptr);
printf("indptr\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
}
indptr->n = (size_t)len_indptr; indptr->n = (size_t)len_indptr;
sp->indptr = indptr; sp->indptr = indptr;
@@ -354,22 +350,18 @@ sparse_matrix_t *sparse_matrix_read(FILE *f) {
uint64_t len_indices; uint64_t len_indices;
if (!file_read_uint64(f, &len_indices)) { if (!file_read_uint64(f, &len_indices)) {
printf("len_indices\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
uint32_array *indices = uint32_array_new_size(len_indices); uint32_array *indices = uint32_array_new_size(len_indices);
if (indices == NULL) { if (indices == NULL) {
printf("indices alloc\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
for (int i = 0; i < len_indices; i++) { if (!file_read_uint32_array(f, indices->a, len_indices)) {
if (!file_read_uint32(f, indices->a + i)) { uint32_array_destroy(indices);
printf("indices\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
}
indices->n = (size_t)len_indices; indices->n = (size_t)len_indices;
sp->indices = indices; sp->indices = indices;
@@ -377,22 +369,18 @@ sparse_matrix_t *sparse_matrix_read(FILE *f) {
uint64_t len_data; uint64_t len_data;
if (!file_read_uint64(f, &len_data)) { if (!file_read_uint64(f, &len_data)) {
printf("len_data\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
double_array *data = double_array_new_size(len_data); double_array *data = double_array_new_size(len_data);
if (data == NULL) { if (data == NULL) {
printf("data alloc\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
for (int i = 0; i < len_data; i++) { if (!file_read_double_array(f, data->a, len_data)) {
if (!file_read_double(f, data->a + i)) { double_array_destroy(data);
printf("data\n");
goto exit_sparse_matrix_allocated; goto exit_sparse_matrix_allocated;
} }
}
data->n = (size_t)len_data; data->n = (size_t)len_data;
sp->data = data; sp->data = data;