Skip to content
Snippets Groups Projects
Commit 72547f84 authored by Ilona Lazrak's avatar Ilona Lazrak
Browse files

renamed functions to reflect kernel format (CHW)

parent 2175e25f
No related branches found
No related tags found
3 merge requests!17v0.1.0,!12v0.4.0,!9New operators merge request
Showing
with 19 additions and 19 deletions
#include <math.h> #include <math.h>
void aidge_softmax_float32 (float* inputs, void aidge_softmax_chw_float32 (float* inputs,
float* outputs, float* outputs,
int inputDims[], int inputDims[],
int axis, int axis,
......
#include <math.h> #include <math.h>
void aidge_batchnorm2d_float32 (float* inputs, void aidge_batchnorm2d_chw_float32 (float* inputs,
float* outputs, float* outputs,
float* input_mean, float* input_mean,
float* input_var, float* input_var,
......
void aidge_matmul_float32(float* input_a, void aidge_matmul_chw_float32(float* input_a,
float* input_b, float* input_b,
float* output, float* output,
int dim_a[], int dim_a[],
......
void aidge_reshape_float32(float* inputs, void aidge_reshape_chw_float32(float* inputs,
float* outputs, float* outputs,
unsigned int size) unsigned int size)
{ {
......
void aidge_gather_float32 (float* inputs, void aidge_gather_chw_float32 (float* inputs,
float* outputs, float* outputs,
int axis, int axis,
int indices[], int indices[],
......
void aidge_transpose_float32 (float* inputs, void aidge_transpose_chw_float32 (float* inputs,
float* outputs, float* outputs,
int input_dims[], int input_dims[],
int perm[], int perm[],
......
aidge_{{activation_type|lower}}_chw_{{dataformat}}({{input_name}}, {{output_name}}, {% if activation_type is eq('softmax') %} {{input_name}}_DIMS, {{name|upper}}_AXIS, {{name|upper}}_INPUT_DIMS_SIZE,{% endif %} {{name|upper}}_OUTPUTS_SIZE);
\ No newline at end of file
aidge_batchnorm2d_{{dataformat}} ({{input_name}}, {{output_name}}, {{running_mean_name}}, {{running_var_name}}, {{weight_name}}, {{bias_name}}, {{ name|upper }}_EPSILON, {{ name|upper }}_NB_CHANNELS, {{ name|upper }}_CHANNELS_WIDTH, {{ name|upper }}_CHANNELS_HEIGHT); aidge_batchnorm2d_chw_{{dataformat}} ({{input_name}}, {{output_name}}, {{running_mean_name}}, {{running_var_name}}, {{weight_name}}, {{bias_name}}, {{ name|upper }}_EPSILON, {{ name|upper }}_NB_CHANNELS, {{ name|upper }}_CHANNELS_WIDTH, {{ name|upper }}_CHANNELS_HEIGHT);
\ No newline at end of file \ No newline at end of file
aidge_gather_{{dataformat}} ({{input_name}}, {{output_name}}, {{name|upper}}_AXIS, {{name}}_INDEXES , {{input_name}}_DIMS, {{name|upper}}_INPUT_DIMS_SIZE,{{name|upper}}_INDEXES_DIMS_SIZE,{{name|upper}}_OUTPUT_SIZE); aidge_gather_chw_{{dataformat}} ({{input_name}}, {{output_name}}, {{name|upper}}_AXIS, {{name}}_INDEXES , {{input_name}}_DIMS, {{name|upper}}_INPUT_DIMS_SIZE,{{name|upper}}_INDEXES_DIMS_SIZE,{{name|upper}}_OUTPUT_SIZE);
\ No newline at end of file \ No newline at end of file
aidge_matmul_{{dataformat}} ({{inputa_name}}, {{inputb_name}}, {{output_name}}, {{inputa_name}}_DIMS, {{inputb_name}}_DIMS, {{output_name}}_DIMS ,{{name|upper}}_INPUT_A_DIMS_SIZE,{{name|upper}}_INPUT_B_DIMS_SIZE,{{name|upper}}_OUTPUT_DIMS_SIZE); aidge_matmul_chw_{{dataformat}} ({{inputa_name}}, {{inputb_name}}, {{output_name}}, {{inputa_name}}_DIMS, {{inputb_name}}_DIMS, {{output_name}}_DIMS ,{{name|upper}}_INPUT_A_DIMS_SIZE,{{name|upper}}_INPUT_B_DIMS_SIZE,{{name|upper}}_OUTPUT_DIMS_SIZE);
\ No newline at end of file \ No newline at end of file
aidge_reshape_{{dataformat}}({{input_name}}, {{output_name}}, {{name|upper}}_OUTPUTS_SIZE); aidge_reshape_chw_{{dataformat}}({{input_name}}, {{output_name}}, {{name|upper}}_OUTPUTS_SIZE);
\ No newline at end of file \ No newline at end of file
aidge_transpose_{{dataformat}} ({{input_name}}, {{output_name}},{{input_name}}_DIMS, {{name}}_PERMUTATIONS, {{output_name}}_DIMS, {{name|upper}}_OUTPUT_DIMS_SIZE, {{name|upper}}_OUTPUT_SIZE); aidge_transpose_chw_{{dataformat}} ({{input_name}}, {{output_name}},{{input_name}}_DIMS, {{name}}_PERMUTATIONS, {{output_name}}_DIMS, {{name|upper}}_OUTPUT_DIMS_SIZE, {{name|upper}}_OUTPUT_SIZE);
\ No newline at end of file \ No newline at end of file
...@@ -596,7 +596,6 @@ class FC_ARMCortexM(ExportNode): ...@@ -596,7 +596,6 @@ class FC_ARMCortexM(ExportNode):
# # transform to [nb_outputs, 1, 1] # # transform to [nb_outputs, 1, 1]
# self.outputs_dims[0] = [self.outputs_dims[0][1], 1, 1] # self.outputs_dims[0] = [self.outputs_dims[0][1], 1, 1]
def export(self, export_folder:Path, list_configs:list): def export(self, export_folder:Path, list_configs:list):
# Export weights to NHWC format # Export weights to NHWC format
...@@ -873,7 +872,7 @@ class Softmax_ARMCortexM(ExportNode): ...@@ -873,7 +872,7 @@ class Softmax_ARMCortexM(ExportNode):
if self.library == "aidge": if self.library == "aidge":
if self.dataformat == "float32": if self.dataformat == "float32":
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Activation" / "Softmax" / "aidge_softmax_float32.c"), copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Activation" / "Softmax" / "aidge_softmax_chw_float32.c"),
str(export_folder / "src" / "kernels")) str(export_folder / "src" / "kernels"))
generate_file( generate_file(
...@@ -895,7 +894,7 @@ class Softmax_ARMCortexM(ExportNode): ...@@ -895,7 +894,7 @@ class Softmax_ARMCortexM(ExportNode):
if self.library == "aidge": if self.library == "aidge":
list_actions.append(generate_str( list_actions.append(generate_str(
str(ROOT / "_Aidge_Arm" / "templates" / "kernel" / "activation.jinja"), str(ROOT / "_Aidge_Arm" / "templates" / "kernel" / "activation_chw.jinja"),
name=self.name, name=self.name,
activation_type="softmax", activation_type="softmax",
dataformat=self.dataformat, dataformat=self.dataformat,
...@@ -933,7 +932,7 @@ class BatchNorm2D_ARMCortexM(ExportNode): ...@@ -933,7 +932,7 @@ class BatchNorm2D_ARMCortexM(ExportNode):
if self.library == "aidge": if self.library == "aidge":
if self.dataformat == "float32": if self.dataformat == "float32":
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "BatchNorm" / "aidge_batchnorm2d_float32.c"), copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "BatchNorm" / "aidge_batchnorm2d_chw_float32.c"),
str(export_folder / "src" / "kernels")) str(export_folder / "src" / "kernels"))
generate_file( generate_file(
...@@ -1028,7 +1027,7 @@ class Reshape_ARMCortexM(ExportNode): ...@@ -1028,7 +1027,7 @@ class Reshape_ARMCortexM(ExportNode):
if self.library == "aidge": if self.library == "aidge":
if self.dataformat == "float32": if self.dataformat == "float32":
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Reshape" / "aidge_reshape_float32.c"), copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Reshape" / "aidge_reshape_chw_float32.c"),
str(export_folder / "src" / "kernels")) str(export_folder / "src" / "kernels"))
generate_file( generate_file(
...@@ -1091,7 +1090,7 @@ class Matmul_ARMCortexM(ExportNode): ...@@ -1091,7 +1090,7 @@ class Matmul_ARMCortexM(ExportNode):
if self.library == "aidge": if self.library == "aidge":
if self.dataformat == "float32": if self.dataformat == "float32":
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "MatMul" / "aidge_matmul_float32.c"), copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "MatMul" / "aidge_matmul_chw_float32.c"),
str(export_folder / "src" / "kernels")) str(export_folder / "src" / "kernels"))
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "SupportFunctions" / "aidge_supportfunctions.h"), copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "SupportFunctions" / "aidge_supportfunctions.h"),
str(Path(export_folder) / "include")) str(Path(export_folder) / "include"))
...@@ -1146,7 +1145,7 @@ class Gather_ARMCortexM(ExportNode): ...@@ -1146,7 +1145,7 @@ class Gather_ARMCortexM(ExportNode):
if self.library == "aidge": if self.library == "aidge":
if self.dataformat == "float32": if self.dataformat == "float32":
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Transform" / "Gather" / "aidge_gather_float32.c"), copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Transform" / "Gather" / "aidge_gather_chw_float32.c"),
str(export_folder / "src" / "kernels")) str(export_folder / "src" / "kernels"))
generate_file( generate_file(
...@@ -1203,7 +1202,7 @@ class Transpose_ARMCortexM(ExportNode): ...@@ -1203,7 +1202,7 @@ class Transpose_ARMCortexM(ExportNode):
if self.library == "aidge": if self.library == "aidge":
if self.dataformat == "float32": if self.dataformat == "float32":
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Transform" / "Transpose" / "aidge_transpose_float32.c"), copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "Transform" / "Transpose" / "aidge_transpose_chw_float32.c"),
str(export_folder / "src" / "kernels")) str(export_folder / "src" / "kernels"))
generate_file( generate_file(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment