From 10bfb0ac5b683bdac9706eeb90253d503dce0c5f Mon Sep 17 00:00:00 2001
From: thibault allenet <thibault.allenet@cea.fr>
Date: Mon, 16 Dec 2024 11:13:34 +0000
Subject: [PATCH] Rename "custom" into "Lowbit"
---
.../{CustomConv.hpp => LowbitConv.hpp} | 2 +-
.../{CustomFc.hpp => LowbitFc.hpp} | 2 +-
.../{CustomPooling.hpp => LowbitPooling.hpp} | 2 +-
..._kernel.jinja => lowbit_conv_kernel.jinja} | 2 +-
...fc_kernel.jinja => lowbit_fc_kernel.jinja} | 2 +-
..._kernel.jinja => lowbit_pool_kernel.jinja} | 2 +-
aidge_export_arm_cortexm/operators.py | 24 +++++++++----------
7 files changed, 18 insertions(+), 18 deletions(-)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/Convolution/{CustomConv.hpp => LowbitConv.hpp} (99%)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/FullyConnected/{CustomFc.hpp => LowbitFc.hpp} (98%)
rename aidge_export_arm_cortexm/_Aidge_Arm/kernels/Pooling/{CustomPooling.hpp => LowbitPooling.hpp} (98%)
rename aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/{custom_conv_kernel.jinja => lowbit_conv_kernel.jinja} (93%)
rename aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/{custom_fc_kernel.jinja => lowbit_fc_kernel.jinja} (89%)
rename aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/{custom_pool_kernel.jinja => lowbit_pool_kernel.jinja} (93%)
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Convolution/CustomConv.hpp b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Convolution/LowbitConv.hpp
similarity index 99%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/Convolution/CustomConv.hpp
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/Convolution/LowbitConv.hpp
index 5f35aaf..56e3f51 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Convolution/CustomConv.hpp
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Convolution/LowbitConv.hpp
@@ -54,7 +54,7 @@ template<int NB_CHANNELS,
typename Sum_T, typename Input_T, typename Output_T,
typename Weight_T, typename Bias_T, typename Rescaling_T>
__attribute__((always_inline)) inline static
-void customconvcellPropagate(const Input_T* __restrict inputs,
+void lowbitconvcellPropagate(const Input_T* __restrict inputs,
Output_T* __restrict outputs,
const Bias_T* __restrict biasses,
const Weight_T* __restrict weights,
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/FullyConnected/CustomFc.hpp b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/FullyConnected/LowbitFc.hpp
similarity index 98%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/FullyConnected/CustomFc.hpp
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/FullyConnected/LowbitFc.hpp
index dc36818..2ab870b 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/FullyConnected/CustomFc.hpp
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/FullyConnected/LowbitFc.hpp
@@ -37,7 +37,7 @@ template<int NB_CHANNELS, int CHANNELS_HEIGHT, int CHANNELS_WIDTH,
typename Sum_T, typename Input_T, typename Output_T,
typename Weight_T, typename Bias_T, typename Rescaling_T>
__attribute__((always_inline)) inline static
-void fccellPropagate(const Input_T* __restrict inputs,
+void lowbitfccellPropagate(const Input_T* __restrict inputs,
Output_T* __restrict outputs,
const Bias_T* __restrict biasses,
const Weight_T* __restrict weights,
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Pooling/CustomPooling.hpp b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Pooling/LowbitPooling.hpp
similarity index 98%
rename from aidge_export_arm_cortexm/_Aidge_Arm/kernels/Pooling/CustomPooling.hpp
rename to aidge_export_arm_cortexm/_Aidge_Arm/kernels/Pooling/LowbitPooling.hpp
index bcc6a09..7171740 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Pooling/CustomPooling.hpp
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/kernels/Pooling/LowbitPooling.hpp
@@ -40,7 +40,7 @@ template<int NB_CHANNELS, int CHANNELS_HEIGHT, int CHANNELS_WIDTH,
Pooling_T POOLING, ActivationFunction_T ACTIVATION,
typename Input_T, typename Output_T>
__attribute__((always_inline)) inline static
-void custompoolcellPropagate(const Input_T* __restrict inputs,
+void lowbitpoolcellPropagate(const Input_T* __restrict inputs,
Output_T* __restrict outputs)
{
static_assert(std::is_same<Input_T, Output_T>::value, "Input_T and Output_T must be the same.");
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_conv_kernel.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_conv_kernel.jinja
similarity index 93%
rename from aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_conv_kernel.jinja
rename to aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_conv_kernel.jinja
index b7dc7bd..7bdab92 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_conv_kernel.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_conv_kernel.jinja
@@ -1,6 +1,6 @@
{% filter indent(width=4, first=False) %}
{% include "./_mem_offset.jinja" %}
-N2D2_Export::customconvcellPropagate<{{ in_name[0]|upper }}_NB_CHANNELS,
+N2D2_Export::lowbitconvcellPropagate<{{ in_name[0]|upper }}_NB_CHANNELS,
{{ in_name[0]|upper }}_IN_HEIGHT,
{{ in_name[0]|upper }}_IN_WIDTH,
{{ out_name[0]|upper }}_NB_OUTPUTS,
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_fc_kernel.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_fc_kernel.jinja
similarity index 89%
rename from aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_fc_kernel.jinja
rename to aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_fc_kernel.jinja
index 7de2649..13d4954 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_fc_kernel.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_fc_kernel.jinja
@@ -1,6 +1,6 @@
{% filter indent(width=4, first=False) %}
{% include "./_mem_offset.jinja" %}
-N2D2_Export::fccellPropagate<{{ in_name[0] | upper }}_NB_CHANNELS,
+N2D2_Export::lowbitfccellPropagate<{{ in_name[0] | upper }}_NB_CHANNELS,
{{ in_name[0] | upper }}_IN_HEIGHT,
{{ in_name[0] | upper }}_IN_WIDTH,
{{ out_name[0] | upper }}_NB_OUTPUTS,
diff --git a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_pool_kernel.jinja b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_pool_kernel.jinja
similarity index 93%
rename from aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_pool_kernel.jinja
rename to aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_pool_kernel.jinja
index 5fe2d35..ae61046 100644
--- a/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/custom_pool_kernel.jinja
+++ b/aidge_export_arm_cortexm/_Aidge_Arm/templates/forward_call/lowbit_pool_kernel.jinja
@@ -1,6 +1,6 @@
{% filter indent(width=4, first=False) %}
{% include "./_mem_offset.jinja" %}
-N2D2_Export::custompoolcellPropagate<{{ in_name[0]|upper }}_NB_CHANNELS,
+N2D2_Export::lowbitpoolcellPropagate<{{ in_name[0]|upper }}_NB_CHANNELS,
{{ in_name[0]|upper }}_IN_HEIGHT,
{{ in_name[0]|upper }}_IN_WIDTH,
{{ out_name[0]|upper }}_NB_OUTPUTS,
diff --git a/aidge_export_arm_cortexm/operators.py b/aidge_export_arm_cortexm/operators.py
index 733a0c0..5f11b8f 100644
--- a/aidge_export_arm_cortexm/operators.py
+++ b/aidge_export_arm_cortexm/operators.py
@@ -326,10 +326,10 @@ class PadConvScaling_ARMCortexM(ExportNodeCpp):
self.config_template = str(ROOT / "_Aidge_Arm" / "templates" / "configuration" / "conv_config.jinja")
- self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "custom_conv_kernel.jinja")
+ self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "lowbit_conv_kernel.jinja")
self.include_list = []
self.kernels_to_copy = [
- str(ROOT / "_Aidge_Arm" / "kernels" / "Convolution" / "CustomConv.hpp"),
+ str(ROOT / "_Aidge_Arm" / "kernels" / "Convolution" / "LowbitConv.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "aidge_supportfunctions.h"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "Macs.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "nn_scaling_functions.hpp"),
@@ -375,10 +375,10 @@ class ConvScaling_ARMCortexM(ExportNodeCpp):
self.config_template = str(ROOT / "_Aidge_Arm" / "templates" / "configuration" / "conv_config.jinja")
- self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "custom_conv_kernel.jinja")
+ self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "lowbit_conv_kernel.jinja")
self.include_list = []
self.kernels_to_copy = [
- str(ROOT / "_Aidge_Arm" / "kernels" / "Convolution" / "CustomConv.hpp"),
+ str(ROOT / "_Aidge_Arm" / "kernels" / "Convolution" / "LowbitConv.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "aidge_supportfunctions.h"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "Macs.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "nn_scaling_functions.hpp"),
@@ -414,10 +414,10 @@ class FCScaling_ARMCortexM(ExportNodeCpp):
self.attributes.update(Scaling(scaling_factor = scaling_factor)("floating_point"))
self.config_template = str(ROOT / "_Aidge_Arm" / "templates" / "configuration" / "fc_config.jinja")
- self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "custom_fc_kernel.jinja")
+ self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "lowbit_fc_kernel.jinja")
self.include_list = []
self.kernels_to_copy = [
- str(ROOT / "_Aidge_Arm" / "kernels" / "FullyConnected" / "CustomFc.hpp"),
+ str(ROOT / "_Aidge_Arm" / "kernels" / "FullyConnected" / "LowbitFc.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "aidge_supportfunctions.h"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "Macs.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "nn_scaling_functions.hpp"),
@@ -428,7 +428,7 @@ class FCScaling_ARMCortexM(ExportNodeCpp):
]
@ExportLibAidgeARM.register("MaxPooling2D", aidge_core.ImplSpec(aidge_core.IOSpec(aidge_core.dtype.any)))
-class CustomPooling_ARMCortexM(ExportNodeCpp):
+class LowbitPooling_ARMCortexM(ExportNodeCpp):
def __init__(self, node, mem_info, conversion_map = datatype_converter_aidge2arm):
super().__init__(node, mem_info, conversion_map)
@@ -442,14 +442,14 @@ class CustomPooling_ARMCortexM(ExportNodeCpp):
self.attributes["stride_dims"] = node.get_operator().attr.stride_dims
self.config_template = str(ROOT / "_Aidge_Arm" / "templates" / "configuration" / "pool_config.jinja")
- self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "custom_pool_kernel.jinja")
+ self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "lowbit_pool_kernel.jinja")
self.include_list = []
self.kernels_to_copy = [
- str(ROOT / "_Aidge_Arm" / "kernels" / "Pooling" / "CustomPooling.hpp")
+ str(ROOT / "_Aidge_Arm" / "kernels" / "Pooling" / "LowbitPooling.hpp")
]
self.kernels_to_copy = [
- str(ROOT / "_Aidge_Arm" / "kernels" / "Pooling" / "CustomPooling.hpp"),
+ str(ROOT / "_Aidge_Arm" / "kernels" / "Pooling" / "LowbitPooling.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "aidge_supportfunctions.h"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "Macs.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "subkernels_functions.hpp"),
@@ -478,10 +478,10 @@ class Conv_ARMCortexM(ExportNodeCpp):
self.attributes["padding"] = [0, 0]
self.config_template = str(ROOT / "_Aidge_Arm" / "templates" / "configuration" / "conv_config.jinja")
- self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "custom_conv_kernel.jinja")
+ self.forward_template = str(ROOT / "_Aidge_Arm" / "templates" / "forward_call" / "lowbit_conv_kernel.jinja")
self.include_list = []
self.kernels_to_copy = [
- str(ROOT / "_Aidge_Arm" / "kernels" / "Convolution" / "CustomConv.hpp"),
+ str(ROOT / "_Aidge_Arm" / "kernels" / "Convolution" / "LowbitConv.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "aidge_supportfunctions.h"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "Macs.hpp"),
str(ROOT / "_Aidge_Arm" / "kernels" / "Utils" / "nn_scaling_functions.hpp"),
--
GitLab