shape

i-evi · Oct 2, 2020 · df8d09b · df8d09b
1 parent 3a2931e
commit df8d09b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/src/cc_conv2d.c b/src/cc_conv2d.c
@@ -34,7 +34,7 @@ cc_tensor_t *cc_conv2d(const cc_tensor_t *inp,
 	const cc_tensor_t *inp_pad;
 	cc_int32 o_ch_size, p_ch_mem_size, o_ch_mem_size,
 		k_ch_mem_size, k_mem_size, num_omp_threads, i, j;
-	cc_int32 shape[CC_CNN2D_SHAPE_LEN] = {0};
+	cc_int32 shape[CC_CNN2D_SHAPE] = {0};
 	char pad_name[CC_CONV2D_PAD_NAME_LEN];
 #ifdef ENABLE_CC_ASSERT
 	cc_assert_zero(cc_tensor_dimension(inp) - CC_CNN2D_DIM);

diff --git a/src/cc_dsc2d.c b/src/cc_dsc2d.c
@@ -29,7 +29,7 @@ cc_tensor_t *cc_dw_conv2d(cc_tensor_t *inp,
 	cc_tensor_t *inp_pad, *oup = NULL;
 	cc_int32 o_ch_size, p_ch_mem_size, o_ch_mem_size,
 		k_ch_mem_size, k_mem_size, num_omp_threads, i;
-	cc_int32 shape[CC_CNN2D_SHAPE_LEN] = {0};
+	cc_int32 shape[CC_CNN2D_SHAPE] = {0};
 	char pad_name[CC_CONV2D_PAD_NAME_LEN];
 #ifdef ENABLE_CC_ASSERT
 	cc_assert_zero(cc_tensor_dimension(inp) - CC_CNN2D_DIM);
@@ -116,7 +116,7 @@ cc_tensor_t *cc_pw_conv2d(cc_tensor_t *inp, const cc_tensor_t *kernel,
 	cc_tensor_t *oup = NULL;
 	cc_int32 o_ch_size, o_ch_mem_size,
 		k_ch_mem_size, k_mem_size, num_omp_threads, i, j;
-	cc_int32 shape[CC_CNN2D_SHAPE_LEN] = {0};
+	cc_int32 shape[CC_CNN2D_SHAPE] = {0};
 #ifdef ENABLE_CC_ASSERT
 	cc_assert_zero(cc_tensor_dimension(inp) - CC_CNN2D_DIM);
 	cc_assert_zero(cc_tensor_dimension(kernel) - CC_CONV2D_KERNEL_DIM);

diff --git a/src/cc_fmap2d.c b/src/cc_fmap2d.c
@@ -48,7 +48,7 @@ cc_tensor_t *cc_fmap2d_flat(cc_tensor_t *inp, const char *name)
 {
 	cc_tensor_t *flat = NULL;
 	cc_uint8 *sptr, *dptr;
-	cc_int32 shape[CC_CNN2D_SHAPE_LEN] = {0};
+	cc_int32 shape[CC_CNN2D_SHAPE] = {0};
 	cc_int32 i, j ,ch_size, dt_size;
 #ifdef ENABLE_CC_ASSERT
 	cc_assert_zero(cc_tensor_dimension(inp) - CC_CNN2D_DIM);

diff --git a/src/cc_fmap2d.h b/src/cc_fmap2d.h
@@ -12,7 +12,7 @@ enum cc_cnn2d_shape {
 	CC_CNN2D_SHAPE_H,
 	CC_CNN2D_SHAPE_W,
 	CC_CNN2D_DIM,
-	CC_CNN2D_SHAPE_LEN
+	CC_CNN2D_SHAPE
 };
 
 cc_tensor_t *cc_fmap2d_bias(cc_tensor_t *inp,

diff --git a/src/cc_fullycon.c b/src/cc_fullycon.c
@@ -14,10 +14,12 @@ cc_tensor_t *cc_fully_connected(const cc_tensor_t *inp,
 	const cc_tensor_t *w, const cc_tensor_t *b, const char *name)
 {
 	cc_tensor_t *oup = NULL;
-	cc_int32 shape[CC_CNN2D_SHAPE_LEN] = {0};
+	cc_int32 shape[CC_CNN2D_SHAPE] = {0};
 #ifdef ENABLE_CC_ASSERT
+	cc_assert(
+		(cc_tensor_dimension(w) == CC_CONV2D_KERNEL_DIM) ||
+		(cc_tensor_dimension(w) == CC_FULLYCON_KERNEL_DIM));
 	cc_assert_zero(cc_tensor_dimension(inp) - CC_CNN2D_DIM);
-	cc_assert_zero(cc_tensor_dimension(w) - CC_CONV2D_KERNEL_DIM);
 	cc_assert_zero(*inp->dtype - *w->dtype);
 	cc_assert_zero(*inp->dtype - *b->dtype);
 	cc_assert_zero(inp->shape[CC_CNN2D_SHAPE_C]

diff --git a/src/cc_fullycon.h b/src/cc_fullycon.h
@@ -7,6 +7,12 @@
 
 #include "cc_tensor.h"
 
+enum cc_fullycon_kernel {
+	CC_FULLYCON_KERNEL_O,
+	CC_FULLYCON_KERNEL_I,
+	CC_FULLYCON_KERNEL_DIM
+};
+
 cc_tensor_t *cc_fully_connected(const cc_tensor_t *inp,
 	const cc_tensor_t *w, const cc_tensor_t *b, const char *name);
 

diff --git a/src/cc_pad2d.c b/src/cc_pad2d.c
@@ -16,7 +16,7 @@ cc_tensor_t *cc_pad2d(const cc_tensor_t *inp,
 	cc_int32 p, cc_int32 offset, const char *name)
 {
 	cc_tensor_t *pad = NULL;
-	cc_int32 shape[CC_CNN2D_SHAPE_LEN] = {0};
+	cc_int32 shape[CC_CNN2D_SHAPE] = {0};
 	cc_int32 soffset = offset ? 1 : 0;
 	cc_int32 poffset = offset > 0 ? 1 : 0;
 	cc_int32 i, j, c, dtsize = cc_dtype_size(*inp->dtype);

diff --git a/src/cc_pool2d.c b/src/cc_pool2d.c
@@ -11,7 +11,7 @@ cc_tensor_t *cc_max_pool2d(
 	const cc_tensor_t *inp, cc_int32 s, const char *name)
 {
 	cc_int32 i, i_ch_size, i_ch_mem_size, o_ch_size, o_ch_mem_size;
-	cc_int32 shape[CC_CNN2D_SHAPE_LEN] = {0};
+	cc_int32 shape[CC_CNN2D_SHAPE] = {0};
 	cc_tensor_t *pool = NULL;
 #ifdef AUTO_TSRMGR
 	pool = cc_tsrmgr_get(name);