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 5f35aaf670f9b7aac7f46b7394656cd2beab9356..56e3f5101fee5ffaff45ca84950763a2e949010e 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 dc368181ad2e23036fd80277c4f062d817b2dd4c..2ab870bb98ed27df86ed254568aa2d2940f47c86 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 bcc6a09288c884bf2b7d351329f682a492433a2a..71717401aa095a6899a61134e5c62077cf2967f4 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 b7dc7bd3ff2ab65d61d5f58af4bff1780dd15444..7bdab9230ac4fc95de53dfed9f0f5415c0cf94db 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 7de26494bc8ae6d6edad687b6e6d150d82b50821..13d4954c22bac3054dae06bb1e11ed3d85a5c4e3 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 5fe2d352bc28ed09534c0433ef0fc1d9866e037d..ae61046c84870fba73d20ea382915d8d2a97e28a 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 733a0c00e6df415f24b2fc5fe589888d1fcf5803..5f11b8fe909a6cc57b3d31d654402159021c06e9 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"),