Skip to content

Commit b333727

Browse files
marchioamarchioa
committed
fix: resolve conflicts after rebase
1 parent facdbce commit b333727

8 files changed

Lines changed: 17 additions & 15 deletions

File tree

‎Deeploy/Targets/GAP9/Bindings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from Deeploy.Targets.PULPOpen.DataTypes import PULPDMAFuture
3737
from Deeploy.Targets.PULPOpen.Templates import ConvTemplate, DMASliceTemplate, FloatAddTemplate, FloatConvTemplate, \
3838
FloatGELUTemplate, FloatGemmTemplate, FloatLayernormTemplate, FloatMatMulTemplate, FloatMaxPoolTemplate, \
39-
FloatMulTemplate, FloatReluTemplate, FloatSoftmaxTemplate, GEMMTemplate, MatrixVectorTemplate, MaxPool2DTemplate, \
39+
FloatMulTemplate, FloatReluTemplate, FloatSoftmaxTemplate, GEMMTemplate, MatrixVectorTemplate, MaxPoolTemplate, \
4040
MulTemplate, ReduceMeanTemplate, RequantShiftTemplate, ReshapeTemplate, RQAddTemplate, RQSiHardswishTemplate, \
4141
SGDTemplate, SoftmaxCrossEntropyLossTemplate, TallGEMMTemplate, TransposeTemplate, UniformRequantShiftTemplate, \
4242
iRMSNormTemplate, iSoftmaxTemplate
@@ -227,7 +227,7 @@
227227

228228
GAP9MaxPool2DBindings = [
229229
NodeBinding(PULPMaxPoolChecker([PointerClass(type)], [PointerClass(type)]),
230-
MaxPool2DTemplate.PULPMaxPool2D_8_Template, GAP9Transformer) for type in [int8_t, uint8_t]
230+
MaxPoolTemplate.PULPMaxPool2D_8_Template, GAP9Transformer) for type in [int8_t, uint8_t]
231231
] + [
232232
NodeBinding(PULPMaxPoolChecker([PointerClass(float32_t)], [PointerClass(float32_t)]),
233233
FloatMaxPoolTemplate.referenceTemplate, GAP9Transformer)

‎Deeploy/Targets/GAP9/Platform.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
SoftmaxCrossEntropyLossGradParser, SoftmaxCrossEntropyLossParser, SoftmaxGradParser, SoftmaxParser, \
3838
TransposeParser, UniformRequantShiftParser, UnsqueezeParser, iHardswishParser, iRMSNormParser, iSoftmaxParser
3939
from Deeploy.Targets.Generic.Templates import AllocateTemplate as BasicAllocateTemplate
40-
from Deeploy.Targets.PULPOpen.Bindings import BasicDequantBindings, BasicQuantBindings, PULPConv1DBinding, \
41-
PULPDMASliceBindings, PULPDWConv1DBinding, PULPReduceMeanBindings, PULPSliceBindings
40+
from Deeploy.Targets.PULPOpen.Bindings import BasicDequantBindings, BasicQuantBindings, PULPDMASliceBindings, \
41+
PULPDWConv1DBinding, PULPReduceMeanBindings, PULPRQSConv1DBindings, PULPSliceBindings
4242
from Deeploy.Targets.PULPOpen.Layers import PULPRQSConvLayer, PULPRQSGEMMLayer
4343
from Deeploy.Targets.PULPOpen.Parsers import PULPConv1DParser, PULPConv2DParser, PULPDWConv1DParser, \
4444
PULPDWConv2DParser, PULPFPConv2DParser, PULPFPDWConv2DParser, PULPGEMMParser, PULPMatrixVecParser, \
@@ -63,7 +63,7 @@
6363
GAP9_MatMulMapper = NodeMapper(MatMulParser(), GAP9MatMulTilingReadyBindings)
6464
GAP9_RQIntegerDivMapper = NodeMapper(RQIntegerDivParser(), [BasicRQIntegerDivBinding])
6565
GAP9_RQGELU_int8_Mapper = NodeMapper(RQSiGELUParser(), GAP9iRQSGELUTilingReadyBindings)
66-
GAP9_Conv1DMapper = NodeMapper(PULPConv1DParser(), [PULPConv1DBinding])
66+
GAP9_Conv1DMapper = NodeMapper(PULPConv1DParser(), [PULPRQSConv1DBindings])
6767
GAP9_DWConv1DMapper = NodeMapper(PULPDWConv1DParser(), [PULPDWConv1DBinding])
6868
GAP9_FPConv2DMapper = NodeMapper(PULPFPConv2DParser(), GAP9Conv2DTilingReadyBindings)
6969
GAP9_Conv2DMapper = NodeMapper(PULPConv2DParser(), GAP9RQSConv2DTilingReadyBindings)

‎DeeployTest/test_cortexm_config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"Kernels/Integer/Pad/Regular_2D",
1111
"Kernels/Integer/MatMul/Regular",
1212
"Kernels/Integer/MatMul/Add",
13-
"Kernels/Integer/MaxPool",
13+
"Kernels/Integer/MaxPool/Regular_2D",
1414
"Kernels/Integer/Conv/Regular_2D_RQ",
1515
"Kernels/Integer/ReduceSum",
1616
"Kernels/Integer/ReduceMean",

‎DeeployTest/test_deeploy_internal.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class TestTilerExtension:
148148
"./Tests/Models/CNN_Linear2",
149149
"./Tests/Models/CNN_Linear1",
150150
"./Tests/Kernels/Integer/MatMul/Regular",
151-
"./Tests/Kernels/Integer/MaxPool",
151+
"./Tests/Kernels/Integer/MaxPool/Regular_2D",
152152
])
153153
def test_tiler_basic(self, test_path):
154154
"""Test that tiler can process various networks without L1 constraints."""
@@ -171,7 +171,7 @@ def test_tiler_basic(self, test_path):
171171
"./Tests/Models/CNN_Linear2",
172172
"./Tests/Models/CNN_Linear1",
173173
"./Tests/Kernels/Integer/MatMul/Regular",
174-
"./Tests/Kernels/Integer/MaxPool",
174+
"./Tests/Kernels/Integer/MaxPool/Regular_2D",
175175
])
176176
def test_tiler_constrained_should_fail(self, test_path):
177177
"""Test that tiler correctly fails when L1 memory is too small."""
@@ -200,7 +200,7 @@ def test_tiler_constrained_should_fail(self, test_path):
200200
"./Tests/Models/miniMobileNet",
201201
"./Tests/Models/miniMobileNetv2",
202202
"./Tests/Kernels/Integer/MatMul/Regular",
203-
"./Tests/Kernels/Integer/MaxPool",
203+
"./Tests/Kernels/Integer/MaxPool/Regular_2D",
204204
])
205205
def test_tiler_double_buffer(self, test_path):
206206
"""Test tiler with double buffering enabled."""

