From 5e78687538c5098befbd32ff7929a6e3f5d42f3e Mon Sep 17 00:00:00 2001 From: majianjia Date: Mon, 9 Nov 2020 17:48:18 +0000 Subject: [PATCH] Fixed arm_convolve_HWC_q15_basic_nonsquare not found --- src/backends/nnom_local_q15.c | 5 ++--- src/layers/nnom_conv2d.c | 17 +++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/backends/nnom_local_q15.c b/src/backends/nnom_local_q15.c index 8d58c11..5079eb3 100644 --- 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 index 25c7d5b..d6b5f4c 100644 --- 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