From 72547f8492687aa00e160d7e8084719eabbb9021 Mon Sep 17 00:00:00 2001
From: Ilona LAZRAK IL279565 <ilona.lazrak@gmail.com>
Date: Thu, 25 Jul 2024 15:14:50 +0200
Subject: [PATCH] renamed functions to reflect kernel format (CHW)
---
...tmax_float32.c => aidge_softmax_chw_float32.c} | 2 +-
..._float32.c => aidge_batchnorm2d_chw_float32.c} | 2 +-
...atmul_float32.c => aidge_matmul_chw_float32.c} | 2 +-
...hape_float32.c => aidge_reshape_chw_float32.c} | 2 +-
...ather_float32.c => aidge_gather_chw_float32.c} | 2 +-
...se_float32.c => aidge_transpose_chw_float32.c} | 2 +-
.../templates/kernel/activation_chw.jinja | 1 +
.../_Aidge_Arm/templates/kernel/batchnorm2d.jinja | 2 +-
.../_Aidge_Arm/templates/kernel/gather.jinja | 2 +-
.../_Aidge_Arm/templates/kernel/matmul.jinja | 2 +-
.../_Aidge_Arm/templates/kernel/reshape.jinja | 2 +-
.../_Aidge_Arm/templates/kernel/transpose.jinja | 2 +-
aidge_export_arm_cortexm/operators.py | 15 +++++++--------
13 files changed, 19 insertions(+), 19 deletions(-)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/Activation/Softmax/{aidge_softmax_float32.c => aidge_softmax_chw_float32.c} (95%)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/BatchNorm/{aidge_batchnorm2d_float32.c => aidge_batchnorm2d_chw_float32.c} (94%)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/MatMul/{aidge_matmul_float32.c => aidge_matmul_chw_float32.c} (98%)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/Reshape/{aidge_reshape_float32.c => aidge_reshape_chw_float32.c} (78%)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Gather/{aidge_gather_float32.c => aidge_gather_chw_float32.c} (96%)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Transpose/{aidge_transpose_float32.c => aidge_transpose_chw_float32.c} (94%)
create mode 100644 aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/activation_chw.jinja
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Activation/Softmax/aidge_softmax_float32.c b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Activation/Softmax/aidge_softmax_chw_float32.c
similarity index 95%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/Activation/Softmax/aidge_softmax_float32.c
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/Activation/Softmax/aidge_softmax_chw_float32.c
index cafa9e4..93d710e 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Activation/Softmax/aidge_softmax_float32.c
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Activation/Softmax/aidge_softmax_chw_float32.c
@@ -1,6 +1,6 @@
#include <math.h>
-void aidge_softmax_float32 (float* inputs,
+void aidge_softmax_chw_float32 (float* inputs,
float* outputs,
int inputDims[],
int axis,
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/BatchNorm/aidge_batchnorm2d_float32.c b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/BatchNorm/aidge_batchnorm2d_chw_float32.c
similarity index 94%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/BatchNorm/aidge_batchnorm2d_float32.c
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/BatchNorm/aidge_batchnorm2d_chw_float32.c
index a6d65b2..62cc292 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/BatchNorm/aidge_batchnorm2d_float32.c
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/BatchNorm/aidge_batchnorm2d_chw_float32.c
@@ -1,7 +1,7 @@
#include <math.h>
-void aidge_batchnorm2d_float32 (float* inputs,
+void aidge_batchnorm2d_chw_float32 (float* inputs,
float* outputs,
float* input_mean,
float* input_var,
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/MatMul/aidge_matmul_float32.c b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/MatMul/aidge_matmul_chw_float32.c
similarity index 98%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/MatMul/aidge_matmul_float32.c
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/MatMul/aidge_matmul_chw_float32.c
index a28659a..764d3d0 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/MatMul/aidge_matmul_float32.c
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/MatMul/aidge_matmul_chw_float32.c
@@ -1,4 +1,4 @@
-void aidge_matmul_float32(float* input_a,
+void aidge_matmul_chw_float32(float* input_a,
float* input_b,
float* output,
int dim_a[],
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Reshape/aidge_reshape_float32.c b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Reshape/aidge_reshape_chw_float32.c
similarity index 78%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/Reshape/aidge_reshape_float32.c
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/Reshape/aidge_reshape_chw_float32.c
index 8ddbef4..e55d77c 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Reshape/aidge_reshape_float32.c
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Reshape/aidge_reshape_chw_float32.c
@@ -1,5 +1,5 @@
-void aidge_reshape_float32(float* inputs,
+void aidge_reshape_chw_float32(float* inputs,
float* outputs,
unsigned int size)
{
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Gather/aidge_gather_float32.c b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Gather/aidge_gather_chw_float32.c
similarity index 96%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Gather/aidge_gather_float32.c
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Gather/aidge_gather_chw_float32.c
index 71abc52..62fee42 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Gather/aidge_gather_float32.c
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Gather/aidge_gather_chw_float32.c
@@ -1,6 +1,6 @@
-void aidge_gather_float32 (float* inputs,
+void aidge_gather_chw_float32 (float* inputs,
float* outputs,
int axis,
int indices[],
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Transpose/aidge_transpose_float32.c b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Transpose/aidge_transpose_chw_float32.c
similarity index 94%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Transpose/aidge_transpose_float32.c
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Transpose/aidge_transpose_chw_float32.c
index 2256ecd..7b0313a 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Transpose/aidge_transpose_float32.c
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Transform/Transpose/aidge_transpose_chw_float32.c
@@ -1,4 +1,4 @@
-void aidge_transpose_float32 (float* inputs,
+void aidge_transpose_chw_float32 (float* inputs,
float* outputs,
int input_dims[],
int perm[],
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/activation_chw.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/activation_chw.jinja
new file mode 100644
index 0000000..796a371
--- /dev/null
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/activation_chw.jinja
@@ -0,0 +1 @@
+ 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
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/batchnorm2d.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/batchnorm2d.jinja
index da6ff89..5e7c73c 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/batchnorm2d.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/batchnorm2d.jinja
@@ -1 +1 @@
-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);
\ No newline at end of file
+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
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/gather.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/gather.jinja
index 5abb0b4..f709c86 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/gather.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/gather.jinja
@@ -1 +1 @@
-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);
\ No newline at end of file
+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
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/matmul.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/matmul.jinja
index b9315fe..15ff05f 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/matmul.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/matmul.jinja
@@ -1 +1 @@
-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);
\ No newline at end of file
+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
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/reshape.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/reshape.jinja
index 839624d..059e90e 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/reshape.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/reshape.jinja
@@ -1 +1 @@
-aidge_reshape_{{dataformat}}({{input_name}}, {{output_name}}, {{name|upper}}_OUTPUTS_SIZE);
\ No newline at end of file
+aidge_reshape_chw_{{dataformat}}({{input_name}}, {{output_name}}, {{name|upper}}_OUTPUTS_SIZE);
\ No newline at end of file
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/transpose.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/transpose.jinja
index 91c266e..748cc71 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/transpose.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/kernel/transpose.jinja
@@ -1 +1 @@
-aidge_transpose_{{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
+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
diff --git a/aidge_export_arm_cortexm/operators.py b/aidge_export_arm_cortexm/operators.py
index f9520fe..2cafd33 100644
--- a/aidge_export_arm_cortexm/operators.py
+++ b/aidge_export_arm_cortexm/operators.py
@@ -596,7 +596,6 @@ class FC_ARMCortexM(ExportNode):
# # transform to [nb_outputs, 1, 1]
# self.outputs_dims[0] = [self.outputs_dims[0][1], 1, 1]
-
def export(self, export_folder:Path, list_configs:list):
# Export weights to NHWC format
@@ -873,7 +872,7 @@ class Softmax_ARMCortexM(ExportNode):
if self.library == "aidge":
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"))
generate_file(
@@ -895,7 +894,7 @@ class Softmax_ARMCortexM(ExportNode):
if self.library == "aidge":
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,
activation_type="softmax",
dataformat=self.dataformat,
@@ -933,7 +932,7 @@ class BatchNorm2D_ARMCortexM(ExportNode):
if self.library == "aidge":
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"))
generate_file(
@@ -1028,7 +1027,7 @@ class Reshape_ARMCortexM(ExportNode):
if self.library == "aidge":
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"))
generate_file(
@@ -1091,7 +1090,7 @@ class Matmul_ARMCortexM(ExportNode):
if self.library == "aidge":
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"))
copyfile(str(ROOT / "_Aidge_Arm" / "kernels" / "SupportFunctions" / "aidge_supportfunctions.h"),
str(Path(export_folder) / "include"))
@@ -1146,7 +1145,7 @@ class Gather_ARMCortexM(ExportNode):
if self.library == "aidge":
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"))
generate_file(
@@ -1203,7 +1202,7 @@ class Transpose_ARMCortexM(ExportNode):
if self.library == "aidge":
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"))
generate_file(
--
GitLab