Changeset 83ec87f for src

Timestamp:

Dec 29, 2021, 5:51:45 PM (3 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe

Children:

a5199ad

Parents:

6ad67a5

git-author:

Paul Brossier <piem@piem.org> (01/01/19 19:20:51)

git-committer:

Paul Brossier <piem@piem.org> (12/29/21 17:51:45)

Message:

[tensor] rename n_items to size, remove items_per_row

Location:

src/ai

Files:

• tensor.c (modified) (2 diffs)
• tensor.h (modified) (1 diff)

src/ai/tensor.c

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

src/ai/tensor.h

@@ -27 +27 @@
 
 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;