Changeset 9ca7923


Ignore:
Timestamp:
Jan 1, 2019, 7:20:51 PM (5 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/cnn_org, feature/crepe_org
Children:
849210c
Parents:
9d35014
Message:

[tensor] rename n_items to size, remove items_per_row

Location:
src/ai
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/ai/tensor.c

    r9d35014 r9ca7923  
    1414
    1515  c->ndim = ndim;
    16   c->items_per_row = 1;
     16  uint_t items_per_row = 1;
    1717  //c->shape = AUBIO_ARRAY(uint_t, ndim);
    1818  c->shape[0] = shape[0];
    1919  for (i = 1; i < ndim; i++) {
    2020    c->shape[i] = shape[i];
    21     c->items_per_row *= shape[i];
     21    items_per_row *= shape[i];
    2222  }
    23   c->n_items = c->items_per_row * shape[0];
     23  c->size = items_per_row * shape[0];
    2424  c->data = AUBIO_ARRAY(smpl_t*, shape[0]);
    25   c->data[0] = AUBIO_ARRAY(smpl_t, c->n_items);
     25  c->data[0] = AUBIO_ARRAY(smpl_t, c->size);
    2626  for (i = 1; i < c->shape[0]; i++) {
    27     c->data[i] = c->data[0] + i * c->items_per_row;
     27    c->data[i] = c->data[0] + i * items_per_row;
    2828  }
    2929
     
    8989  uint_t i;
    9090  smpl_t max = -1000000;
    91   for (i = 0; i < t->n_items; i++) {
     91  for (i = 0; i < t->size; i++) {
    9292    max = MAX(t->data[0][i], max);
    9393  }
  • src/ai/tensor.h

    r9d35014 r9ca7923  
    2727
    2828typedef struct {
    29   uint_t ndim;
    30   uint_t shape[8];
    31   smpl_t **data;
    32   uint_t n_items;
    33   uint_t items_per_row;
     29  uint_t ndim;            //< number of dimensions
     30  uint_t shape[8];        //< dimensions array
     31  smpl_t **data;          //< buffer of values
     32  uint_t size;            //< total number of elements
    3433} aubio_tensor_t;
    3534
Note: See TracChangeset for help on using the changeset viewer.