Changeset 689ba93

Timestamp:

Jan 18, 2019, 10:47:14 AM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/crepe_org

Children:

e75a48e

Parents:

3977b4f

Message:

[batchnorm] accepts any input size, allocate weights in get_output_shape

Location:

src/ai

Files:

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

src/ai/batchnorm.c

@@ -35 +35 @@
     aubio_tensor_t *input_tensor);
 
-aubio_batchnorm_t *new_aubio_batchnorm(uint_t n_outputs)
+aubio_batchnorm_t *new_aubio_batchnorm(void)
 {
   aubio_batchnorm_t *c = AUBIO_NEW(aubio_batchnorm_t);
-
-  AUBIO_GOTO_FAILURE((sint_t)n_outputs > 0);
-
-  c->n_outputs = n_outputs;
-
-  c->gamma = new_fvec(n_outputs);
-  c->beta = new_fvec(n_outputs);
-  c->moving_mean = new_fvec(n_outputs);
-  c->moving_variance = new_fvec(n_outputs);
-
   return c;
-
+#if 0 // no argument so no other possible failure
 failure:
   del_aubio_batchnorm(c);
   return NULL;
+#endif
 }
 
-void del_aubio_batchnorm(aubio_batchnorm_t* c) {
+static void aubio_batchnorm_reset(aubio_batchnorm_t *c) {
   AUBIO_ASSERT(c);
   if (c->gamma)
@@ -65 +56 @@
   if (c->moving_variance)
     del_fvec(c->moving_variance);
+}
+
+void del_aubio_batchnorm(aubio_batchnorm_t* c) {
+  aubio_batchnorm_reset(c);
   AUBIO_FREE(c);
 }
@@ -82 +77 @@
 
   AUBIO_ASSERT(c && input && shape);
-  AUBIO_ASSERT(c->n_outputs == input->shape[input->ndim - 1]);
 
   for (i = 0; i < input->ndim; i++) {
     shape[i] = input->shape[i];
+  }
+
+  aubio_batchnorm_reset(c);
+
+  c->n_outputs = input->shape[input->ndim - 1];
+
+  c->gamma = new_fvec(c->n_outputs);
+  c->beta = new_fvec(c->n_outputs);
+  c->moving_mean = new_fvec(c->n_outputs);
+  c->moving_variance = new_fvec(c->n_outputs);
+
+  if (!c->gamma || !c->beta || !c->moving_mean || !c->moving_variance)
+  {
+    aubio_batchnorm_reset(c);
+    return AUBIO_FAIL;
   }
 

src/ai/batchnorm.h

@@ -41 +41 @@
 typedef struct _aubio_batchnorm_t aubio_batchnorm_t;
 
-aubio_batchnorm_t *new_aubio_batchnorm(uint_t n_outputs);
+aubio_batchnorm_t *new_aubio_batchnorm(void);
 
 void aubio_batchnorm_do(aubio_batchnorm_t *t,