Move files from nncf/common/quantization to nncf/quantization

openvinotoolkit · Feb 14, 2025 · 2480d64 · 2480d64
1 parent 61f5886
commit 2480d64
Show file tree

Hide file tree

Showing 115 changed files with 361 additions and 372 deletions.
diff --git a/nncf/__init__.py b/nncf/__init__.py
@@ -12,6 +12,7 @@
 Neural Network Compression Framework (NNCF) for enhanced OpenVINO™ inference.
 """
 
+from nncf.common.graph.graph import NNCFGraph as NNCFGraph
 from nncf.common.logging import nncf_logger as nncf_logger
 from nncf.common.logging.logger import disable_logging as disable_logging
 from nncf.common.logging.logger import set_log_level as set_log_level

diff --git a/nncf/common/hardware/config.py b/nncf/common/hardware/config.py
@@ -20,12 +20,12 @@
 import nncf
 from nncf.common.graph.operator_metatypes import OperatorMetatype
 from nncf.common.logging import nncf_logger
-from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
-from nncf.common.quantization.structs import QuantizerConfig
 from nncf.common.utils.helpers import product_dict
 from nncf.common.utils.os import safe_open
 from nncf.definitions import HW_CONFIG_RELATIVE_DIR
 from nncf.definitions import NNCF_PACKAGE_ROOT_DIR
+from nncf.quantization.structs import QuantizationScheme as QuantizationMode
+from nncf.quantization.structs import QuantizerConfig
 
 
 class HWConfigType(Enum):

diff --git a/nncf/common/quantization/initialization/range.py b/nncf/common/quantization/initialization/range.py
@@ -14,11 +14,11 @@
 
 from nncf.common.graph.utils import get_reduction_axes
 from nncf.common.initialization.dataloader import NNCFDataLoader
-from nncf.common.quantization.structs import QuantizationScheme
-from nncf.common.quantization.structs import QuantizerGroup
 from nncf.common.tensor_statistics.collectors import ReductionAxes
 from nncf.config.schemata.defaults import NUM_INIT_SAMPLES
 from nncf.experimental.common.tensor_statistics.collectors import AggregationAxes
+from nncf.quantization.structs import QuantizationScheme
+from nncf.quantization.structs import QuantizerGroup
 
 
 class RangeInitConfig:

diff --git a/nncf/common/quantization/quantizers.py b/nncf/common/quantization/quantizers.py
diff --git a/nncf/common/scopes.py b/nncf/common/scopes.py
@@ -17,7 +17,7 @@
 from nncf.common.graph import NNCFNode
 from nncf.common.graph import NNCFNodeName
 from nncf.common.logging import nncf_logger
-from nncf.common.quantization.structs import QuantizerId
+from nncf.quantization.structs import QuantizerId
 from nncf.scopes import IgnoredScope
 from nncf.scopes import convert_ignored_scope_to_list
 

diff --git a/nncf/experimental/quantization/quantizer.py b/nncf/experimental/quantization/quantizer.py
@@ -14,7 +14,7 @@
 from typing import TypeVar
 
 from nncf.common.graph.graph import NNCFGraph
-from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
+from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
 
 TModel = TypeVar("TModel")
 

diff --git a/nncf/experimental/tensorflow/quantization/algorithm.py b/nncf/experimental/tensorflow/quantization/algorithm.py
@@ -19,9 +19,6 @@
 from nncf.common.graph.transformations.commands import TransformationPriority
 from nncf.common.graph.utils import get_first_nodes_of_type
 from nncf.common.logging import nncf_logger
-from nncf.common.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
-from nncf.common.quantization.quantizer_setup import QuantizationPointId
-from nncf.common.quantization.structs import QuantizerConfig
 from nncf.common.stateful_classes_registry import TF_STATEFUL_CLASSES
 from nncf.common.statistics import NNCFStatistics
 from nncf.common.utils.backend import copy_model
@@ -34,6 +31,9 @@
 from nncf.experimental.tensorflow.quantization.init_range import RangeInitializerV2
 from nncf.experimental.tensorflow.quantization.init_range import TFRangeInitParamsV2
 from nncf.experimental.tensorflow.quantization.quantizers import create_quantizer
+from nncf.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
+from nncf.quantization.quantizer_setup import QuantizationPointId
+from nncf.quantization.structs import QuantizerConfig
 from nncf.tensorflow.algorithm_selector import TF_COMPRESSION_ALGORITHMS
 from nncf.tensorflow.graph.metatypes.tf_ops import TFOpWithWeightsMetatype
 from nncf.tensorflow.graph.transformations.commands import TFInsertionCommand

diff --git a/nncf/experimental/tensorflow/quantization/init_range.py b/nncf/experimental/tensorflow/quantization/init_range.py
@@ -17,10 +17,10 @@
 from nncf.common.logging.progress_bar import ProgressBar
 from nncf.common.quantization.initialization.range import RangeInitCollectorParams
 from nncf.common.quantization.initialization.range import RangeInitConfig
-from nncf.common.quantization.structs import QuantizerGroup
 from nncf.experimental.tensorflow.nncf_network import NNCFNetwork
 from nncf.experimental.tensorflow.quantization.quantizers import NNCF_QUANTIZATION_OPERATIONS_V2
 from nncf.experimental.tensorflow.quantization.quantizers import InputType
+from nncf.quantization.structs import QuantizerGroup
 from nncf.tensorflow.quantization.init_range import RangeInitializer
 from nncf.tensorflow.quantization.init_range import TFRangeInitParams
 from nncf.tensorflow.tensor_statistics.reduction import get_axes

diff --git a/nncf/experimental/tensorflow/quantization/quantizers.py b/nncf/experimental/tensorflow/quantization/quantizers.py
@@ -13,8 +13,8 @@
 
 import tensorflow as tf
 
-from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
 from nncf.common.utils.registry import Registry
+from nncf.quantization.structs import QuantizationScheme as QuantizationMode
 from nncf.tensorflow.layers.operation import InputType
 from nncf.tensorflow.quantization.quantizers import AsymmetricQuantizer
 from nncf.tensorflow.quantization.quantizers import SymmetricQuantizer

diff --git a/nncf/experimental/torch/fx/quantization/quantize_model.py b/nncf/experimental/torch/fx/quantization/quantize_model.py
@@ -24,7 +24,6 @@
 import nncf
 from nncf.common.factory import NNCFGraphFactory
 from nncf.common.logging import nncf_logger
-from nncf.common.quantization.structs import QuantizationPreset
 from nncf.data import Dataset
 from nncf.experimental.torch.fx.quantization.backend_parameters import is_weight_compression_needed
 from nncf.experimental.torch.fx.transformations import apply_quantization_transformations
@@ -40,6 +39,7 @@
 from nncf.quantization.advanced_parameters import AdvancedQuantizationParameters
 from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
 from nncf.quantization.algorithms.weight_compression.algorithm import WeightCompression
+from nncf.quantization.structs import QuantizationPreset
 from nncf.scopes import IgnoredScope
 
 DEFAULT_RANGE_TYPE = "mean_min_max"

diff --git a/nncf/experimental/torch/fx/quantization/quantizer/openvino_adapter.py b/nncf/experimental/torch/fx/quantization/quantizer/openvino_adapter.py
@@ -12,9 +12,9 @@
 import torch.fx
 
 from nncf.common.graph.graph import NNCFGraph
-from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
 from nncf.experimental.quantization.quantizer import Quantizer
 from nncf.experimental.torch.fx.quantization.quantizer.openvino_quantizer import OpenVINOQuantizer
+from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
 
 
 class OpenVINOQuantizerAdapter(Quantizer):

diff --git a/nncf/experimental/torch/fx/quantization/quantizer/openvino_quantizer.py b/nncf/experimental/torch/fx/quantization/quantizer/openvino_quantizer.py
@@ -26,10 +26,6 @@
 from nncf.common.graph.graph import NNCFGraph
 from nncf.common.logging import nncf_logger
 from nncf.common.quantization.quantizer_propagation.solver import QuantizerPropagationRule
-from nncf.common.quantization.quantizer_setup import QuantizationPointBase
-from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
-from nncf.common.quantization.structs import QuantizationPreset
-from nncf.common.quantization.structs import QuantizationScheme
 from nncf.experimental.torch.fx.nncf_graph_builder import GraphConverter
 from nncf.experimental.torch.fx.node_utils import get_graph_node_by_name
 from nncf.experimental.torch.fx.transformations import fold_constant_except_qdq
@@ -40,6 +36,10 @@
 from nncf.quantization.advanced_parameters import OverflowFix
 from nncf.quantization.advanced_parameters import QuantizationParameters
 from nncf.quantization.algorithms.min_max.algorithm import MinMaxQuantization
+from nncf.quantization.quantizer_setup import QuantizationPointBase
+from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
+from nncf.quantization.structs import QuantizationPreset
+from nncf.quantization.structs import QuantizationScheme
 from nncf.scopes import IgnoredScope
 from nncf.torch.model_graph_manager import get_weight_tensor_port_ids
 

diff --git a/nncf/experimental/torch/fx/quantization/quantizer/torch_ao_adapter.py b/nncf/experimental/torch/fx/quantization/quantizer/torch_ao_adapter.py
@@ -23,15 +23,15 @@
 import nncf
 from nncf.common.graph.graph import NNCFGraph
 from nncf.common.logging import nncf_logger
-from nncf.common.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
-from nncf.common.quantization.quantizer_setup import QuantizationPointBase
-from nncf.common.quantization.quantizer_setup import SingleConfigQuantizationPoint
-from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
-from nncf.common.quantization.quantizer_setup import WeightQuantizationInsertionPoint
-from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
-from nncf.common.quantization.structs import QuantizerConfig
 from nncf.experimental.quantization.quantizer import Quantizer
 from nncf.experimental.torch.fx.nncf_graph_builder import GraphConverter
+from nncf.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
+from nncf.quantization.quantizer_setup import QuantizationPointBase
+from nncf.quantization.quantizer_setup import SingleConfigQuantizationPoint
+from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
+from nncf.quantization.quantizer_setup import WeightQuantizationInsertionPoint
+from nncf.quantization.structs import QuantizationScheme as QuantizationMode
+from nncf.quantization.structs import QuantizerConfig
 
 EdgeOrNode = Union[Tuple[torch.fx.Node, torch.fx.Node]]
 

diff --git a/nncf/experimental/torch2/quantization/quantize_model.py b/nncf/experimental/torch2/quantization/quantize_model.py
@@ -15,7 +15,6 @@
 import torch
 
 import nncf
-from nncf.common.quantization.structs import QuantizationPreset
 from nncf.data import Dataset
 from nncf.experimental.torch2.function_hook import wrap_model
 from nncf.experimental.torch2.function_hook.nncf_graph.nncf_graph_builder import GraphModelWrapper
@@ -25,6 +24,7 @@
 from nncf.quantization.advanced_parameters import AdvancedQuantizationParameters
 from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
 from nncf.quantization.quantize_model import warning_model_no_batchwise_support
+from nncf.quantization.structs import QuantizationPreset
 from nncf.scopes import IgnoredScope
 from nncf.torch.graph.operator_metatypes import OPERATIONS_OUTPUT_HAS_NO_BATCH_AXIS
 

diff --git a/nncf/onnx/quantization/quantize_model.py b/nncf/onnx/quantization/quantize_model.py
@@ -15,7 +15,6 @@
 
 import nncf
 from nncf.common.logging.logger import nncf_logger
-from nncf.common.quantization.structs import QuantizationPreset
 from nncf.data import Dataset
 from nncf.onnx.graph.metatypes.groups import OPERATIONS_OUTPUT_HAS_NO_BATCH_AXIS
 from nncf.onnx.graph.nncf_graph_builder import GraphConverter
@@ -32,6 +31,7 @@
 from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
 from nncf.quantization.quantize_model import quantize_with_tune_hyperparams
 from nncf.quantization.quantize_model import warning_model_no_batchwise_support
+from nncf.quantization.structs import QuantizationPreset
 from nncf.scopes import IgnoredScope
 
 TTensor = TypeVar("TTensor")

diff --git a/nncf/openvino/quantization/quantize_model.py b/nncf/openvino/quantization/quantize_model.py
@@ -19,7 +19,6 @@
 from nncf.common.factory import NNCFGraphFactory
 from nncf.common.factory import StatisticsAggregatorFactory
 from nncf.common.logging import nncf_logger
-from nncf.common.quantization.structs import QuantizationPreset
 from nncf.data import Dataset
 from nncf.openvino.graph.metatypes.groups import OPERATIONS_OUTPUT_HAS_NO_BATCH_AXIS
 from nncf.openvino.graph.metatypes.openvino_metatypes import OVIfMetatype
@@ -53,6 +52,7 @@
 from nncf.quantization.quantize_model import warning_model_no_batchwise_support
 from nncf.quantization.statistics_caching import cache_weight_compression_statistics
 from nncf.quantization.statistics_caching import register_statistics_for_algorithm
+from nncf.quantization.structs import QuantizationPreset
 from nncf.scopes import IgnoredScope
 from nncf.scopes import validate_ignored_scope
 

diff --git a/nncf/quantization/__init__.py b/nncf/quantization/__init__.py
@@ -9,7 +9,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Post-training quantization APIs."""
-from nncf.common.quantization.structs import QuantizationPreset as QuantizationPreset
 from nncf.quantization.quantize_model import compress_weights as compress_weights
 from nncf.quantization.quantize_model import quantize as quantize
 from nncf.quantization.quantize_model import quantize_with_accuracy_control as quantize_with_accuracy_control
