fix: resolve conflicts after rebase

Author: marchioa

DeeployTest/test_cortexm_config.py

@@ -10,7 +10,7 @@
     "Kernels/Integer/Pad/Regular_2D",
     "Kernels/Integer/MatMul/Regular",
     "Kernels/Integer/MatMul/Add",
-    "Kernels/Integer/MaxPool",
+    "Kernels/Integer/MaxPool/Regular_2D",
     "Kernels/Integer/Conv/Regular_2D_RQ",
     "Kernels/Integer/ReduceSum",
     "Kernels/Integer/ReduceMean",

DeeployTest/test_deeploy_internal.py

@@ -148,7 +148,7 @@ class TestTilerExtension:
         "./Tests/Models/CNN_Linear2",
         "./Tests/Models/CNN_Linear1",
         "./Tests/Kernels/Integer/MatMul/Regular",
-        "./Tests/Kernels/Integer/MaxPool",
+        "./Tests/Kernels/Integer/MaxPool/Regular_2D",
     ])
     def test_tiler_basic(self, test_path):
         """Test that tiler can process various networks without L1 constraints."""
@@ -171,7 +171,7 @@ def test_tiler_basic(self, test_path):
         "./Tests/Models/CNN_Linear2",
         "./Tests/Models/CNN_Linear1",
         "./Tests/Kernels/Integer/MatMul/Regular",
-        "./Tests/Kernels/Integer/MaxPool",
+        "./Tests/Kernels/Integer/MaxPool/Regular_2D",
     ])
     def test_tiler_constrained_should_fail(self, test_path):
         """Test that tiler correctly fails when L1 memory is too small."""
@@ -200,7 +200,7 @@ def test_tiler_constrained_should_fail(self, test_path):
         "./Tests/Models/miniMobileNet",
         "./Tests/Models/miniMobileNetv2",
         "./Tests/Kernels/Integer/MatMul/Regular",
-        "./Tests/Kernels/Integer/MaxPool",
+        "./Tests/Kernels/Integer/MaxPool/Regular_2D",
     ])
     def test_tiler_double_buffer(self, test_path):
         """Test tiler with double buffering enabled."""

DeeployTest/test_generic_config.py

@@ -17,7 +17,8 @@
     "Kernels/FP32/Div",
     "Kernels/FP32/GEMM/Regular",
     "Kernels/FP32/MatMul",
-    "Kernels/FP32/MaxPool",
+    "Kernels/FP32/MaxPool/Regular_1D",
+    "Kernels/FP32/MaxPool/Regular_2D",
     "Kernels/FP32/Mul",
     "Kernels/FP32/LayerNorm",
     "Kernels/FP32/RMSNorm",
@@ -55,7 +56,8 @@
     "Kernels/Integer/GEMM/Regular",
     "Kernels/Integer/MatMul/Add",
     "Kernels/Integer/MatMul/Regular",
-    "Kernels/Integer/MaxPool",
+    "Kernels/Integer/MaxPool/Regular_1D",
+    "Kernels/Integer/MaxPool/Regular_2D",
     "Kernels/Integer/Pad/Regular_1D",
     "Kernels/Integer/Pad/Regular_2D",
     "Kernels/Integer/ReduceMean",

DeeployTest/test_mempool_config.py

@@ -21,7 +21,7 @@
     "Kernels/Integer/GEMM/Regular",
     "Kernels/Integer/MatMul/Add",
     "Kernels/Integer/MatMul/Regular",
-    "Kernels/Integer/MaxPool",
+    "Kernels/Integer/MaxPool/Regular_2D",
     "Kernels/Integer/Pad/Regular_1D",
     "Kernels/Integer/Pad/Regular_2D",
     "Kernels/Integer/ReduceMean",

DeeployTest/test_siracusa_config.py

@@ -21,7 +21,7 @@
     "Kernels/FP32/Conv/Regular_2D_ZeroValuedBias",
     "Kernels/FP32/GEMM/Regular",
     "Kernels/FP32/MatMul",
-    "Kernels/FP32/MaxPool",
+    "Kernels/FP32/MaxPool/Regular_2D",
     "Kernels/FP32/Mul",
     "Kernels/FP32/LayerNorm",
     "Kernels/FP32/ReduceMean/KeepDims/Add_ReduceMean",

DeeployTest/test_siracusa_tiled_config.py

@@ -21,7 +21,7 @@
     "Kernels/FP32/Conv/Regular_2D_ZeroValuedBias": [6600],
     "Kernels/FP32/GEMM/Regular": [8000],
     "Kernels/FP32/MatMul": [2000],
-    "Kernels/FP32/MaxPool": [2000],
+    "Kernels/FP32/MaxPool/Regular_2D": [2000],
     "Kernels/FP32/Mul": [2000],
     "Kernels/FP32/LayerNorm": [2000],
     "Kernels/FP32/ReduceMean/KeepDims/Add_ReduceMean": [8000],
@@ -68,7 +68,7 @@
     "Kernels/FP32/Conv/Regular_2D_ZeroValuedBias": [8800],
     "Kernels/FP32/GEMM/Regular": [8000],
     "Kernels/FP32/MatMul": [5000],
-    "Kernels/FP32/MaxPool": [5000],
+    "Kernels/FP32/MaxPool/Regular_2D": [5000],
     "Kernels/FP32/Mul": [2000],
     "Kernels/FP32/LayerNorm": [2000],
     "Kernels/FP32/ReduceMean/KeepDims/Add_ReduceMean": [8000],