[Refactor] save_outputs function now adapt to the actual format of the tensor...

[Refactor] save_outputs function now adapt to the actual format of the tensor (it was previously fixed to NHWC)
Also the result is more readable.

aidge_export_cpp/static/utils.hpp

@@ -66,9 +66,10 @@ static inline OutputIt copy_n(InputIt first, Size count, OutputIt result) {
     return result;
 }
 
-#if SAVE_OUTPUTS
+#if SAVE_OUTPUTS || AIDGE_CMP
+
 enum class Format {
-    Default,
+    DEFAULT,
     NCHW,
     NHWC,
     CHWN,
@@ -77,79 +78,67 @@ enum class Format {
     CDHWN
 };
 
+#endif  // SAVE_OUTPUTS || AIDGE_CMP
+
+#if SAVE_OUTPUTS
+
+template<int NB_OUTPUTS, int OUT_HEIGHT, int OUT_WIDTH, Format FMT, typename Output_T>
+inline void saveOutputs(const Output_T* __restrict outputs, FILE* pFile) {
+
+    auto offset = 0;
+
+    // NCHW
+    if (FMT == Format::NCHW || FMT == Format::DEFAULT) {
+        fprintf(pFile, "{");
+        for (auto out = 0; out < NB_OUTPUTS; ++out) {
+            fprintf(pFile, "{");
+            for (auto h = 0; h < OUT_HEIGHT; ++h) {
+                fprintf(pFile, "{");
+                for (auto w = 0; w < OUT_WIDTH; ++w) {
 
-template<typename Output_T>
-inline void saveOutputs(
-    int NB_OUTPUTS,
-    int OUTPUTS_HEIGHT, int OUTPUTS_WIDTH,
-    // int OUTPUT_MEM_CONT_OFFSET,
-    // int OUTPUT_MEM_CONT_SIZE,
-    // int OUTPUT_MEM_WRAP_OFFSET,
-    // int OUTPUT_MEM_WRAP_SIZE,
-    // int OUTPUT_MEM_STRIDE,
-    const Output_T* __restrict outputs,
-    FILE* pFile,
-    Format format)
-{
-    // default is NHCW !
-    if (format == Format::NHWC) {
-        fprintf(pFile, "(");
-        auto oOffset = 0;
-        for(int oy = 0; oy < OUTPUTS_HEIGHT; oy++) {
-            fprintf(pFile, "(");
-
-            for(int ox = 0; ox < OUTPUTS_WIDTH; ox++) {
-                fprintf(pFile, "(");
-
-                // const int oPos = (ox + OUTPUTS_WIDTH * oy);
-                // int oOffset = OUTPUT_MEM_STRIDE * oPos;
-
-                // if (OUTPUT_MEM_WRAP_SIZE > 0
-                //     && oOffset >= OUTPUT_MEM_CONT_SIZE)
-                // {
-                //     oOffset += OUTPUT_MEM_WRAP_OFFSET - OUTPUT_MEM_CONT_OFFSET
-                //                 - OUTPUT_MEM_CONT_SIZE;
-                // }
-
-                for (int output = 0; output < NB_OUTPUTS; output++) {
                     if (std::is_floating_point<Output_T>::value)
-                        fprintf(pFile, "%f", static_cast<float>(outputs[oOffset]));
+                        fprintf(pFile, "%f", static_cast<float>(outputs[offset]));
                     else
-                        fprintf(pFile, "%d", static_cast<int>(outputs[oOffset]));
-                    oOffset += 1;
+                        fprintf(pFile, "%d", static_cast<int>(outputs[offset]));
+                    offset += 1;
 
                     fprintf(pFile, ", ");
-                }
 
-                fprintf(pFile, "), \n");
+                }
+                fprintf(pFile, "}\n");
             }
-
-            fprintf(pFile, "), \n");
+            fprintf(pFile, "}\n");
         }
+        fprintf(pFile, "}\n");
 
-        fprintf(pFile, ")\n");
-    }
-    else if (format == Format::NCHW || format == Format::Default) {
-        auto ofst = 0;
-        for(int output = 0; output < NB_OUTPUTS; output++) {
-            fprintf(pFile, "%d:\n", output);
-            for(int oy = 0; oy < OUTPUTS_HEIGHT; oy++) {
-                for(int ox = 0; ox < OUTPUTS_WIDTH; ox++) {
-                    fprintf(pFile, "%d",  static_cast<int>(outputs[ofst]));
-                    fprintf(pFile, " ");
-                    ofst += 1;
-                }
+    // NHWC
+    } else if (FMT == Format::NHWC) {
+        fprintf(pFile, "{\n"); // Start outer brace
+        for (auto h = 0; h < OUT_HEIGHT; ++h) {
+            fprintf(pFile, "  {\n"); // Indent level 1
+            for (auto w = 0; w < OUT_WIDTH; ++w) {
+                fprintf(pFile, "    { "); // Indent level 2 and open inner brace
+                for (auto out = 0; out < NB_OUTPUTS; ++out) {
+                    if (std::is_floating_point<Output_T>::value)
+                        fprintf(pFile, "%f", static_cast<float>(outputs[offset]));
+                    else
+                        fprintf(pFile, "%4d", static_cast<int>(outputs[offset]));
+                    offset += 1;
 
-                fprintf(pFile, "\n");
+                    // Add comma except for last element
+                    if (out != NB_OUTPUTS - 1)
+                        fprintf(pFile, ",");
+                }
+                fprintf(pFile, " },\n"); // Close inner brace and newline
             }
-
-            fprintf(pFile, "\n");
+            fprintf(pFile, "  },\n"); // Close w-loop brace and newline
         }
+        fprintf(pFile, "}\n"); // Close outer brace
 
-        fprintf(pFile, "\n");
-    }
-    else {
-        printf("Warning unsupported dataformat.\n");
+    } else {
+        printf("[ERROR] - Format is not supported.\n");
+        printf("[ERROR] - Aborting save outputs...\n");
+        return;
     }
 }
 #endif // SAVE_OUTPUTS

aidge_export_cpp/templates/configuration/_save_outputs.jinja

+#define {{ out_name[0] | upper }}_DEV_FMT Format::{{ out_format[0] | upper }}
\ No newline at end of file

aidge_export_cpp/templates/configuration/activation_config.jinja

@@ -7,6 +7,7 @@
 {%- set nb_data = in_chan[0] * in_height[0] * in_width[0] %}
 #define {{ name|upper }}_NB_DATA {{ nb_data }}
 #define {{ name|upper }}_ACTIVATION {{ activation }}
+{% include "./_save_outputs.jinja" %}
 {% include "./_def_io.jinja" %}
 {% include "./_meminfo.jinja" %}
 {% include "./_rescaling.jinja" %}

aidge_export_cpp/templates/configuration/batchnorm_config.jinja

@@ -8,6 +8,7 @@
 {% include "./_meminfo.jinja" %}
 #define {{ name|upper }}_ACTIVATION {{ activation }}
 #define {{ name|upper }}_EPSILON {{ epsilon }}
+{% include "./_save_outputs.jinja" %}
 {% include "./_rescaling.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/concat_config.jinja

@@ -15,4 +15,6 @@
 #define {{ name|upper }}_AXIS_SIZE_POST {{ axis_size_post }}
 #define {{ name|upper }}_AXIS_SIZE_PRE {{ axis_size_pre }}
 
+{% include "./_save_outputs.jinja" %}
+
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/convolution_config.jinja

@@ -14,6 +14,7 @@
 #define {{ name|upper }}_KERNEL_HEIGHT {{ kernel_dims[0] if kernel_dims|length > 1 else 1 }}
 #define {{ name|upper }}_KERNEL_WIDTH {{ kernel_dims[1] if kernel_dims|length > 1 else kernel_dims[0] }}
 #define {{ name|upper }}_ACTIVATION {{ activation }}
+{% include "./_save_outputs.jinja" %}
 {% include "./_rescaling.jinja" %}
 
 {#- Calculate sizes #}

aidge_export_cpp/templates/configuration/elemwise_config.jinja

@@ -16,6 +16,8 @@ constexpr int {{name|upper}}_OFFSET_IN2[] = { {{ offset_in2|join(", ") }} };
 
 #define {{ name|upper }}_ACTIVATION {{ activation }}
 #define {{ name|upper }}_ELEM_OP {{ elemwise_op }}
+
+{% include "./_save_outputs.jinja" %}
 {% include "./_rescaling.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/erf_config.jinja

@@ -6,5 +6,6 @@
 {% include "./_def_io.jinja" %}
 {% include "./_meminfo.jinja" %}
 #define {{ name|upper }}_NB_ELTS {{ in_dims[0]|join('*') }}
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */
\ No newline at end of file

aidge_export_cpp/templates/configuration/fullyconnected_config.jinja

@@ -13,4 +13,6 @@
 #define {{ name|upper }}_WEIGHTS_SIZE {{ weights_size }}
 #define {{ name|upper }}_BIASES_SIZE {{ out_chan[0] }}
 
+{% include "./_save_outputs.jinja" %}
+
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/hardmax_config.jinja

@@ -10,5 +10,6 @@
 #define {{ name|upper }}_AXIS_STRIDE {{ axis_stride }}
 #define {{ name|upper }}_POSTAXIS_STRIDE {{ postaxis_stride }}
 #define {{ name|upper }}_INOUT_NB_ELTS {{ out_nb_elts }}
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/leakyrelu_config.jinja

@@ -7,5 +7,6 @@
 {% include "./_meminfo.jinja" %}
 #define {{ name|upper }}_NB_DATA {{ nb_data }}
 #define {{ name|upper }}_ALPHA {{ alpha }}
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/matmul_config.jinja

@@ -16,6 +16,8 @@ constexpr int {{name|upper}}_OFFSET_IN2[] = { {{ offset_in2|join(", ") }} };
 
 #define {{ name|upper }}_ACTIVATION {{ activation }}
 
+{% include "./_save_outputs.jinja" %}
+
 {% include "./_rescaling.jinja" %}
 {#- Calculate sizes #}
 

aidge_export_cpp/templates/configuration/pad_config.jinja

@@ -9,5 +9,6 @@
 #define {{ name|upper }}_PADDING_TOP {{ padding[0] }}
 #define {{ name|upper }}_PADDING_LEFT {{ padding[1] }}
 #define {{ name|upper }}_BORDER_VALUE {{ border_value }}
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/pooling_config.jinja

@@ -13,5 +13,6 @@
 #define {{ name|upper }}_KERNEL_WIDTH {{ kernel_dims[1] }}
 #define {{ name|upper }}_POOLING_TYPE {{ pool_type }}
 #define {{ name|upper }}_ACTIVATION {{ activation }}
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/reducemean_config.jinja

@@ -18,5 +18,7 @@ static const unsigned int {{ name|upper }}_PREAXIS_STRIDES[{{ in_nb_dims }}] =
 static const unsigned int {{ name|upper }}_POSTAXIS_STRIDES[{{ in_nb_dims }}] =
   { {{ post_axis_strides|join(", ") }} };
 
+{% include "./_save_outputs.jinja" %}
+
 #endif /* {{ name|upper }}_LAYER_H */
 

aidge_export_cpp/templates/configuration/rescaling_config.jinja

@@ -11,6 +11,7 @@
 
 // Activation
 #define {{ name|upper }}_ACTIVATION     {{ activation }}
+{% include "./_save_outputs.jinja" %}
 {% include "./_rescaling.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/reshape_config.jinja

@@ -6,5 +6,6 @@
 {% include "./_meminfo.jinja" %}
 {# For layer configuration -#}
 #define {{ name|upper }}_NB_ELTS {{ in_dims[0]|join('*') }}
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/softmax_config.jinja

@@ -8,5 +8,6 @@
 #define {{ name|upper }}_AXIS_SIZE {{ axis_size }}
 #define {{ name|upper }}_AXIS_SIZE_POST {{ axis_size_post }}
 #define {{ name|upper }}_AXIS_SIZE_PRE {{ axis_size_pre }}
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */

aidge_export_cpp/templates/configuration/transpose_ND_config.jinja

@@ -13,5 +13,6 @@ constexpr int {{ name|upper }}_OUT_STRIDES[] = { {{ out_strides | join(', ') }}
 
 constexpr int {{ name|upper }}_PERMUTE[] = { {{ output_dims_order | join(', ') }} };
 constexpr int {{ name|upper }}_DIMS[] = { {{ in_dims[0] | join(', ') }} };
+{% include "./_save_outputs.jinja" %}
 
 #endif /* {{ name|upper }}_LAYER_H */
\ No newline at end of file

aidge_export_cpp/templates/kernel_forward/_save_outputs.jinja

 
 #if SAVE_OUTPUTS
-{% for outidx in range(nb_out) -%}
-    FILE* {{out_name[outidx]|upper}}_STREAM = fopen("data/export_outputs/{{out_name[outidx]}}.txt", "w");
-    saveOutputs<{{out_cdtype[outidx]}}>(
-        {{out_name[outidx]|upper}}_NB_OUTPUTS,
-        {{out_name[outidx]|upper}}_OUT_HEIGHT,
-        {{out_name[outidx]|upper}}_OUT_WIDTH,
-        {#- {{out_name[outidx]|upper}}_CONT_OFFSET,
-        {{out_name[outidx]|upper}}_CONT_SIZE,
-        {{out_name[outidx]|upper}}_WRAP_OFFSET,
-        {{out_name[outidx]|upper}}_WRAP_SIZE,
-        {{out_name[outidx]|upper}}_STRIDE, #}
-        {{out_name[outidx]}},
-        {{out_name[outidx]|upper}}_STREAM,
-        Format::NHWC);
-    fclose({{out_name[outidx]|upper}}_STREAM);
-{% endfor %}
+printf("[NOTICE] Saving outputs of node {{ name }}\n");
+FILE* {{ out_name[0] | upper }}_STREAM = fopen("data/export_outputs/{{out_name[0]}}.txt", "w");
+saveOutputs<{{ out_name[0] | upper }}_NB_OUTPUTS,
+            {{ out_name[0] | upper }}_OUT_HEIGHT,
+            {{ out_name[0] | upper }}_OUT_WIDTH,
+            {{ out_name[0] | upper }}_DEV_FMT>
+            ({#- {{ out_name[0] | upper }}_CONT_OFFSET,
+            {{ out_name[0] | upper }}_CONT_SIZE,
+            {{ out_name[0] | upper }}_WRAP_OFFSET,
+            {{ out_name[0] | upper }}_WRAP_SIZE,
+            {{ out_name[0] | upper }}_STRIDE, -#}
+            {{ out_name[0] }},
+            {{ out_name[0] | upper }}_STREAM);
+fclose({{ out_name[0] | upper }}_STREAM);
 #endif