+from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup as SingleConfigQuantizerSetup
+from nncf.quantization.structs import QuantizationPreset as QuantizationPreset
+from nncf.quantization.structs import QuantizationScheme as QuantizationScheme
diff --git a/nncf/quantization/advanced_parameters.py b/nncf/quantization/advanced_parameters.py
@@ -22,12 +22,12 @@
 
 import nncf
 from nncf.common.quantization.quantizer_propagation.structs import QuantizerPropagationRule
-from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
 from nncf.common.utils.api_marker import api
 from nncf.parameters import StrEnum
 from nncf.quantization.range_estimator import AggregatorType
 from nncf.quantization.range_estimator import RangeEstimatorParameters
 from nncf.quantization.range_estimator import StatisticsType
+from nncf.quantization.structs import QuantizationScheme as QuantizationMode
 
 
 @api(canonical_alias="nncf.OverflowFix")

diff --git a/nncf/quantization/algorithms/accuracy_control/algorithm.py b/nncf/quantization/algorithms/accuracy_control/algorithm.py
@@ -18,7 +18,6 @@
 from nncf.common.graph import NNCFNode
 from nncf.common.graph.utils import get_number_of_quantized_ops
 from nncf.common.logging import nncf_logger
-from nncf.common.quantization.quantizer_removal import revert_operations_to_floating_point_precision
 from nncf.common.utils.backend import BackendType
 from nncf.common.utils.backend import get_backend
 from nncf.common.utils.os import get_available_cpu_count
