diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Slice/aidge_slice_float32.hpp b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Slice/aidge_slice_float32.hpp index d39bcce5db0741e05d5d5254c497057dc69222e8..9ec6ebc034adf579cd10d007e698d5501233fdef 100644 --- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Slice/aidge_slice_float32.hpp +++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Slice/aidge_slice_float32.hpp @@ -1,8 +1,8 @@ void aidge_slice_float32 (float* inputs, float* outputs, - int* axes, - int* starts, - int* ends, + const int* axes, + const int* starts, + const int* ends, unsigned int input_dims, unsigned int nb_axes) { diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/configuration/elemwise.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/configuration/elemwise.jinja deleted file mode 100644 index 4651bd47002f994097b233825f32e399c0c6995a..0000000000000000000000000000000000000000 --- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/configuration/elemwise.jinja +++ /dev/null @@ -1,20 +0,0 @@ -{#- For name header -#} -#ifndef {{ name|upper }}_LAYER_H -#define {{ name|upper }}_LAYER_H - -/* ElemWise - {{ elemwise_op }} layer */ - -{# For layer configuration -#} -#define {{ name|upper }}_INPUTS_SIZE {{ in_size[0] }} -#define {{ name|upper }}_OUTPUTS_SIZE {{ out_size[0] }} - - -#define {{ in_name[0]|upper }}_DIMS {{ in_dims[0] }} -#define {{ in_name[1]|upper }}_DIMS {{ in_dims[1] }} -#define {{ out_name[0]|upper }}_DIMS {{ out_dims[0] }} - -#define {{in_name[0]|upper}}_NB_DIM {{ in_dims[0]|length}} -#define {{in_name[1]|upper}}_NB_DIM {{ in_dims[1]|length}} -#define {{out_name[0]|upper}}_NB_DIM {{ out_dims[0]|length}} - -#endif /* {{ name|upper }}_LAYER_H */ diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/configuration/slice.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/configuration/slice.jinja index 55927e30d75ecffdfe86bb1ebe9fc47d8e8ac5c2..64ae093a0b513711ef74aafc01e99646070c106a 100644 --- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/configuration/slice.jinja +++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/configuration/slice.jinja @@ -3,6 +3,7 @@ #define {{ name|upper }}_LAYER_H /* Slice layer */ +{% include "./_meminfo.jinja" %} {# For layer configuration -#} #define {{ name|upper }}_NB_CHANNELS {{ nb_in }} diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/concat.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/concat.jinja index 385f92c4fe7af5f3b4115535e0ea3dcd39df0dec..01474c3286e89aac09a424b6c855c9b6e3a11fd6 100644 --- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/concat.jinja +++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/concat.jinja @@ -1,6 +1,10 @@ +{% if not is_output %} +{{out_cdtype[0]}}* {{out_name[0]}} = ({{out_cdtype[0]}}*) mem + {{out_name[0]|upper}}_OFFSET; +{% endif %} + aidge_concat{{ nb_in }}_float32 ( {{name|upper}}_AXIS, {%- for i in range(nb_in) -%} - {{ in_name[i]|upper }}, {{ name|upper }}_INPUT_{{i}}_SIZE, + {{ in_name[i]}}, {{ name|upper }}_INPUT_{{i}}_SIZE, {%- endfor -%} - {{ out_name[0]|upper }}); + {{ out_name[0] }}); diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/slice.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/slice.jinja index 306f2c96b20d663aa50a0786cd7467e962922f65..70b8b72ca8a69154907394a5273e3925f7075e2d 100644 --- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/slice.jinja +++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/slice.jinja @@ -1 +1,4 @@ +{% if not is_output %} +{{out_cdtype[0]}}* {{out_name[0]}} = ({{out_cdtype[0]}}*) mem + {{out_name[0]|upper}}_OFFSET; +{% endif %} aidge_slice_float32 ({{in_name[0]}}, {{out_name[0]}}, {{name|upper}}_AXES, {{name|upper}}_STARTS, {{name|upper}}_ENDS, {{name|upper}}_NB_AXES, {{name|upper}}_NB_CHANNELS);