Fixed arm_convolve_HWC_q15_basic_nonsquare not found

majianjia · Nov 9, 2020 · 1c41ca7 · 1c41ca7
2 parents ce83a10 + 5e78687
commit 1c41ca7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/backends/nnom_local_q15.c b/src/backends/nnom_local_q15.c
@@ -749,7 +749,7 @@ void local_depthwise_separable_conv_HWC_q15_nonsquare(const q15_t *Im_in,// inpu
     int i_out_y, i_out_x, i_ch_out, i_ch_in, i_ch_mult;
     int i_ker_y, i_ker_x;
     int i_out = 0;
-    int shift_idx, shift_steps;
+    int shift_idx;
     int ch_mult = ch_im_out / ch_im_in;
     int64_t conv_out;
 
@@ -820,8 +820,7 @@ void local_depthwise_separable_conv_CHW_q15_nonsquare(const q15_t *Im_in,// inpu
 {
     int i_out_y, i_out_x, i_ch_out, i_ch_in, i_ch_mult;
     int i_ker_y, i_ker_x;
-    int i_out = 0;
-    int shift_idx, shift_steps;
+    int shift_idx;
     int ch_mult = ch_im_out / ch_im_in;
     int64_t conv_out;
 

diff --git a/src/layers/nnom_conv2d.c b/src/layers/nnom_conv2d.c
@@ -391,14 +391,15 @@ nnom_status_t conv2d_run(nnom_layer_t *layer)
             // none opt basic
             else
             {
-                return (nnom_status_t)arm_convolve_HWC_q15_basic_nonsquare(
-                    layer->in->tensor->p_data,
-                    layer->in->tensor->dim[1], layer->in->tensor->dim[0], layer->in->tensor->dim[2],
-                    cl->weight->p_data, layer->out->tensor->dim[2],
-                    cl->kernel.w, cl->kernel.h, cl->pad.w, cl->pad.h, cl->stride.w, cl->stride.h,
-                    cl->bias->p_data, cl->bias_lshift[0], cl->output_rshift[0],
-                    layer->out->tensor->p_data,
-                    layer->out->tensor->dim[1], layer->out->tensor->dim[0], (q15_t *)(layer->comp->mem->blk), NULL);
+				local_convolve_HWC_q7_nonsquare(
+					layer->in->tensor->p_data,
+					layer->in->tensor->dim[1], layer->in->tensor->dim[0], layer->in->tensor->dim[2],
+					cl->weight->p_data, layer->out->tensor->dim[2],
+					cl->kernel.w, cl->kernel.h, cl->pad.w, cl->pad.h, cl->stride.w, cl->stride.h, cl->dilation.w, cl->dilation.h,
+					cl->bias->p_data, cl->bias_lshift, cl->output_rshift, cl->weight->qtype,
+					layer->out->tensor->p_data,
+					layer->out->tensor->dim[1], layer->out->tensor->dim[0], NULL, NULL);
+				return NN_SUCCESS;
             }
 
         } // end of 16 bit cmsis-nn