@@ -30,6 +29,7 @@
 from nncf.quantization.algorithms.accuracy_control.evaluator import Evaluator
 from nncf.quantization.algorithms.accuracy_control.evaluator import MetricResults
 from nncf.quantization.algorithms.accuracy_control.ranker import Ranker
+from nncf.quantization.quantizer_removal import revert_operations_to_floating_point_precision
 
 TModel = TypeVar("TModel")
 TTensor = TypeVar("TTensor")

diff --git a/nncf/quantization/algorithms/accuracy_control/ranker.py b/nncf/quantization/algorithms/accuracy_control/ranker.py
@@ -19,8 +19,6 @@
 from nncf.common.graph import NNCFNode
 from nncf.common.logging import nncf_logger
 from nncf.common.logging.track_progress import track
-from nncf.common.quantization.quantizer_removal import find_quantizer_nodes_to_cut
-from nncf.common.quantization.quantizer_removal import revert_operations_to_floating_point_precision
 from nncf.common.utils.backend import BackendType
 from nncf.common.utils.backend import get_backend
 from nncf.common.utils.timer import timer
@@ -31,6 +29,8 @@
 from nncf.quantization.algorithms.accuracy_control.rank_functions import create_normalized_mse_func
 from nncf.quantization.algorithms.accuracy_control.subset_selection import select_subset
 from nncf.quantization.passes import find_shapeof_subgraphs
+from nncf.quantization.quantizer_removal import find_quantizer_nodes_to_cut
+from nncf.quantization.quantizer_removal import revert_operations_to_floating_point_precision
 
 TModel = TypeVar("TModel")
 TPModel = TypeVar("TPModel")

diff --git a/nncf/quantization/algorithms/hyperparameter_tuner/param_grid.py b/nncf/quantization/algorithms/hyperparameter_tuner/param_grid.py
@@ -13,7 +13,6 @@
 from typing import Any, Dict, List
 
 from nncf.common.quantization.quantizer_propagation.structs import QuantizerPropagationRule
-from nncf.common.quantization.structs import QuantizationPreset
 from nncf.common.utils.backend import BackendType
 from nncf.quantization.advanced_parameters import AdvancedSmoothQuantParameters
 from nncf.quantization.algorithms.bias_correction.algorithm import BiasCorrection
@@ -26,6 +25,7 @@
 from nncf.quantization.range_estimator import RangeEstimatorParameters
 from nncf.quantization.range_estimator import StatisticsCollectorParameters
 from nncf.quantization.range_estimator import StatisticsType
+from nncf.quantization.structs import QuantizationPreset
 
 ParamGrid = Dict[str, List[Any]]