Changeset 60c9db0

Timestamp:

Jan 1, 2019, 6:39:56 PM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn_org, feature/crepe_org

Children:

9d35014

Parents:

6e4ef27

Message:

[maxpool1d] update to new tensor members

File:

• src/ai/maxpool1d.c (modified) (3 diffs)

src/ai/maxpool1d.c

@@ -60 +60 @@
   AUBIO_DBG("maxpool1d: input (%d, %d) ¤ maxpool1d (pool_size = (%d)) ->"
       " (%d, %d) (no params)\n",
-      input_tensor->dims[0],
-      input_tensor->dims[1],
+      input_tensor->shape[0],
+      input_tensor->shape[1],
       c->pool_size,
-      input_tensor->dims[0] / c->pool_size,
-      input_tensor->dims[1]);
+      input_tensor->shape[0] / c->pool_size,
+      input_tensor->shape[1]);
 }
 
@@ -73 +73 @@
   AUBIO_ASSERT(shape && sizeof(shape) == 2*sizeof(uint_t));
   AUBIO_ASSERT(input);
-  shape[0] = input->dims[0] / c->pool_size;
-  shape[1] = input->dims[1];
+  shape[0] = input->shape[0] / c->pool_size;
+  shape[1] = input->shape[1];
 
   aubio_maxpool1d_debug(c, input);
@@ -87 +87 @@
   AUBIO_ASSERT(c && input_tensor && output_tensor);
 
-  for (j = 0; j < output_tensor->dims[1]; j++) {
-    for (i = 0; i < output_tensor->dims[0]; i++) {
+  //aubio_maxpool1d_debug(c, input_tensor);
+
+  for (j = 0; j < output_tensor->shape[1]; j++) {
+    for (i = 0; i < output_tensor->shape[0]; i++) {
       smpl_t m = -FLT_MAX;
       for (a = 0; a < c->pool_size; a++) {