Changeset e18c30e

Timestamp:

Jan 29, 2019, 3:36:35 AM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/crepe_org

Children:

bf3ce2c

Parents:

7048b56

Message:

[conv2d] copy params in set_kernel, set_bias

File:

• src/ai/conv2d.c (modified) (2 diffs)

src/ai/conv2d.c

@@ -479 +479 @@
 uint_t aubio_conv2d_set_kernel(aubio_conv2d_t *c, aubio_tensor_t *kernel)
 {
-  uint_t i;
   AUBIO_ASSERT(c && kernel);
-  for (i = 0; i < c->kernel->ndim; i++) {
-    AUBIO_ASSERT(c->kernel->shape[i] == kernel->shape[i]);
-  }
-  return AUBIO_OK;
+  if (aubio_tensor_have_same_shape(kernel, c->kernel)) {
+    aubio_tensor_copy(kernel, c->kernel);
+    return AUBIO_OK;
+  }
+  return AUBIO_FAIL;
 }
 
@@ -496 +496 @@
 {
   AUBIO_ASSERT(c && bias);
-  AUBIO_ASSERT(c->kernel_shape[1] == bias->length);
+  if (bias->length == c->bias->length) {
+    fvec_copy(bias, c->bias);
+    return AUBIO_OK;
+  }
   return AUBIO_OK;
 }