Changeset 5010e61 for src/ai/tensor.h

Timestamp:

Jan 1, 2019, 6:38:05 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn_org, feature/crepe_org

Children:

6e4ef27

Parents:

d0ef4b7

Message:

[tensor] rename attributes to ndim and shape[] to match numpy

File:

• src/ai/tensor.h (modified) (3 diffs)

src/ai/tensor.h

@@ -27 +27 @@
 
 typedef struct {
-  uint_t n_dims;
-  uint_t dims[8];
+  uint_t ndim;
+  uint_t shape[8];
   smpl_t **data;
   uint_t n_items;
@@ -34 +34 @@
 } aubio_tensor_t;
 
-aubio_tensor_t *new_aubio_tensor(uint_t n_dims, uint_t *dims);
+aubio_tensor_t *new_aubio_tensor(uint_t ndim, uint_t *shape);
 
 void del_aubio_tensor(aubio_tensor_t *c);
@@ -48 +48 @@
 #define AUBIO_ASSERT_EQUAL_SHAPE(t1, t2) { \
     AUBIO_ASSERT(t1 && t2); \
-    AUBIO_ASSERT(t1->n_dims == t2->n_dims); \
+    AUBIO_ASSERT(t1->ndim == t2->ndim); \
     uint_t nn; \
-    for (nn = 0; nn < t1->n_dims; nn++) \
-      AUBIO_ASSERT(t1->dims[nn] == t2->dims[nn]); \
+    for (nn = 0; nn < t1->ndim; nn++) \
+      AUBIO_ASSERT(t1->shape[nn] == t2->shape[nn]); \
     }