Merge pull request majianjia#91 from majianjia/master

update dev
vangjiwei · Sep 21, 2020 · 0711e46 · 0711e46
2 parents 68eebe3 + ebb512d
commit 0711e46
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/layers/nnom_conv2d.c b/src/layers/nnom_conv2d.c
@@ -293,7 +293,7 @@ nnom_status_t conv2d_run(nnom_layer_t *layer)
 			&& (cl->kernel.w == cl->kernel.h) && (cl->pad.w == cl->pad.h) && (cl->stride.w == cl->stride.h))
 			{
 				// 1x1 fast
-				if (cl->kernel.w == 1 && cl->kernel.h == 1)
+				if (cl->kernel.w == 1 && cl->kernel.h == 1 && cl->stride.w == 1 && cl->stride.h == 1 && cl->pad.w == 0 && cl->pad.h == 0)
 					return (nnom_status_t)arm_convolve_1x1_HWC_q7_fast_nonsquare(
 						layer->in->tensor->p_data,
 						layer->in->tensor->dim[1], layer->in->tensor->dim[0], layer->in->tensor->dim[2],