Changeset 45a1e1d for src

Timestamp:

Jan 8, 2019, 3:12:35 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn_org, feature/crepe_org

Children:

3ffea61d

Parents:

6ee6107

Message:

[conv2d] set_stride accepts int[]

Location:

src/ai

Files:

• conv2d.c (modified) (3 diffs)
• conv2d.h (modified) (1 diff)

src/ai/conv2d.c

@@ -66 +66 @@
   c->padding_mode = PAD_VALID;
   // set default stride_shape to {1, 1}
-  aubio_conv2d_set_stride(c, 1, 1);
+  {
+    uint_t default_stride[2] = {1, 1};
+    aubio_conv2d_set_stride(c, default_stride);
+  }
 
   return c;
@@ -89 +92 @@
 
 uint_t aubio_conv2d_set_stride(aubio_conv2d_t *c,
-    uint_t stride1, uint_t stride2)
-{
-  if ((sint_t)stride1 < 1) return AUBIO_FAIL;
-  if ((sint_t)stride2 < 1) return AUBIO_FAIL;
-  c->stride_shape[0] = stride1;
-  c->stride_shape[1] = stride2;
+    uint_t stride[2])
+{
+  if ((sint_t)stride[0] < 1) return AUBIO_FAIL;
+  if ((sint_t)stride[1] < 1) return AUBIO_FAIL;
+  c->stride_shape[0] = stride[0];
+  c->stride_shape[1] = stride[1];
   return AUBIO_OK;
 }
@@ -191 +194 @@
     * c->kernel->shape[1] * c->kernel->shape[3];
 
-  AUBIO_DBG("conv2d: input %s ¤ conv2d %s"
+  AUBIO_DBG("conv2d:    %15s ¤ conv2d %s"
       " : (%d, %d, %d)"
       " (%d params, stride (%d, %d), pad_start [%d, %d])\n",

src/ai/conv2d.h

@@ -52 +52 @@
 /** set conv2d stride */
 uint_t aubio_conv2d_set_stride(aubio_conv2d_t *c,
-    uint_t stride1, uint_t stride2);
+    uint_t stride[2]);
 
 uint_t *aubio_conv2d_get_stride(aubio_conv2d_t* t);