Fix CI and implement my own comments

Author: Xeratec

Deeploy/Targets/GAP9/Platform.py

@@ -63,7 +63,7 @@
 GAP9_MatMulMapper = NodeMapper(MatMulParser(), GAP9MatMulTilingReadyBindings)
 GAP9_RQIntegerDivMapper = NodeMapper(RQIntegerDivParser(), [BasicRQIntegerDivBinding])
 GAP9_RQGELU_int8_Mapper = NodeMapper(RQSiGELUParser(), GAP9iRQSGELUTilingReadyBindings)
-GAP9_Conv1DMapper = NodeMapper(PULPConv1DParser(), [PULPRQSConv1DBindings])
+GAP9_Conv1DMapper = NodeMapper(PULPConv1DParser(), PULPRQSConv1DBindings)
 GAP9_DWConv1DMapper = NodeMapper(PULPDWConv1DParser(), [PULPDWConv1DBinding])
 GAP9_FPConv2DMapper = NodeMapper(PULPFPConv2DParser(), GAP9Conv2DTilingReadyBindings)
 GAP9_Conv2DMapper = NodeMapper(PULPConv2DParser(), GAP9RQSConv2DTilingReadyBindings)

Deeploy/Targets/Generic/Bindings.py

@@ -173,7 +173,7 @@
 ]
 
 BasicMaxPool2DBindings = [
-    NodeBinding(MaxPoolChecker([PointerClass(int8_t)], [PointerClass(int8_t)]), MaxPoolTemplate.referenceTemplate,
+    NodeBinding(MaxPoolChecker([PointerClass(int8_t)], [PointerClass(int8_t)]), MaxPoolTemplate.reference2DTemplate,
                 BasicTransformer)
 ] + [
     NodeBinding(MaxPoolChecker([PointerClass(float32_t)], [PointerClass(float32_t)]),

Deeploy/Targets/Generic/Platform.py

@@ -50,7 +50,7 @@
 ITAMaxMapper = NodeMapper(ITAMaxParser(), [BasicITASoftmaxBinding])
 ITAPartialMaxMapper = NodeMapper(ITAPartialMaxParser(), [BasicITAPartialSoftmaxBinding])
 MatMulMapper = NodeMapper(MatMulParser(), BasicMatMulBindings)
-MaxPoolMapper = NodeMapper(GenericMaxPool2DParser(), BasicMaxPool2DBindings)
+MaxPool2DMapper = NodeMapper(GenericMaxPool2DParser(), BasicMaxPool2DBindings)
 MaxPool1DMapper = NodeMapper(MaxPool1DParser(), BasicMaxPool1DBindings)
 MulMapper = NodeMapper(MulParser(), BasicMulBindings)
 PowMapper = NodeMapper(PowParser(), BasicPowBindings)
@@ -99,7 +99,7 @@
     'ITAPartialMax': ITAMaxLayer([ITAPartialMaxMapper]),
     'MatMul': GEMMLayer([MatMulMapper]),
     'MatMulInteger': MatMulLayer([MatMulMapper]),
-    'MaxPool': MaxPoolLayer([MaxPool1DMapper, MaxPoolMapper]),
+    'MaxPool': MaxPoolLayer([MaxPool1DMapper, MaxPool2DMapper]),
     'Mul': MulLayer([MulMapper]),
     'Pow': PowLayer([PowMapper]),
     'Sqrt': SqrtLayer([SqrtMapper]),

Deeploy/Targets/Generic/Templates/MaxPoolTemplate.py

@@ -28,7 +28,7 @@ def alignToContext(self, ctxt: NetworkContext,
         return ctxt, operatorRepresentation, []
 
 
-referenceTemplate = _MaxPoolTemplate("""
+reference2DTemplate = _MaxPoolTemplate("""
 <%
 batchOffsetIn = ch_im_in * dim_im_in_x * dim_im_in_y
 batchOffsetOut = ch_im_out * dim_im_out_x * dim_im_out_y

Deeploy/Targets/PULPOpen/Templates/MaxPoolTemplate.py

@@ -41,6 +41,6 @@ def alignToContext(self, ctxt: NetworkContext,
     signatureString += '_u8'
 %>
 pulp_nn_maxpool${signatureString}(
-    ${data_in}, ${data_out}, 1, ${dim_im_in_y}, ${ch_im_in}, 1, ${dim_im_out_y}, 
+    ${data_in}, ${data_out}, 1, ${dim_im_in_y}, ${ch_im_in}, 1, ${dim_im_out_y},
     1, ${dim_kernel_y}, ${padding_y}, ${padding_y_right}, 0, 0, 1, ${stride_y});
 """)

DeeployTest/test_gap9_config.py

@@ -12,9 +12,10 @@
     "Kernels/Integer/Concat", "Kernels/Integer/Hardswish/Regular", "Others/Backtracking", "Kernels/FP32/Add/Regular",
     "Kernels/FP32/GEMM/Regular", "Kernels/FP32/Conv/Regular_2D_Bias", "Kernels/FP32/Conv/Regular_2D_NoBias",
     "Kernels/FP32/Conv/Regular_2D_ZeroValuedBias", "Kernels/FP32/Conv/DW_2D_Bias", "Kernels/FP32/Conv/DW_2D_NoBias",
-    "Kernels/FP32/Conv/DW_2D_ZeroValuedBias", "Kernels/FP32/LayerNorm", "Kernels/FP32/ReLU", "Kernels/FP32/MaxPool",
-    "Kernels/FP32/MatMul", "Kernels/FP32/Softmax/Regular", "Kernels/FP32/Transpose", "Kernels/FP32/Mul",
-    "Kernels/Mixed/Dequant", "Kernels/Mixed/Quant", "Kernels/FP32/ReduceSum", "Kernels/FP32/Reshape/SkipConnection"
+    "Kernels/FP32/Conv/DW_2D_ZeroValuedBias", "Kernels/FP32/LayerNorm", "Kernels/FP32/ReLU",
+    "Kernels/FP32/MaxPool/Regular_2D", "Kernels/FP32/MatMul", "Kernels/FP32/Softmax/Regular", "Kernels/FP32/Transpose",
+    "Kernels/FP32/Mul", "Kernels/Mixed/Dequant", "Kernels/Mixed/Quant", "Kernels/FP32/ReduceSum",
+    "Kernels/FP32/Reshape/SkipConnection"
 ]
 
 MODEL_TESTS = [

DeeployTest/test_gap9_tiled_config.py

@@ -24,7 +24,7 @@
     "Kernels/FP32/Conv/DW_2D_NoBias": [7200],
     "Kernels/FP32/Conv/DW_2D_ZeroValuedBias": [7200],
     "Kernels/FP32/LayerNorm": [2000],
-    "Kernels/FP32/MaxPool": [2000],
+    "Kernels/FP32/MaxPool/Regular_2D": [2000],
     "Kernels/FP32/MatMul": [2000],
     "Kernels/FP32/ReLU": [2000],
     "Kernels/FP32/Reshape/SkipConnection": [1400],
@@ -49,7 +49,7 @@
     "Kernels/FP32/Conv/DW_2D_NoBias": [10000],
     "Kernels/FP32/Conv/DW_2D_ZeroValuedBias": [9800],
     "Kernels/FP32/LayerNorm": [2000],
-    "Kernels/FP32/MaxPool": [5000],
+    "Kernels/FP32/MaxPool/Regular_2D": [5000],
     "Kernels/FP32/MatMul": [5000],
     "Kernels/FP32/ReLU": [20],
     "Kernels/FP32/Reshape/SkipConnection": [2600],