Remove test-generator dependency

tools/mo/unit_tests/mo/back/MatMulNormalizer_test.py

@@ -5,7 +5,7 @@
 from argparse import Namespace
 
 import numpy as np
-from generator import generate, generator
+import pytest
 
 from openvino.tools.mo.back.MatMulNormalizer import SmartReshape_HC_Reshape_MatMul, PullTransposeThroughFQUp
 from openvino.tools.mo.ops.MatMul import MatMul
@@ -19,10 +19,9 @@
 from unit_tests.utils.graph import regular_op_with_empty_data as op_with_empty_data
 
 
-@generator
-class SmartReshape_HC_Reshape_MatMulTest(unittest.TestCase):
-    @generate(
-        *[
+class TestSmartReshape_HC_Reshape_MatMulTest():
+    @pytest.mark.parametrize("in1_shape, in2_shape, reshape_pattern, transpose_a, transpose_b, updated_pattern",
+        [
             ([1, 20, 30], [30, 40], [20, -1], False, False, [-1, 30]),
             ([1, 20, 30], [40, 30], [20, -1], False, True, [-1, 30]),
             ([1, 30, 20], [30, 40], [-1, 20], True, False, [30, -1]),
@@ -59,9 +58,9 @@ def test_reshape_on_the_A_input(self,
         graph_ref.clean_up()
 
         (flag, resp) = compare_graphs(graph, graph_ref, 'output', check_op_attrs=True)
-        self.assertTrue(flag, resp)
+        assert flag, resp
 
-    @generate(*[
+    @pytest.mark.parametrize("in1_shape, in2_shape, reshape_pattern, transpose_a, transpose_b, updated_pattern",[
         ([20, 30], [1, 30, 40], [-1, 40], False, False, [30, -1]),
         ([20, 30], [1, 40, 30], [40, -1], False, True, [-1, 30]),
         ([30, 20], [1, 30, 40], [-1, 40], True, False, [30, -1]),
@@ -97,7 +96,7 @@ def test_reshape_on_the_B_input(self,
         graph_ref.clean_up()
 
         (flag, resp) = compare_graphs(graph, graph_ref, 'output', check_op_attrs=True)
-        self.assertTrue(flag, resp)
+        assert flag, resp
 
 
 class FQTransposePullerTest(unittest.TestCase):

tools/mo/unit_tests/mo/back/ShuffleChannelPatternOptimization_test.py

@@ -1,10 +1,8 @@
 # Copyright (C) 2018-2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-import unittest
 from argparse import Namespace
-
-from generator import generate, generator
+import pytest
 
 from openvino.tools.mo.back.ShuffleChannelPatternOptimization import ShuffleChannelFusion, DepthToSpaceFusion
 from openvino.tools.mo.ops.depth_to_space import DepthToSpaceOp
@@ -18,8 +16,7 @@
     valued_const_with_data, connect, regular_op_with_empty_data
 
 
-@generator
-class ShuffleChannelFusionTest(unittest.TestCase):
+class TestShuffleChannelFusionTest():
     @staticmethod
     def get_graphs(input_shape, reshape_0_pattern, order, reshape_1_pattern, group):
         nodes = {
@@ -67,7 +64,7 @@ def get_graphs(input_shape, reshape_0_pattern, order, reshape_1_pattern, group):
 
         return graph, graph_ref
 
-    @generate(*[
+    @pytest.mark.parametrize("input_shape, reshape_0_pattern, order, reshape_1_pattern, group",[
         ([1, 512, 7, 6], [1, 2, 256, 7, 6], [0, 2, 1, 3, 4], [1, 512, 7, 6], 2),
         ([2, 512, 7, 6], [2, 2, 256, 7, 6], [0, 2, 1, 3, 4], [2, 512, 7, 6], 2),
         ([1, 200, 200, 200], [1, 50, 4, 200, 200], [0, 2, 1, 3, 4], [1, 200, 200, 200], 50),
@@ -77,11 +74,11 @@ def test_fusion(self, input_shape, reshape_0_pattern, order, reshape_1_pattern,
         ShuffleChannelFusion().find_and_replace_pattern(graph)
         graph.clean_up()
         (flag, resp) = compare_graphs(graph, graph_ref, 'output')
-        self.assertTrue(flag, resp)
-        self.assertTrue(len(graph.get_op_nodes(name='final_reshape')) == 1 and
-                        graph.get_op_nodes(name='final_reshape')[0].op == 'ShuffleChannels')
+        assert flag, resp
+        assert len(graph.get_op_nodes(name='final_reshape')) == 1 and \
+                        graph.get_op_nodes(name='final_reshape')[0].op == 'ShuffleChannels'
 
-    @generate(*[
+    @pytest.mark.parametrize("input_shape, reshape_0_pattern, order, reshape_1_pattern, group",[
         ([1, 512, 7, 6], [0, 2, 256, 7, 6], [0, 2, 1, 3, 4], [1, 512, 7, 6], 2),
         ([1, 512, 7, 6], [1, 2, 256, 7, 6], [0, 2, 1, 4, 3], [1, 512, 7, 6], 2),
         ([1, 512, 7, 6], [1, 2, 256, 7, 6], [0, 2, 1, 3, 4], [-1, 512, 7, 6], 2),
@@ -91,11 +88,10 @@ def test_negative(self, input_shape, reshape_0_pattern, order, reshape_1_pattern
         graph_ref = graph.copy()
         ShuffleChannelFusion().find_and_replace_pattern(graph)
         (flag, resp) = compare_graphs(graph, graph_ref, 'output')
-        self.assertTrue(flag, resp)
+        assert flag, resp
 
 
-@generator
-class DepthToSpaceFusionTest(unittest.TestCase):
+class TestDepthToSpaceFusionTest():
     @staticmethod
     def get_graphs(input_shape, reshape_0_pattern, order, reshape_1_pattern, block_size):
         nodes = {
@@ -145,7 +141,7 @@ def get_graphs(input_shape, reshape_0_pattern, order, reshape_1_pattern, block_s
 
         return graph, graph_ref
 
-    @generate(*[
+    @pytest.mark.parametrize("input_shape, reshape_0_pattern, order, reshape_1_pattern, block_size",[
         ([1, 512, 7, 6], [1, 2, 2, 128, 7, 6], [0, 1, 4, 2, 5, 3], [1, 128, 14, 12], 2),
         ([2, 512, 7, 6], [2, 2, 2, 128, 7, 6], [0, 1, 4, 2, 5, 3], [2, 128, 14, 12], 2),
         ([1, 200, 200, 200], [1, 2, 2, 50, 200, 200], [0, 1, 4, 2, 5, 3], [1, 50, 400, 400], 2),
@@ -155,11 +151,11 @@ def test_fusion(self, input_shape, reshape_0_pattern, order, reshape_1_pattern,
         DepthToSpaceFusion().find_and_replace_pattern(graph)
         graph.clean_up()
         (flag, resp) = compare_graphs(graph, graph_ref, 'output')
-        self.assertTrue(flag, resp)
-        self.assertTrue(len(graph.get_op_nodes(name='final_reshape')) == 1 and
-                        graph.get_op_nodes(name='final_reshape')[0].op == 'DepthToSpace')
+        assert flag, resp
+        assert len(graph.get_op_nodes(name='final_reshape')) == 1 and \
+                        graph.get_op_nodes(name='final_reshape')[0].op == 'DepthToSpace'
 
-    @generate(*[
+    @pytest.mark.parametrize("input_shape, reshape_0_pattern, order, reshape_1_pattern, group",[
         ([1, 512, 7, 6], [0, 2, 2, 128, 7, 6], [0, 1, 4, 2, 5, 3], [1, 128, 14, 12], 2),
         ([2, 512, 7, 6], [2, 2, 2, 128, 7, 6], [0, 1, 4, 2, 5, 3], [-1, 128, 14, 12], 2),
         ([1, 200, 200, 200], [1, 2, 2, 50, 200, 200], [0, 1, 4, 2, 3, 5], [1, 50, 400, 400], 2),
@@ -169,4 +165,4 @@ def test_negative(self, input_shape, reshape_0_pattern, order, reshape_1_pattern
         graph_ref = graph.copy()
         DepthToSpaceFusion().find_and_replace_pattern(graph)
         (flag, resp) = compare_graphs(graph, graph_ref, 'output')
-        self.assertTrue(flag, resp)
+        assert flag, resp

tools/mo/unit_tests/mo/convert/import_from_mo_test.py

@@ -5,18 +5,16 @@
 import tempfile
 from pathlib import Path
 
-from generator import generator, generate
+import pytest
 from openvino.runtime import serialize
 
 from openvino.tools.mo import InputCutInfo, LayoutMap
 from openvino.tools.mo.utils.ir_engine.ir_engine import IREngine
-from unit_tests.mo.unit_test_with_mocked_telemetry import UnitTestWithMockedTelemetry
 from unit_tests.utils.graph import build_graph
 from utils import create_onnx_model, save_to_onnx
 
 
-@generator
-class ConvertImportMOTest(UnitTestWithMockedTelemetry):
+class TestConvertImportMOTest():
     test_directory = os.path.dirname(os.path.realpath(__file__))
 
     @staticmethod
@@ -79,7 +77,7 @@ def create_model_ref():
                                  ])
         return ref_graph
 
-    @generate(*[
+    @pytest.mark.parametrize("params",[
         ({}),
         ({'input': InputCutInfo(name='LeakyRelu_out', shape=None, type=None, value=None)}),
         ({'layout': {'input': LayoutMap(source_layout='NCHW', target_layout='NHWC')}}),

tools/mo/unit_tests/mo/convert/meta_data_test.py

@@ -5,7 +5,6 @@
 import tempfile
 from pathlib import Path
 
-from generator import generator
 from openvino.runtime import get_version as get_rt_version
 from openvino.runtime import serialize
 
@@ -18,7 +17,6 @@
 from openvino.tools.mo.utils.ir_reader.restore_graph import restore_graph_from_ir, save_restored_graph
 
 
-@generator
 class MetaDataTest(UnitTestWithMockedTelemetry):
     test_directory = os.path.dirname(os.path.realpath(__file__))
 

tools/mo/unit_tests/mo/front/Pack_test.py

@@ -4,7 +4,6 @@
 import unittest
 
 import numpy as np
-from generator import generator, generate
 
 from openvino.tools.mo.front.Pack import Pack
 from openvino.tools.mo.front.common.partial_infer.utils import int64_array
@@ -34,49 +33,50 @@
 }
 
 
-@generator
 class PackTest(unittest.TestCase):
 
-    @generate(*[(2, 2, 0), (3, 3, 0), (4, 4, 0), (4, 4, 1), (4, 1, 0), (4, 1, 1)])
-    def test_pack_test_all(self, num_inputs: int, num_placeholders: int, axis: list):
-
-        graph_edges = []
-        for i in range(num_inputs - num_placeholders + 1):
-            for j in range(num_placeholders):
-                graph_edges.append(('placeholder_{}'.format(j), 'pack'))
-        graph_edges.append(('pack', 'last'))
-
-        update_graph_attributes = {}
-        for i in range(num_placeholders):
-            update_graph_attributes['placeholder_{}'.format(i)] = {'shape': np.array([1, 227, 227, 3])}
-        update_graph_attributes['pack'] = {'axis': axis}
-
-        graph = build_graph(nodes_attributes, graph_edges, update_graph_attributes,
-                            nodes_with_edges_only=True)
-
-        graph_ref_edges = []
-        for i in range(num_inputs - num_placeholders + 1):
-            for j in range(num_placeholders):
-                graph_ref_edges.append(('placeholder_{}'.format(j), 'Unsqueeze_{}'.format(i + j)))
-                graph_ref_edges.append(('Unsqueeze_{}'.format(i + j), 'concat_1'))
-        graph_ref_edges.append(('concat_1', 'last'))
-
-        update_graph_ref_attributes = {}
-        for i in range(num_placeholders):
-            update_graph_ref_attributes['placeholder_{}'.format(i)] = {'shape': np.array([1, 227, 227, 3])}
-        for i in range(num_inputs):
-            graph_ref_edges.append(('Unsqueeze_{}_axis'.format(i), 'Unsqueeze_{}'.format(i)))
-            update_graph_ref_attributes['Unsqueeze_{}_axis'.format(i)] = {'shape': int64_array([1]),
-                                                                          'value': int64_array([axis])}
-        update_graph_ref_attributes['concat_1'] = {'axis': axis}
-
-        graph_ref = build_graph(nodes_attributes, graph_ref_edges, update_graph_ref_attributes,
-                                nodes_with_edges_only=True)
-
-        graph.stage = 'front'
-
-        replacer = Pack()
-        replacer.find_and_replace_pattern(graph)
-
-        (flag, resp) = compare_graphs(graph, graph_ref, 'last', check_op_attrs=True)
-        self.assertTrue(flag, resp)
+    def test_pack_test_all(self):
+        test_cases = [(2, 2, 0), (3, 3, 0), (4, 4, 0), (4, 4, 1), (4, 1, 0), (4, 1, 1)]
+        for idx, (num_inputs, num_placeholders, axis) in enumerate(test_cases):
+            with self.subTest(test_case=idx):
+
+                graph_edges = []
+                for i in range(num_inputs - num_placeholders + 1):
+                    for j in range(num_placeholders):
+                        graph_edges.append(('placeholder_{}'.format(j), 'pack'))
+                graph_edges.append(('pack', 'last'))
+
+                update_graph_attributes = {}
+                for i in range(num_placeholders):
+                    update_graph_attributes['placeholder_{}'.format(i)] = {'shape': np.array([1, 227, 227, 3])}
+                update_graph_attributes['pack'] = {'axis': axis}
+
+                graph = build_graph(nodes_attributes, graph_edges, update_graph_attributes,
+                                    nodes_with_edges_only=True)
+
+                graph_ref_edges = []
+                for i in range(num_inputs - num_placeholders + 1):
+                    for j in range(num_placeholders):
+                        graph_ref_edges.append(('placeholder_{}'.format(j), 'Unsqueeze_{}'.format(i + j)))
+                        graph_ref_edges.append(('Unsqueeze_{}'.format(i + j), 'concat_1'))
+                graph_ref_edges.append(('concat_1', 'last'))
+
+                update_graph_ref_attributes = {}
+                for i in range(num_placeholders):
+                    update_graph_ref_attributes['placeholder_{}'.format(i)] = {'shape': np.array([1, 227, 227, 3])}
+                for i in range(num_inputs):
+                    graph_ref_edges.append(('Unsqueeze_{}_axis'.format(i), 'Unsqueeze_{}'.format(i)))
+                    update_graph_ref_attributes['Unsqueeze_{}_axis'.format(i)] = {'shape': int64_array([1]),
+                                                                                'value': int64_array([axis])}
+                update_graph_ref_attributes['concat_1'] = {'axis': axis}
+
+                graph_ref = build_graph(nodes_attributes, graph_ref_edges, update_graph_ref_attributes,
+                                        nodes_with_edges_only=True)
+
+                graph.stage = 'front'
+
+                replacer = Pack()
+                replacer.find_and_replace_pattern(graph)
+
+                (flag, resp) = compare_graphs(graph, graph_ref, 'last', check_op_attrs=True)
+                self.assertTrue(flag, resp)

tools/mo/unit_tests/mo/front/common/partial_infer/concat_test.py

@@ -1,10 +1,9 @@
 # Copyright (C) 2018-2023 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-import unittest
+import pytest
 
 import numpy as np
-from generator import generate, generator
 
 from openvino.tools.mo.front.common.partial_infer.concat import concat_infer
 from openvino.tools.mo.front.common.partial_infer.utils import shape_array, dynamic_dimension_value, strict_compare_tensors
@@ -20,9 +19,9 @@
                     }
 
 
-@generator
-class TestConcatPartialInfer(unittest.TestCase):
-    @generate(*[([1, 3, 227, 227], [1, 3, 220, 227], [1, 3, 447, 227], 2),
+class TestConcatPartialInfer():
+    @pytest.mark.parametrize("shape1, shape2, output_shape, axis",[([1, 3, 227, 227], [1, 3, 220, 227],
+                                                                    [1, 3, 447, 227], 2),
                 ([1, 3, 227, 227], [1, 3, 227, 220], [1, 3, 227, 447], -1),
                 ([1, 3, dynamic_dimension_value, 227], [1, dynamic_dimension_value, 227, 220], [1, 3, 227, 447], -1),
                 ([1, 3, 10, 227], [1, 3, 10, dynamic_dimension_value], [1, 3, 10, dynamic_dimension_value], -1),
@@ -43,9 +42,10 @@ def test_concat_infer(self, shape1, shape2, output_shape, axis):
         concat_node = Node(graph, 'concat')
         concat_infer(concat_node)
         res_shape = graph.node['node_3']['shape']
-        self.assertTrue(strict_compare_tensors(output_shape, res_shape))
+        assert strict_compare_tensors(output_shape, res_shape)
 
-    @generate(*[(shape_array([1]), shape_array([4]), shape_array([1, 4]), 0),
+    @pytest.mark.parametrize("value1, value2, output_value, axis",[(shape_array([1]),
+                    shape_array([4]), shape_array([1, 4]), 0),
                 (shape_array([dynamic_dimension_value]), shape_array([4]),
                  shape_array([dynamic_dimension_value, 4]), -1),
                 ])
@@ -65,7 +65,7 @@ def test_concat_value_infer(self, value1, value2, output_value, axis):
         concat_node = Node(graph, 'concat')
         concat_infer(concat_node)
         res_value = graph.node['node_3']['value']
-        self.assertTrue(strict_compare_tensors(output_value, res_value))
+        assert strict_compare_tensors(output_value, res_value)
 
     def test_concat_infer_not_match(self):
         graph = build_graph(nodes_attributes,
@@ -81,7 +81,7 @@ def test_concat_infer_not_match(self):
                              })
 
         concat_node = Node(graph, 'concat')
-        with self.assertRaisesRegex(Error, "Concat input shapes do not match for node*"):
+        with pytest.raises(Error, match="Concat input shapes do not match for node*"):
             concat_infer(concat_node)
 
     def test_concat_infer_no_shape(self):
@@ -98,5 +98,5 @@ def test_concat_infer_no_shape(self):
                              })
 
         concat_node = Node(graph, 'concat')
-        with self.assertRaisesRegex(Error, "One of the input shapes is not defined for node *"):
+        with pytest.raises(Error, match="One of the input shapes is not defined for node *"):
             concat_infer(concat_node)