Changeset 378852b for src/ai

Timestamp:

Jan 16, 2019, 10:01:01 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/crepe_org

Children:

8389694

Parents:

c6e51cd

Message:

[conv2d] fix debug string, clean up

File:

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

src/ai/conv2d.c

@@ -81 +81 @@
 {
   AUBIO_ASSERT(c);
-  // destroy internals here
-  if (c->kernel) {
+  if (c->kernel)
     del_aubio_tensor(c->kernel);
-  }
   if (c->bias)
     del_fvec(c->bias);
@@ -148 +146 @@
       padding_start[0] = 0;
       padding_start[1] = 0;
+
       break;
     //case PAD_CAUSAL:
@@ -194 +193 @@
     * c->kernel->shape[1] * c->kernel->shape[3];
 
-  AUBIO_DBG("conv2d:    %15s ¤ conv2d %s"
-      " : (%d, %d, %d)"
-      " (%d params, stride (%d, %d), pad_start [%d, %d])\n",
-    aubio_tensor_get_shape_string(input_tensor),
-    aubio_tensor_get_shape_string(c->kernel),
-    c->output_shape[0], c->output_shape[1], c->output_shape[2],
-    n_params,
+  const char_t *tensor_str = aubio_tensor_get_shape_string(input_tensor);
+  //AUBIO_DBG("conv2d: kernel_shape_str %s\n", kernel_shape_str);
+  AUBIO_DBG("conv2d:    %15s -> (%d, %d, %d)",
+    tensor_str,
+    c->output_shape[0], c->output_shape[1], c->output_shape[2]);
+  tensor_str = aubio_tensor_get_shape_string(c->kernel);
+  AUBIO_DBG(" (n_params=%d, kernel_shape=(%d, %d),"
+      " weigths=%s, stride (%d, %d), pad_start [%d, %d]"
+      " pad_end [%d, %d])\n",
+    n_params, c->kernel_shape[0], c->kernel_shape[1],
+    tensor_str,
     c->stride_shape[0], c->stride_shape[1],
     -c->padding_start[0], -c->padding_start[1]);