Changeset 4b2d174

Timestamp:

Jan 28, 2019, 10:56:27 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/crepe_org

Children:

ddd124a

Parents:

1df9cd1

Message:

[tensor] rewrite and rename have_same_shape

Files:

• src/ai/tensor.c (modified) (1 diff)
• tests/src/ai/test-tensor.c (modified) (4 diffs)

src/ai/tensor.c ¶

@@ -138 +138 @@
 }
 
-uint_t aubio_tensor_have_same_size(aubio_tensor_t *t, aubio_tensor_t *s)
+uint_t aubio_tensor_have_same_shape(aubio_tensor_t *a, aubio_tensor_t *b)
 {
   uint_t n;
-  if (!t || !s) return 0;
-  if (t->ndim != s->ndim) return 0;
-  if (t->size != s->size) return 0;
-  n = t->ndim;
-  while (n--) {
-    if (t->shape[n] != s->shape[n]) {
+  AUBIO_ASSERT(a && b);
+  if (a->ndim != b->ndim) {
+    return 0;
+  }
+  for (n = 0; n < a->ndim; n++) {
+    if (a->shape[n] != b->shape[n]) {
       return 0;
     }

tests/src/ai/test-tensor.c ¶

@@ -124 +124 @@
   aubio_tensor_t *b = new_aubio_tensor(3, dims);
 
-  assert (!aubio_tensor_have_same_size(a, b));
+  assert (!aubio_tensor_have_same_shape(a, b));
 
   del_aubio_tensor(b);
   dims[2] += 1;
   b = new_aubio_tensor(4, dims);
-  assert (!aubio_tensor_have_same_size(a, b));
+  assert (!aubio_tensor_have_same_shape(a, b));
   del_aubio_tensor(b);
   dims[2] -= 1;
@@ -136 +136 @@
   dims[1] += 1;
   b = new_aubio_tensor(4, dims);
-  assert (!aubio_tensor_have_same_size(a, b));
+  assert (!aubio_tensor_have_same_shape(a, b));
   del_aubio_tensor(b);
 
@@ -142 +142 @@
   dims[1] -= 1;
   b = new_aubio_tensor(4, dims);
-  assert (aubio_tensor_have_same_size(a, b));
-
-  assert (!aubio_tensor_have_same_size(NULL, b));
-  assert (!aubio_tensor_have_same_size(a, NULL));
+  assert (aubio_tensor_have_same_shape(a, b));
+
+  assert (!aubio_tensor_have_same_shape(NULL, b));
+  assert (!aubio_tensor_have_same_shape(a, NULL));
 
   del_aubio_tensor(a);
@@ -321 +321 @@
   PRINT_MSG("testing 4d tensors\n");
   assert (test_4d() == 0);
-  PRINT_MSG("testing aubio_tensor_have_same_size\n");
+  PRINT_MSG("testing aubio_tensor_have_same_shape\n");
   assert (test_sizes() == 0);
   PRINT_MSG("testing new_aubio_tensor with wrong arguments\n");