[tensor] rename n_items to size, remove items_per_row

diff --git a/src/ai/tensor.c b/src/ai/tensor.c
index 57044db..097ee22 100644 (file)
--- a/src/ai/tensor.c
+++ b/src/ai/tensor.c
@@ -13,18 +13,18 @@ aubio_tensor_t *new_aubio_tensor(uint_t ndim, uint_t *shape)
   }
 
   c->ndim = ndim;
-  c->items_per_row = 1;
+  uint_t items_per_row = 1;
   //c->shape = AUBIO_ARRAY(uint_t, ndim);
   c->shape[0] = shape[0];
   for (i = 1; i < ndim; i++) {
     c->shape[i] = shape[i];
-    c->items_per_row *= shape[i];
+    items_per_row *= shape[i];
   }
-  c->n_items = c->items_per_row * shape[0];
+  c->size = items_per_row * shape[0];
   c->data = AUBIO_ARRAY(smpl_t*, shape[0]);
-  c->data[0] = AUBIO_ARRAY(smpl_t, c->n_items);
+  c->data[0] = AUBIO_ARRAY(smpl_t, c->size);
   for (i = 1; i < c->shape[0]; i++) {
-    c->data[i] = c->data[0] + i * c->items_per_row;
+    c->data[i] = c->data[0] + i * items_per_row;
   }
 
   return c;
@@ -88,7 +88,7 @@ smpl_t aubio_tensor_max(aubio_tensor_t *t)
 {
   uint_t i;
   smpl_t max = -1000000;
-  for (i = 0; i < t->n_items; i++) {
+  for (i = 0; i < t->size; i++) {
     max = MAX(t->data[0][i], max);
   }
   return max;

diff --git a/src/ai/tensor.h b/src/ai/tensor.h
index 6fcb813..7480a4c 100644 (file)
--- a/src/ai/tensor.h
+++ b/src/ai/tensor.h
@@ -26,11 +26,10 @@ extern "C" {
 #endif
 
 typedef struct {
-  uint_t ndim;
-  uint_t shape[8];
-  smpl_t **data;
-  uint_t n_items;
-  uint_t items_per_row;
+  uint_t ndim;            //< number of dimensions
+  uint_t shape[8];        //< dimensions array
+  smpl_t **data;          //< buffer of values
+  uint_t size;            //< total number of elements
 } aubio_tensor_t;
 
 aubio_tensor_t *new_aubio_tensor(uint_t ndim, uint_t *shape);