Merge pull request #50 from majianjia/dev

add HWC in function names
majianjia · Jun 19, 2019 · 86639cb · 86639cb
2 parents 72ebd1c + f87f85a
commit 86639cb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/inc/nnom_local.h b/inc/nnom_local.h
@@ -156,7 +156,7 @@ void local_depthwise_separable_conv_HWC_q7_nonsquare(const q7_t * Im_in,  // inp
                                                        q15_t * bufferA, //buffer space for input
                                                        q7_t * bufferB);   //buffer space for output
 
-void local_zero_padding_q7(const q7_t *Im_in,           // input image
+void local_zero_padding_HWC_q7(const q7_t *Im_in,           // input image
 						 const uint16_t dim_im_in_x,    // input image dimention x
 						 const uint16_t dim_im_in_y,    // input image dimention y
 						 const uint16_t ch_im_in,       // number of input image channels
@@ -168,7 +168,7 @@ void local_zero_padding_q7(const q7_t *Im_in,           // input image
 						 const uint16_t dim_im_out_x,   // output image dimension x
 						 const uint16_t dim_im_out_y);  // output image dimension y 
 
-void local_cropping_q7(const q7_t *Im_in,           // input image
+void local_cropping_HWC_q7(const q7_t *Im_in,           // input image
 						 const uint16_t dim_im_in_x,    // input image dimention x
 						 const uint16_t dim_im_in_y,    // input image dimention y
 						 const uint16_t ch_im_in,       // number of input image channels

diff --git a/src/nnom_local.c b/src/nnom_local.c
@@ -330,7 +330,7 @@ void local_depthwise_separable_conv_HWC_q7_nonsquare(const q7_t *Im_in,
     }
 }
 
-void local_zero_padding_q7(const q7_t *Im_in,           // input image
+void local_zero_padding_HWC_q7(const q7_t *Im_in,           // input image
 						 const uint16_t dim_im_in_x,    // input image dimention x
 						 const uint16_t dim_im_in_y,    // input image dimention y
 						 const uint16_t ch_im_in,       // number of input image channels
@@ -370,7 +370,7 @@ void local_zero_padding_q7(const q7_t *Im_in,           // input image
 	memset(p_out, 0, dim_im_out_x*ch_im_in*padding_bottom); 
 }
 
-void local_cropping_q7(const q7_t *Im_in,           // input image
+void local_cropping_HWC_q7(const q7_t *Im_in,           // input image
 						 const uint16_t dim_im_in_x,    // input image dimention x
 						 const uint16_t dim_im_in_y,    // input image dimention y
 						 const uint16_t ch_im_in,       // number of input image channels

diff --git a/src/nnom_run.c b/src/nnom_run.c
@@ -169,7 +169,7 @@ nnom_status_t zero_padding_run(nnom_layer_t * layer)
 {
 	nnom_zero_padding_layer_t *cl = (nnom_zero_padding_layer_t*)layer;
 
-	local_zero_padding_q7(layer->in->mem->blk, 
+	local_zero_padding_HWC_q7(layer->in->mem->blk, 
 						layer->in->shape.w, layer->in->shape.h, layer->in->shape.c,
 						cl->pad.top,
 						cl->pad.bottom,
@@ -185,7 +185,7 @@ nnom_status_t cropping_run(nnom_layer_t * layer)
 {
 	nnom_cropping_layer_t *cl = (nnom_cropping_layer_t*)layer;
 
-	local_cropping_q7(layer->in->mem->blk, 
+	local_cropping_HWC_q7(layer->in->mem->blk, 
 						layer->in->shape.w, layer->in->shape.h, layer->in->shape.c,
 						cl->pad.top,
 						cl->pad.bottom,