Resolve conflicts.

Author: MartinPavella

backends/nxp/tests/ir/converter/node_converter/test_addmm_converter.py

@@ -39,6 +39,7 @@ def assert_delegated(
         model,
         input_shape,
         mocker,
+        request,
         use_qat=False,
         expected_delegated_ops: dict[Operator, int] | None = None,
     ):
@@ -58,6 +59,7 @@ def assert_delegated(
             model,
             input_shape,
             graph_verifier,
+            request,
             dataset_creator,
             use_qat=use_qat,
         )
@@ -80,9 +82,9 @@ def assert_not_delegated(self, model, input_shape):
         ],
         ids=lambda s: f"input_shape = {s}",
     )
-    def test__from_addmm(self, mocker, use_qat, input_shape: tuple[int, ...]):
+    def test__from_addmm(self, mocker, request, use_qat, input_shape: tuple[int, ...]):
         model = AddmmModule(input_shape[-1])
-        self.assert_delegated(model, input_shape, mocker, use_qat=use_qat)
+        self.assert_delegated(model, input_shape, mocker, request, use_qat=use_qat)
 
     def test__from_addmm__unsupported_alpha(self):
         input_shape = (1, 8)
@@ -99,20 +101,20 @@ def test__from_addmm__unsupported_beta(self):
         [1, 1.0],
         ids=lambda a: f"alpha = {a}",
     )
-    def test__from_addmm__supported_alpha(self, mocker, use_qat, alpha):
+    def test__from_addmm__supported_alpha(self, mocker, request, use_qat, alpha):
         input_shape = (1, 8)
         model = AddmmModule(input_shape[-1], alpha=alpha)
-        self.assert_delegated(model, input_shape, mocker, use_qat)
+        self.assert_delegated(model, input_shape, mocker, request, use_qat)
 
     @pytest.mark.parametrize(
         "beta",
         [1, 1.0],
         ids=lambda b: f"beta = {b}",
     )
-    def test__from_addmm__supported_beta(self, mocker, use_qat, beta):
+    def test__from_addmm__supported_beta(self, mocker, request, use_qat, beta):
         input_shape = (1, 8)
         model = AddmmModule(input_shape[-1], beta=beta)
-        self.assert_delegated(model, input_shape, mocker, use_qat)
+        self.assert_delegated(model, input_shape, mocker, request, use_qat)
 
     @pytest.mark.parametrize(
         "input_shape",
@@ -123,13 +125,14 @@ def test__from_addmm__supported_beta(self, mocker, use_qat, beta):
         ids=lambda s: f"input_shape = {s}",
     )
     def test__from_linear_with_bias__2d(
-        self, mocker, use_qat, input_shape: tuple[int, ...]
+        self, mocker, request, use_qat, input_shape: tuple[int, ...]
     ):
         model = LinearModule(bias=True, in_features=input_shape[-1], out_features=7)
         self.assert_delegated(
             model,
             input_shape,
             mocker,
+            request,
             use_qat=use_qat,
             expected_delegated_ops={AddMM: 1, PermuteCopy: 1},
         )
@@ -144,7 +147,7 @@ def test__from_linear_with_bias__2d(
         ids=lambda s: f"input_shape = {s}",
     )
     def test__from_linear_with_bias__higher_ranks(
-        self, mocker, use_qat, input_shape: tuple[int, ...]
+        self, mocker, request, use_qat, input_shape: tuple[int, ...]
     ):
         # More than 2D cases get reshaped to 2D, so two extra view_copy nodes are delegated.
 
@@ -153,6 +156,7 @@ def test__from_linear_with_bias__higher_ranks(
             model,
             input_shape,
             mocker,
+            request,
             use_qat=use_qat,
             expected_delegated_ops={AddMM: 1, PermuteCopy: 1, ViewCopy: 2},
         )

backends/nxp/tests/ir/converter/node_converter/test_mm_converter.py

@@ -31,6 +31,7 @@ def assert_delegated(
         model,
         input_shape,
         mocker,
+        request,
         use_qat=False,
         expected_delegated_ops: dict[Operator, int] | None = None,
     ):
@@ -50,6 +51,7 @@ def assert_delegated(
             model,
             input_shape,
             graph_verifier,
+            request,
             dataset_creator,
             use_qat=use_qat,
         )
@@ -63,9 +65,9 @@ def assert_delegated(
         ],
         ids=lambda s: f"input_shape = {s}",
     )
-    def test__from_mm(self, mocker, use_qat, input_shape: tuple[int, ...]):
+    def test__from_mm(self, mocker, request, use_qat, input_shape: tuple[int, ...]):
         model = MmModule(input_shape[-1])
-        self.assert_delegated(model, input_shape, mocker, use_qat=use_qat)
+        self.assert_delegated(model, input_shape, mocker, request, use_qat=use_qat)
 
     @pytest.mark.parametrize(
         "input_shape",
@@ -76,13 +78,14 @@ def test__from_mm(self, mocker, use_qat, input_shape: tuple[int, ...]):
         ids=lambda s: f"input_shape = {s}",
     )
     def test__from_linear_without_bias(
-        self, mocker, use_qat, input_shape: tuple[int, ...]
+        self, mocker, request, use_qat, input_shape: tuple[int, ...]
     ):
         model = LinearModule(bias=False, in_features=input_shape[-1], out_features=7)
         self.assert_delegated(
             model,
             input_shape,
             mocker,
+            request,
             use_qat=use_qat,
             expected_delegated_ops={MM: 1, PermuteCopy: 1},
         )
@@ -97,7 +100,7 @@ def test__from_linear_without_bias(
         ids=lambda s: f"input_shape = {s}",
     )
     def test__from_linear_without_bias__higher_ranks(
-        self, mocker, use_qat, input_shape: tuple[int, ...]
+        self, mocker, request, use_qat, input_shape: tuple[int, ...]
     ):
         # More than 2D cases get reshaped to 2D, so two extra view_copy nodes are delegated.
 
@@ -106,6 +109,7 @@ def test__from_linear_without_bias__higher_ranks(
             model,
             input_shape,
             mocker,
+            request,
             use_qat=use_qat,
             expected_delegated_ops={MM: 1, PermuteCopy: 1, ViewCopy: 2},
         )