‎DeeployTest/test_generic_config.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"Kernels/FP32/Div",
1818
"Kernels/FP32/GEMM/Regular",
1919
"Kernels/FP32/MatMul",
20-
"Kernels/FP32/MaxPool",
20+
"Kernels/FP32/MaxPool/Regular_1D",
21+
"Kernels/FP32/MaxPool/Regular_2D",
2122
"Kernels/FP32/Mul",
2223
"Kernels/FP32/LayerNorm",
2324
"Kernels/FP32/RMSNorm",
@@ -55,7 +56,8 @@
5556
"Kernels/Integer/GEMM/Regular",
5657
"Kernels/Integer/MatMul/Add",
5758
"Kernels/Integer/MatMul/Regular",
58-
"Kernels/Integer/MaxPool",
59+
"Kernels/Integer/MaxPool/Regular_1D",
60+
"Kernels/Integer/MaxPool/Regular_2D",
5961
"Kernels/Integer/Pad/Regular_1D",
6062
"Kernels/Integer/Pad/Regular_2D",
6163
"Kernels/Integer/ReduceMean",

‎DeeployTest/test_mempool_config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"Kernels/Integer/GEMM/Regular",
2222
"Kernels/Integer/MatMul/Add",
2323
"Kernels/Integer/MatMul/Regular",
24-
"Kernels/Integer/MaxPool",
24+
"Kernels/Integer/MaxPool/Regular_2D",
2525
"Kernels/Integer/Pad/Regular_1D",
2626
"Kernels/Integer/Pad/Regular_2D",
2727
"Kernels/Integer/ReduceMean",

‎DeeployTest/test_siracusa_config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"Kernels/FP32/Conv/Regular_2D_ZeroValuedBias",
2222
"Kernels/FP32/GEMM/Regular",
2323
"Kernels/FP32/MatMul",
24-
"Kernels/FP32/MaxPool",
24+
"Kernels/FP32/MaxPool/Regular_2D",
2525
"Kernels/FP32/Mul",
2626
"Kernels/FP32/LayerNorm",
2727
"Kernels/FP32/ReduceMean/KeepDims/Add_ReduceMean",

‎DeeployTest/test_siracusa_tiled_config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"Kernels/FP32/Conv/Regular_2D_ZeroValuedBias": [6600],
2222
"Kernels/FP32/GEMM/Regular": [8000],
2323
"Kernels/FP32/MatMul": [2000],
24-
"Kernels/FP32/MaxPool": [2000],
24+
"Kernels/FP32/MaxPool/Regular_2D": [2000],
2525
"Kernels/FP32/Mul": [2000],
2626
"Kernels/FP32/LayerNorm": [2000],
2727
"Kernels/FP32/ReduceMean/KeepDims/Add_ReduceMean": [8000],
@@ -68,7 +68,7 @@
6868
"Kernels/FP32/Conv/Regular_2D_ZeroValuedBias": [8800],
6969
"Kernels/FP32/GEMM/Regular": [8000],
7070
"Kernels/FP32/MatMul": [5000],
71-
"Kernels/FP32/MaxPool": [5000],
71+
"Kernels/FP32/MaxPool/Regular_2D": [5000],
7272
"Kernels/FP32/Mul": [2000],
7373
"Kernels/FP32/LayerNorm": [2000],
7474
"Kernels/FP32/ReduceMean/KeepDims/Add_ReduceMean": [8000],

0 commit comments

Comments
 (0)