diff --git a/ne16/hal/ne16_task.c b/ne16/hal/ne16_task.c index f8408da..94909dc 100644 --- a/ne16/hal/ne16_task.c +++ b/ne16/hal/ne16_task.c @@ -206,8 +206,8 @@ void ne16_task_set_padding(ne16_task_t *task, const uint8_t top, } void ne16_task_set_mask_filter(ne16_task_t *task, const uint8_t top, - const uint8_t right, const uint8_t bottom, - const uint8_t left) { + const uint8_t bottom, const uint8_t left, + const uint8_t right) { task->data.cfg.filter_mask = ((top & 0xff) << 24) | ((right & 0xff) << 16) | ((bottom & 0xff) << 8) | ((left & 0xff) << 0); } @@ -219,8 +219,8 @@ void ne16_task_set_dims(ne16_task_t *task, const uint32_t w_in, const uint32_t h_out_stride, const uint32_t w_out_stride, const uint8_t padding_top, const uint8_t padding_bottom, - const uint8_t padding_right, - const uint8_t padding_left) { + const uint8_t padding_left, + const uint8_t padding_right) { ne16_task_set_strides(task, k_in, h_in_stride, w_in_stride, h_out_stride, w_out_stride); ne16_task_set_counters(task, k_in, h_out, w_out, k_out, padding_bottom, @@ -235,8 +235,8 @@ void ne16_task_set_dims_stride2x2( const uint32_t h_out, const uint32_t w_out, const uint32_t k_out, const uint32_t h_out_stride, const uint32_t w_out_stride, const uint8_t h_ker, const uint8_t w_ker, const uint8_t padding_top, - const uint8_t padding_bottom, const uint8_t padding_right, - const uint8_t padding_left) { + const uint8_t padding_bottom, const uint8_t padding_left, + const uint8_t padding_right) { const uint8_t stride = 2; // WARNING: works only for even output channel stride (divisible by 2) diff --git a/ne16/hal/ne16_task.h b/ne16/hal/ne16_task.h index a22646b..5fd167f 100644 --- a/ne16/hal/ne16_task.h +++ b/ne16/hal/ne16_task.h @@ -157,8 +157,8 @@ void ne16_task_set_padding(ne16_task_t *task, const uint8_t top, const uint8_t bottom, const uint8_t left, const uint8_t right, const uint8_t value); void ne16_task_set_mask_filter(ne16_task_t *task, const uint8_t top, - const uint8_t right, const uint8_t bottom, - const uint8_t left); + const uint8_t bottom, const uint8_t left, + const uint8_t right); /** ne16_task_set_dims * * All the strides variables are strides between elements alongside that @@ -172,8 +172,8 @@ void ne16_task_set_dims(ne16_task_t *task, const uint32_t w_in, const uint32_t h_out_stride, const uint32_t w_out_stride, const uint8_t padding_top, const uint8_t padding_bottom, - const uint8_t padding_right, - const uint8_t padding_left); + const uint8_t padding_left, + const uint8_t padding_right); /** ne16_task_set_dims_stride2x2 * * All the strides variables are strides between elements alongside that @@ -186,7 +186,7 @@ void ne16_task_set_dims_stride2x2( const uint32_t h_out, const uint32_t w_out, const uint32_t k_out, const uint32_t h_out_stride, const uint32_t w_out_stride, const uint8_t h_ker, const uint8_t w_ker, const uint8_t padding_top, - const uint8_t padding_bottom, const uint8_t padding_right, - const uint8_t padding_left); + const uint8_t padding_bottom, const uint8_t padding_left, + const uint8_t padding_right); #endif // !__NE16_TASK_H__ diff --git a/neureka/hal/neureka_task.c b/neureka/hal/neureka_task.c index 110ad83..e451af9 100644 --- a/neureka/hal/neureka_task.c +++ b/neureka/hal/neureka_task.c @@ -216,8 +216,8 @@ void neureka_task_set_padding(neureka_task_t *task, const uint8_t top, } void neureka_task_set_mask_filter(neureka_task_t *task, const uint8_t top, - const uint8_t right, const uint8_t bottom, - const uint8_t left) { + const uint8_t bottom, const uint8_t left, + const uint8_t right) { task->data.cfg.filter_mask = ((top & 0xff) << 24) | ((right & 0xff) << 16) | ((bottom & 0xff) << 8) | ((left & 0xff) << 0); } @@ -228,7 +228,7 @@ void neureka_task_set_dims( const uint32_t h_out, const uint32_t w_out, const uint32_t k_out, const uint32_t h_out_stride, const uint32_t w_out_stride, const uint8_t padding_top, const uint8_t padding_bottom, - const uint8_t padding_right, const uint8_t padding_left) { + const uint8_t padding_left, const uint8_t padding_right) { neureka_task_set_strides(task, k_in, h_in_stride, w_in_stride, h_out_stride, w_out_stride); neureka_task_set_counters(task, k_in, h_out, w_out, k_out, padding_bottom, diff --git a/neureka/hal/neureka_task.h b/neureka/hal/neureka_task.h index 6c255b6..6d001fe 100644 --- a/neureka/hal/neureka_task.h +++ b/neureka/hal/neureka_task.h @@ -168,8 +168,8 @@ void neureka_task_set_padding(neureka_task_t *task, const uint8_t top, const uint8_t bottom, const uint8_t left, const uint8_t right, const uint8_t value); void neureka_task_set_mask_filter(neureka_task_t *task, const uint8_t top, - const uint8_t right, const uint8_t bottom, - const uint8_t left); + const uint8_t bottom, const uint8_t left, + const uint8_t right); /** neureka_task_set_dims * * All the strides variables are strides between elements alongside that @@ -182,6 +182,6 @@ void neureka_task_set_dims( const uint32_t h_out, const uint32_t w_out, const uint32_t k_out, const uint32_t h_out_stride, const uint32_t w_out_stride, const uint8_t padding_top, const uint8_t padding_bottom, - const uint8_t padding_right, const uint8_t padding_left); + const uint8_t padding_left, const uint8_t padding_right); #endif // !__NEUREKA_TASK_H__ diff --git a/test/app/src/nnx_layer.c b/test/app/src/nnx_layer.c index 0d98ff6..675e32a 100644 --- a/test/app/src/nnx_layer.c +++ b/test/app/src/nnx_layer.c @@ -158,13 +158,13 @@ static void task_prepare(nnx_task_t *task) { nnx_task_set_dims_stride2x2( task, INPUT_HEIGHT, INPUT_WIDTH, INPUT_CHANNEL, h_in_stride, w_in_stride, OUTPUT_HEIGHT, OUTPUT_WIDTH, OUTPUT_CHANNEL, h_out_stride, w_out_stride, - WEIGHT_HEIGHT, WEIGHT_WIDTH, PADDING_TOP, PADDING_BOTTOM, PADDING_RIGHT, - PADDING_LEFT); + WEIGHT_HEIGHT, WEIGHT_WIDTH, PADDING_TOP, PADDING_BOTTOM, PADDING_LEFT, + PADDING_RIGHT); #else nnx_task_set_dims(task, INPUT_WIDTH, INPUT_CHANNEL, h_in_stride, w_in_stride, OUTPUT_HEIGHT, OUTPUT_WIDTH, OUTPUT_CHANNEL, h_out_stride, - w_out_stride, PADDING_TOP, PADDING_BOTTOM, PADDING_RIGHT, - PADDING_LEFT); + w_out_stride, PADDING_TOP, PADDING_BOTTOM, PADDING_LEFT, + PADDING_RIGHT); #endif nnx_task_set_ptrs(task, (uint32_t)input, INPUT_WIDTH, w_in_stride,