Move test_templates to cross_fw directory (#2887)

### Changes

Move all templates classes to separate directory.

### Reason

Improve organization of test files and maintainability

tests/common/quantization/test_layerwise_scheduler.py

@@ -12,7 +12,7 @@
 import pytest
 
 from nncf.quantization.algorithms.layerwise.scheduler import LayerwiseScheduler
-from tests.post_training.test_templates.models import NNCFGraphCAWithBias
+from tests.cross_fw.test_templates.models import NNCFGraphCAWithBias
 
 
 @pytest.mark.parametrize("add_additional_outputs", [False, True])

tests/common/quantization/test_passes.py

@@ -18,8 +18,8 @@
 from nncf.common.graph.operator_metatypes import OperatorMetatype
 from nncf.quantization.passes import filter_constant_nodes
 from nncf.quantization.passes import remove_nodes_and_reconnect_graph
-from tests.post_training.test_templates.models import NNCFGraphDropoutRemovingCase
-from tests.post_training.test_templates.models import NNCFGraphToTestConstantFiltering
+from tests.cross_fw.test_templates.models import NNCFGraphDropoutRemovingCase
+from tests.cross_fw.test_templates.models import NNCFGraphToTestConstantFiltering
 from tests.shared.nx_graph import compare_nx_graph_with_reference
 from tests.shared.paths import TEST_ROOT
 

tests/post_training/test_templates/test_bias_correction.py → tests/cross_fw/test_templates/test_bias_correction.py

@@ -21,10 +21,10 @@
 from nncf.quantization.algorithms.bias_correction.algorithm import BiasCorrection
 from nncf.quantization.algorithms.bias_correction.backend import BiasCorrectionAlgoBackend
 from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import MultipleConvTestModel
-from tests.post_training.test_templates.helpers import SplittedModel
-from tests.post_training.test_templates.helpers import StaticDatasetMock
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import MultipleConvTestModel
+from tests.cross_fw.test_templates.helpers import SplittedModel
+from tests.cross_fw.test_templates.helpers import StaticDatasetMock
 
 TModel = TypeVar("TModel")
 TTensor = TypeVar("TTensor")

tests/post_training/test_templates/test_calculate_quantizer_parameters.py → tests/cross_fw/test_templates/test_calculate_quantizer_parameters.py

@@ -12,6 +12,7 @@
 from abc import ABC
 from abc import abstractmethod
 from dataclasses import dataclass
+from pathlib import Path
 
 import numpy as np
 import pytest
@@ -24,10 +25,11 @@
 from nncf.quantization.fake_quantize import FakeQuantizeParameters
 from nncf.quantization.fake_quantize import calculate_quantizer_parameters
 from nncf.tensor import functions as fns
-from tests.post_training.conftest import FQ_CALCULATED_PARAMETERS_PATH
 from tests.shared.helpers import dump_to_json
 from tests.shared.helpers import load_json
 
+FQ_CALCULATED_PARAMETERS_PATH = Path(__file__).parent / "fq_params" / "fq_params.json"
+
 
 def compare_fq_parameters(ref_params, params):
     assert ref_params.levels == params.levels

tests/post_training/test_templates/test_channel_alignment.py → tests/cross_fw/test_templates/test_channel_alignment.py

@@ -31,8 +31,8 @@
 from nncf.quantization.algorithms.channel_alignment.algorithm import ChannelAlignment
 from nncf.quantization.algorithms.channel_alignment.backend import ChannelAlignmentAlgoBackend
 from nncf.quantization.algorithms.channel_alignment.backend import LayoutDescriptor
-from tests.post_training.test_templates.models import NNCFGraphCA
-from tests.post_training.test_templates.models import NNCFGraphCAWithBias
+from tests.cross_fw.test_templates.models import NNCFGraphCA
+from tests.cross_fw.test_templates.models import NNCFGraphCAWithBias
 
 EPS = 1e-3
 

tests/post_training/test_templates/test_fast_bias_correction.py → tests/cross_fw/test_templates/test_fast_bias_correction.py

@@ -20,9 +20,9 @@
 from nncf.quantization.algorithms.fast_bias_correction.algorithm import FastBiasCorrection
 from nncf.quantization.algorithms.fast_bias_correction.backend import FastBiasCorrectionAlgoBackend
 from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
-from tests.post_training.test_templates.helpers import ConvBNTestModel
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import get_static_dataset
+from tests.cross_fw.test_templates.helpers import ConvBNTestModel
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import get_static_dataset
 
 TModel = TypeVar("TModel")
 TTensor = TypeVar("TTensor")

tests/post_training/test_templates/test_layerwise.py → tests/cross_fw/test_templates/test_layerwise.py

@@ -16,8 +16,8 @@
 from nncf.common.factory import StatisticsAggregatorFactory
 from nncf.quantization.algorithms.layerwise.engine import LayerwiseEngine
 from nncf.tensor import functions as fns
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import get_static_dataset
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import get_static_dataset
 
 TModel = TypeVar("TModel")
 

tests/post_training/test_templates/test_quantizer_config.py → tests/cross_fw/test_templates/test_quantizer_config.py

@@ -38,9 +38,9 @@
 from nncf.quantization.algorithms.min_max.algorithm import MinMaxQuantization
 from nncf.quantization.passes import transform_to_inference_graph
 from nncf.quantization.range_estimator import RangeEstimatorParametersSet
-from tests.post_training.test_templates.models import NNCFGraphToTest
-from tests.post_training.test_templates.models import NNCFGraphToTestDepthwiseConv
-from tests.post_training.test_templates.models import NNCFGraphToTestSumAggregation
+from tests.cross_fw.test_templates.models import NNCFGraphToTest
+from tests.cross_fw.test_templates.models import NNCFGraphToTestDepthwiseConv
+from tests.cross_fw.test_templates.models import NNCFGraphToTestSumAggregation
 
 
 class TemplateTestQuantizerConfig:

tests/post_training/test_templates/test_smooth_quant.py → tests/cross_fw/test_templates/test_smooth_quant.py

@@ -28,11 +28,11 @@
 from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
 from nncf.quantization.algorithms.smooth_quant.algorithm import SmoothQuant
 from nncf.quantization.algorithms.smooth_quant.backend import SmoothQuantAlgoBackend
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import LinearMultiShapeModel
-from tests.post_training.test_templates.helpers import NonZeroLinearModel
-from tests.post_training.test_templates.helpers import ShareWeghtsConvAndShareLinearModel
-from tests.post_training.test_templates.helpers import get_static_dataset
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import LinearMultiShapeModel
+from tests.cross_fw.test_templates.helpers import NonZeroLinearModel
+from tests.cross_fw.test_templates.helpers import ShareWeghtsConvAndShareLinearModel
+from tests.cross_fw.test_templates.helpers import get_static_dataset
 
 TModel = TypeVar("TModel")
 TTensor = TypeVar("TTensor")

tests/onnx/quantization/test_bias_correction.py

@@ -21,11 +21,11 @@
 from nncf.onnx.graph.nncf_graph_builder import GraphConverter
 from nncf.onnx.graph.node_utils import get_bias_value
 from nncf.quantization.algorithms.bias_correction.onnx_backend import ONNXBiasCorrectionAlgoBackend
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import MultipleConvTestModel
+from tests.cross_fw.test_templates.helpers import SplittedModel
+from tests.cross_fw.test_templates.test_bias_correction import TemplateTestBCAlgorithm
 from tests.onnx.quantization.common import compare_nncf_graph
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import MultipleConvTestModel
-from tests.post_training.test_templates.helpers import SplittedModel
-from tests.post_training.test_templates.test_bias_correction import TemplateTestBCAlgorithm
 from tests.shared.paths import TEST_ROOT
 
 

tests/onnx/quantization/test_calculation_quantizer_params.py

@@ -15,7 +15,7 @@
 from nncf.onnx.quantization.quantizer_parameters import get_level_low_level_high
 from nncf.quantization.fake_quantize import calculate_scale_zero_point
 from nncf.tensor import Tensor
-from tests.post_training.test_templates.test_calculate_quantizer_parameters import TemplateTestFQParams
+from tests.cross_fw.test_templates.test_calculate_quantizer_parameters import TemplateTestFQParams
 
 EPS = np.finfo(np.float32).eps
 

tests/onnx/quantization/test_fast_bias_correction.py

@@ -19,7 +19,7 @@
 from nncf.onnx.graph.node_utils import get_bias_value
 from nncf.onnx.graph.node_utils import is_node_with_bias
 from nncf.quantization.algorithms.fast_bias_correction.onnx_backend import ONNXFastBiasCorrectionAlgoBackend
-from tests.post_training.test_templates.test_fast_bias_correction import TemplateTestFBCAlgorithm
+from tests.cross_fw.test_templates.test_fast_bias_correction import TemplateTestFBCAlgorithm
 
 
 def get_data_from_node(model: onnx.ModelProto, node_name: str):

tests/onnx/quantization/test_min_max.py

@@ -21,11 +21,11 @@
 from nncf.onnx.graph.transformations.commands import ONNXTargetPoint
 from nncf.quantization.algorithms.min_max.backend import MinMaxAlgoBackend
 from nncf.quantization.algorithms.min_max.onnx_backend import ONNXMinMaxAlgoBackend
-from tests.post_training.test_templates.models import NNCFGraphToTest
-from tests.post_training.test_templates.test_min_max import MATMUL_WEIGHT_SHAPE
-from tests.post_training.test_templates.test_min_max import TemplateTestGetChannelAxes
-from tests.post_training.test_templates.test_min_max import TemplateTestGetTargetPointShape
-from tests.post_training.test_templates.test_min_max import TemplateTestMinMaxAlgorithm
+from tests.cross_fw.test_templates.models import NNCFGraphToTest
+from tests.cross_fw.test_templates.test_min_max import MATMUL_WEIGHT_SHAPE
+from tests.cross_fw.test_templates.test_min_max import TemplateTestGetChannelAxes
+from tests.cross_fw.test_templates.test_min_max import TemplateTestGetTargetPointShape
+from tests.cross_fw.test_templates.test_min_max import TemplateTestMinMaxAlgorithm
 
 
 class TestONNXMinMaxAlgorithm(TemplateTestMinMaxAlgorithm):

tests/onnx/quantization/test_ptq_params.py

@@ -34,11 +34,11 @@
 from tests.common.quantization.metatypes import Conv2dTestMetatype
 from tests.common.quantization.metatypes import LinearTestMetatype
 from tests.common.quantization.metatypes import SoftmaxTestMetatype
+from tests.cross_fw.test_templates.models import NNCFGraphToTest
+from tests.cross_fw.test_templates.models import NNCFGraphToTestMatMul
+from tests.cross_fw.test_templates.test_ptq_params import TemplateTestPTQParams
 from tests.onnx.models import LinearModel
 from tests.onnx.models import OneDepthwiseConvolutionalModel
-from tests.post_training.test_templates.models import NNCFGraphToTest
-from tests.post_training.test_templates.models import NNCFGraphToTestMatMul
-from tests.post_training.test_templates.test_ptq_params import TemplateTestPTQParams
 
 
 def get_hw_patterns(device: TargetDevice = TargetDevice.ANY) -> GraphPattern:

tests/onnx/quantization/test_quantizer_config.py

@@ -16,10 +16,10 @@
 from nncf.onnx.graph.metatypes.onnx_metatypes import ONNXDepthwiseConvolutionMetatype
 from nncf.onnx.graph.nncf_graph_builder import ONNXLayerAttributes
 from nncf.quantization.algorithms.min_max.onnx_backend import ONNXMinMaxAlgoBackend
-from tests.post_training.test_templates.models import NNCFGraphToTest
-from tests.post_training.test_templates.models import NNCFGraphToTestDepthwiseConv
-from tests.post_training.test_templates.models import NNCFGraphToTestSumAggregation
-from tests.post_training.test_templates.test_quantizer_config import TemplateTestQuantizerConfig
+from tests.cross_fw.test_templates.models import NNCFGraphToTest
+from tests.cross_fw.test_templates.models import NNCFGraphToTestDepthwiseConv
+from tests.cross_fw.test_templates.models import NNCFGraphToTestSumAggregation
+from tests.cross_fw.test_templates.test_quantizer_config import TemplateTestQuantizerConfig
 
 
 class TestQuantizerConfig(TemplateTestQuantizerConfig):

tests/openvino/native/quantization/test_calculation_quantizer_params.py

@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from nncf.tensor import Tensor
-from tests.post_training.test_templates.test_calculate_quantizer_parameters import TemplateTestFQParams
+from tests.cross_fw.test_templates.test_calculate_quantizer_parameters import TemplateTestFQParams
 
 
 class TestFQParams(TemplateTestFQParams):

tests/openvino/native/quantization/test_channel_alignment.py

@@ -29,7 +29,7 @@
 from nncf.openvino.graph.transformations.commands import OVWeightUpdateCommand
 from nncf.quantization.algorithms.channel_alignment.backend import LayoutDescriptor
 from nncf.quantization.algorithms.channel_alignment.openvino_backend import OVChannelAlignmentAlgoBackend
-from tests.post_training.test_templates.test_channel_alignment import TemplateTestChannelAlignment
+from tests.cross_fw.test_templates.test_channel_alignment import TemplateTestChannelAlignment
 
 
 class TestOVChannelAlignment(TemplateTestChannelAlignment):

tests/openvino/native/quantization/test_min_max.py

@@ -22,10 +22,10 @@
 from nncf.openvino.graph.transformations.commands import OVTargetPoint
 from nncf.quantization.algorithms.min_max.backend import MinMaxAlgoBackend
 from nncf.quantization.algorithms.min_max.openvino_backend import OVMinMaxAlgoBackend
-from tests.post_training.test_templates.models import NNCFGraphToTest
-from tests.post_training.test_templates.test_min_max import TemplateTestGetChannelAxes
-from tests.post_training.test_templates.test_min_max import TemplateTestGetTargetPointShape
-from tests.post_training.test_templates.test_min_max import TemplateTestMinMaxAlgorithm
+from tests.cross_fw.test_templates.models import NNCFGraphToTest
+from tests.cross_fw.test_templates.test_min_max import TemplateTestGetChannelAxes
+from tests.cross_fw.test_templates.test_min_max import TemplateTestGetTargetPointShape
+from tests.cross_fw.test_templates.test_min_max import TemplateTestMinMaxAlgorithm
 
 
 class TestOVMinMaxAlgorithm(TemplateTestMinMaxAlgorithm):

tests/openvino/native/quantization/test_ptq_params.py

@@ -34,10 +34,10 @@
 from tests.common.quantization.metatypes import Conv2dTestMetatype
 from tests.common.quantization.metatypes import LinearTestMetatype
 from tests.common.quantization.metatypes import SoftmaxTestMetatype
+from tests.cross_fw.test_templates.models import NNCFGraphToTestMatMul
+from tests.cross_fw.test_templates.test_ptq_params import TemplateTestPTQParams
 from tests.openvino.native.models import DepthwiseConv4DModel
 from tests.openvino.native.models import LinearModel
-from tests.post_training.test_templates.models import NNCFGraphToTestMatMul
-from tests.post_training.test_templates.test_ptq_params import TemplateTestPTQParams
 
 
 def get_hw_patterns(device: TargetDevice = TargetDevice.ANY) -> GraphPattern:

tests/openvino/native/quantization/test_quantizer_config.py

@@ -16,10 +16,10 @@
 from nncf.openvino.graph.metatypes.openvino_metatypes import OVDepthwiseConvolutionMetatype
 from nncf.openvino.graph.metatypes.openvino_metatypes import OVSumMetatype
 from nncf.quantization.algorithms.min_max.openvino_backend import OVMinMaxAlgoBackend
-from tests.post_training.test_templates.models import NNCFGraphToTest
-from tests.post_training.test_templates.models import NNCFGraphToTestDepthwiseConv
-from tests.post_training.test_templates.models import NNCFGraphToTestSumAggregation
-from tests.post_training.test_templates.test_quantizer_config import TemplateTestQuantizerConfig
+from tests.cross_fw.test_templates.models import NNCFGraphToTest
+from tests.cross_fw.test_templates.models import NNCFGraphToTestDepthwiseConv
+from tests.cross_fw.test_templates.models import NNCFGraphToTestSumAggregation
+from tests.cross_fw.test_templates.test_quantizer_config import TemplateTestQuantizerConfig
 
 
 class TestQuantizerConfig(TemplateTestQuantizerConfig):

tests/openvino/native/test_bias_correction.py

@@ -22,12 +22,12 @@
 from nncf.openvino.graph.nncf_graph_builder import GraphConverter
 from nncf.openvino.graph.node_utils import get_bias_value
 from nncf.quantization.algorithms.bias_correction.openvino_backend import OVBiasCorrectionAlgoBackend
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import MultipleConvTestModel
+from tests.cross_fw.test_templates.helpers import SplittedModel
+from tests.cross_fw.test_templates.test_bias_correction import TemplateTestBCAlgorithm
 from tests.openvino.native.common import compare_nncf_graphs
 from tests.openvino.native.common import get_actual_reference_for_current_openvino
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import MultipleConvTestModel
-from tests.post_training.test_templates.helpers import SplittedModel
-from tests.post_training.test_templates.test_bias_correction import TemplateTestBCAlgorithm
 
 
 class TestOVBCAlgorithm(TemplateTestBCAlgorithm):

tests/openvino/native/test_fast_bias_correction.py

@@ -19,7 +19,7 @@
 from nncf.openvino.graph.node_utils import get_bias_value
 from nncf.openvino.graph.node_utils import is_node_with_bias
 from nncf.quantization.algorithms.fast_bias_correction.openvino_backend import OVFastBiasCorrectionAlgoBackend
-from tests.post_training.test_templates.test_fast_bias_correction import TemplateTestFBCAlgorithm
+from tests.cross_fw.test_templates.test_fast_bias_correction import TemplateTestFBCAlgorithm
 
 
 class TestOVFBCAlgorithm(TemplateTestFBCAlgorithm):

tests/openvino/native/test_layerwise.py

@@ -21,7 +21,7 @@
 from nncf.quantization.algorithms.layerwise.scheduler import LayerwiseStep
 from nncf.quantization.algorithms.layerwise.scheduler import NodeOutputPort
 from nncf.tensor import Tensor
-from tests.post_training.test_templates.test_layerwise import TemplateTestLayerwiseEngine
+from tests.cross_fw.test_templates.test_layerwise import TemplateTestLayerwiseEngine
 
 
 class TestOVLayerwiseEngine(TemplateTestLayerwiseEngine):

tests/openvino/native/test_smooth_quant.py

@@ -22,10 +22,10 @@
 from nncf.openvino.graph.metatypes.openvino_metatypes import OVConvolutionMetatype
 from nncf.openvino.graph.metatypes.openvino_metatypes import OVMatMulMetatype
 from nncf.quantization.algorithms.smooth_quant.openvino_backend import OVSmoothQuantAlgoBackend
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import LinearMultiShapeModel
-from tests.post_training.test_templates.helpers import ShareWeghtsConvAndShareLinearModel
-from tests.post_training.test_templates.test_smooth_quant import TemplateTestSQAlgorithm
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import LinearMultiShapeModel
+from tests.cross_fw.test_templates.helpers import ShareWeghtsConvAndShareLinearModel
+from tests.cross_fw.test_templates.test_smooth_quant import TemplateTestSQAlgorithm
 
 OV_LINEAR_MODEL_MM_OP_MAP = {
     "MatMul1": "aten::matmul/MatMul",

tests/post_training/conftest.py

@@ -9,11 +9,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from tests.shared.paths import TEST_ROOT
-
-PTQ_TEST_ROOT = TEST_ROOT / "post_training"
-FQ_CALCULATED_PARAMETERS_PATH = PTQ_TEST_ROOT / "data" / "fq_params" / "fq_params.json"
-
 
 def pytest_addoption(parser):
     parser.addoption("--data", action="store", help="Data directory")

tests/torch/fx/test_fast_bias_correction.py

@@ -21,7 +21,7 @@
 from nncf.quantization.algorithms.fast_bias_correction.torch_fx_backend import FXFastBiasCorrectionAlgoBackend
 from nncf.torch.dynamic_graph.patch_pytorch import disable_patching
 from nncf.torch.model_graph_manager import OPERATORS_WITH_BIAS_METATYPES
-from tests.post_training.test_templates.test_fast_bias_correction import TemplateTestFBCAlgorithm
+from tests.cross_fw.test_templates.test_fast_bias_correction import TemplateTestFBCAlgorithm
 
 
 class TestTorchFXFBCAlgorithm(TemplateTestFBCAlgorithm):

tests/torch/fx/test_smooth_quant.py

@@ -29,10 +29,10 @@
 from nncf.torch import disable_patching
 from nncf.torch.graph.operator_metatypes import PTConv2dMetatype
 from nncf.torch.graph.operator_metatypes import PTLinearMetatype
-from tests.post_training.test_templates.helpers import ConvTestModel
-from tests.post_training.test_templates.helpers import LinearMultiShapeModel
-from tests.post_training.test_templates.helpers import ShareWeghtsConvAndShareLinearModel
-from tests.post_training.test_templates.test_smooth_quant import TemplateTestSQAlgorithm
+from tests.cross_fw.test_templates.helpers import ConvTestModel
+from tests.cross_fw.test_templates.helpers import LinearMultiShapeModel
+from tests.cross_fw.test_templates.helpers import ShareWeghtsConvAndShareLinearModel
+from tests.cross_fw.test_templates.test_smooth_quant import TemplateTestSQAlgorithm
 
 PT_LINEAR_MODEL_MM_MAP = {"Linear1": "linear_3", "Linear2": "linear_2", "Linear3": "linear", "Linear4": "linear_1"}