Changeset b60514b for src

Timestamp:

Jan 29, 2019, 3:00:01 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/crepe_org

Children:

695a248

Parents:

217ca89

Message:

[conv1d] use array for stride_shape to match conv2d api

File:

• src/ai/conv1d.c (modified) (7 diffs)

src/ai/conv1d.c

@@ -36 +36 @@
   uint_t n_filters;
   uint_t kernel_shape;     // kernel sizes
-  uint_t stride_shape;     // stride sizes
+  uint_t stride_shape[1];  // stride sizes
 
   aubio_conv1d_padding_type padding_mode;
@@ -98 +98 @@
 {
   if ((sint_t)stride[0] < 1) return AUBIO_FAIL;
-  c->stride_shape = stride[0];
+  c->stride_shape[0] = stride[0];
   return AUBIO_OK;
 }
 
-uint_t aubio_conv1d_get_stride(aubio_conv1d_t *c)
+uint_t *aubio_conv1d_get_stride(aubio_conv1d_t *c)
 {
   return c->stride_shape;
@@ -127 +127 @@
       // compute output shape
       output_shape[0] = (uint_t)CEIL(input_tensor->shape[0]
-          / (smpl_t)c->stride_shape);
-
-      padding_shape = (output_shape[0] - 1) * c->stride_shape +
+          / (smpl_t)c->stride_shape[0]);
+
+      padding_shape = (output_shape[0] - 1) * c->stride_shape[0] +
         c->kernel_shape - input_tensor->shape[0];
 
@@ -136 +136 @@
     case PAD_VALID:
       output_shape[0] = (input_tensor->shape[0] - c->kernel_shape + 1)
-        / c->stride_shape;
+        / c->stride_shape[0];
 
       padding_start = 0;
@@ -193 +193 @@
     n_params,
     c->kernel->shape[0], c->kernel->shape[1], c->kernel->shape[2],
-    c->stride_shape,
+    c->stride_shape[0],
     -c->padding_start);
 }
@@ -262 +262 @@
         }
       }
-      stride_a += c->stride_shape;
+      stride_a += c->stride_shape[0];
       // apply bias
       activations->data[j][i] = acc + bias;
@@ -285 +285 @@
 
   uint_t sdot_size = c->kernel->shape[0] * c->kernel->shape[1];
-  uint_t input_stride = c->stride_shape * c->padded_input->shape[1];
+  uint_t input_stride = c->stride_shape[0] * c->padded_input->shape[1];
 
   AUBIO_ASSERT(c && input_tensor && activations);