Skip to content
Snippets Groups Projects
Commit 825c35d7 authored by Olivier BICHLER's avatar Olivier BICHLER
Browse files

Fixed issue with number of elements in activation

parent 9ec8701f
No related branches found
No related tags found
2 merge requests!710.4.0,!59Continuous improvement of export_cpp
......@@ -4,7 +4,7 @@
#include "network/activation_utils.hpp"
#include "network/rescaling_utils.hpp"
template<int NB_DATA,
template<int NB_ELTS,
ActivationFunction_T ACTIVATION,
typename Input_T, typename Output_T, typename Rescaling_T>
__attribute__((always_inline)) inline
......@@ -13,12 +13,9 @@ void activation_forward (
Output_T* __restrict outputs,
const Rescaling_T& __restrict rescaling)
{
for (int i = 0; i < NB_DATA; ++i)
{
for (int i = 0; i < NB_ELTS; ++i) {
outputs[i] = activation_forward_value<Output_T>(inputs[i], i, ACTIVATION, rescaling);
}
}
#endif // __AIDGE_EXPORT_CPP_KERNELS_ACTIVATION__
......@@ -4,8 +4,7 @@
#include "network/rescaling_utils.hpp"
{# For layer configuration -#}
{%- set nb_data = in_chan[0] * in_height[0] * in_width[0] %}
#define {{ name|upper }}_NB_DATA {{ nb_data }}
#define {{ name|upper }}_NB_ELTS {{ in_dims[0]|join('*') }}
#define {{ name|upper }}_ACTIVATION {{ activation }}
{% include "./_def_io.jinja" %}
{% include "./_meminfo.jinja" %}
......
{% filter indent(width=4, first=False) %}
{% include "./_mem_offset.jinja" %}
activation_forward<{{name|upper}}_NB_DATA,
activation_forward<{{name|upper}}_NB_ELTS,
{{name|upper}}_ACTIVATION>
({{in_name[0]}}, {{out_name[0]}}, {{name|upper}}_RESCALING);
{% include "./_save_outputs.jinja" %}
......
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