Dynamic buffer calculation fix. Other fixes

Author: diaconuccalin

Deeploy/Targets/PULPOpen/Templates/FloatConvTemplate.py

@@ -42,12 +42,11 @@ def __init__(self, templateStr):
     @staticmethod
     def computeTransientBuffersSize(
             ctxt: NetworkContext,
-            operatorRepresentation: OperatorRepresentation) -> List[Tuple[str, Union[int, IntVar]]]:
+            operatorRepresentation: OperatorRepresentation) -> List[Tuple[str, str]]:
 
         # Memory allocation for the im2col buffer can be dynamic, based on the number of cores.
         # WARNING: This works because value is only used as string, in the allocate template.
-        # TODO: This should work as NUM_CORES * P * Q, but it raises an error if double the memory is not allocated.
-        im2col_dim = "2 * NUM_CORES * " + str(
+        im2col_dim = "NUM_CORES * " + str(
             operatorRepresentation['dim_kernel_x'] * operatorRepresentation['dim_kernel_y'])
         im2col_name = operatorRepresentation['nodeName'] + "_buffer"
         return [(im2col_name, im2col_dim)]
@@ -58,6 +57,9 @@ def hoistTransientBuffers(self, ctxt: NetworkContext,
             ctxt, operatorRepresentation)[0]
         ctxt.hoistTransientBuffer(im2col_name, im2col_dim)
 
+        # Manually set the type of the im2col buffer to match the input type, since it defaults to void for transient buffers
+        ctxt.lookup(im2col_name)._type.referencedType = ctxt.lookup(operatorRepresentation['data_in'])._type.referencedType
+
         operatorRepresentation['ctxtBuffer'] = im2col_name
         operatorRepresentation['ctxtBufferSize'] = im2col_dim
         return ctxt, operatorRepresentation, [im2col_name]
@@ -107,11 +109,11 @@ def hoistTransientBuffers(self, ctxt: NetworkContext,
         ${stride_y},
         ${bias}, ${has_bias},
         ref_${data_out}_${data_out},
-        ${padding_y_top},                    
-        ${padding_y_bottom},                  
-        ${padding_x_left},                    
-        ${padding_x_right},                   
-        ${ctxtBuffer}             
+        ${padding_y_top},
+        ${padding_y_bottom},
+        ${padding_x_left},
+        ${padding_x_right},
+        ${ctxtBuffer}
     );
 
     ref_${data_out}_${data_in} += ${ch_im_in} * ${dim_im_in_x} * ${dim_im_in_y};
@@ -139,11 +141,11 @@ def hoistTransientBuffers(self, ctxt: NetworkContext,
         ${stride_y},
         ${bias}, ${has_bias},
         ref_${data_out}_${data_out},
-        ${padding_y_top},                    
-        ${padding_y_bottom},                  
-        ${padding_x_left},                    
-        ${padding_x_right},                   
-        ${ctxtBuffer}             
+        ${padding_y_top},
+        ${padding_y_bottom},
+        ${padding_x_left},
+        ${padding_x_right},
+        ${ctxtBuffer}
     );
 
     ref_${data_out}_${data_in} += ${ch_im_in} * ${dim_im_in_x} * ${dim_im_in_y};

TargetLibraries/PULPOpen/inc/pulp_core.h

@@ -9,9 +9,6 @@
 
 #define BEGIN_SINGLE_CORE if (pi_core_id() == 0) {
 #define END_SINGLE_CORE }
-#endif
-
-#ifndef SINGLE_CORE
 #define SINGLE_CORE if (pi_core_id() == 0)
 
 #endif //__DEEPLOY_MATH_PULPCORE_HEADER_

TargetLibraries/PULPOpen/src/DWConvolution_fp32.c

@@ -1,30 +1,7 @@
-/* =====================================================================
- * Title:        DWConvolution_fp32.c
- * Description:  Float32 version of Depthwise Conv2D with NCHW format
- * (pre-padded input)
- *
- * Date:         01.08.2025
- *
- * =====================================================================
- *
- * Copyright (C) 2025 ETH Zurich and University of Bologna.
- *
- * Authors:
- * - Calin Diaconu, University of Bologna
+/*
+ * SPDX-FileCopyrightText: 2025 ETH Zurich and University of Bologna
  *
  * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the License); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 #include "DeeployPULPMath.h"