Skip to content

Commit 4c8971e

Browse files
daniil-lyakhovdaniil-lyakhov
committed
Move files from nncf/common/quantization to nncf/quantization
1 parent 61f5886 commit 4c8971e

File tree

122 files changed

+381
-392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+381
-392
lines changed

‎nncf/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
Neural Network Compression Framework (NNCF) for enhanced OpenVINO™ inference.
1313
"""
1414

15+
from nncf.common.graph.graph import NNCFGraph as NNCFGraph
1516
from nncf.common.logging import nncf_logger as nncf_logger
1617
from nncf.common.logging.logger import disable_logging as disable_logging
1718
from nncf.common.logging.logger import set_log_level as set_log_level

‎nncf/common/hardware/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import nncf
2121
from nncf.common.graph.operator_metatypes import OperatorMetatype
2222
from nncf.common.logging import nncf_logger
23-
from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
24-
from nncf.common.quantization.structs import QuantizerConfig
2523
from nncf.common.utils.helpers import product_dict
2624
from nncf.common.utils.os import safe_open
2725
from nncf.definitions import HW_CONFIG_RELATIVE_DIR
2826
from nncf.definitions import NNCF_PACKAGE_ROOT_DIR
27+
from nncf.quantization.structs import QuantizationScheme as QuantizationMode
28+
from nncf.quantization.structs import QuantizerConfig
2929

3030

3131
class HWConfigType(Enum):

‎nncf/common/quantization/initialization/range.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
from nncf.common.graph.utils import get_reduction_axes
1616
from nncf.common.initialization.dataloader import NNCFDataLoader
17-
from nncf.common.quantization.structs import QuantizationScheme
18-
from nncf.common.quantization.structs import QuantizerGroup
1917
from nncf.common.tensor_statistics.collectors import ReductionAxes
2018
from nncf.config.schemata.defaults import NUM_INIT_SAMPLES
2119
from nncf.experimental.common.tensor_statistics.collectors import AggregationAxes
20+
from nncf.quantization.structs import QuantizationScheme
21+
from nncf.quantization.structs import QuantizerGroup
2222

2323

2424
class RangeInitConfig:

‎nncf/common/quantization/quantizers.py

-70
This file was deleted.

‎nncf/common/scopes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from nncf.common.graph import NNCFNode
1818
from nncf.common.graph import NNCFNodeName
1919
from nncf.common.logging import nncf_logger
20-
from nncf.common.quantization.structs import QuantizerId
20+
from nncf.quantization.structs import QuantizerId
2121
from nncf.scopes import IgnoredScope
2222
from nncf.scopes import convert_ignored_scope_to_list
2323

‎nncf/experimental/quantization/quantizer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from typing import TypeVar
1515

1616
from nncf.common.graph.graph import NNCFGraph
17-
from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
17+
from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
1818

1919
TModel = TypeVar("TModel")
2020

‎nncf/experimental/tensorflow/quantization/algorithm.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
from nncf.common.graph.transformations.commands import TransformationPriority
2020
from nncf.common.graph.utils import get_first_nodes_of_type
2121
from nncf.common.logging import nncf_logger
22-
from nncf.common.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
23-
from nncf.common.quantization.quantizer_setup import QuantizationPointId
24-
from nncf.common.quantization.structs import QuantizerConfig
2522
from nncf.common.stateful_classes_registry import TF_STATEFUL_CLASSES
2623
from nncf.common.statistics import NNCFStatistics
2724
from nncf.common.utils.backend import copy_model
@@ -34,6 +31,9 @@
3431
from nncf.experimental.tensorflow.quantization.init_range import RangeInitializerV2
3532
from nncf.experimental.tensorflow.quantization.init_range import TFRangeInitParamsV2
3633
from nncf.experimental.tensorflow.quantization.quantizers import create_quantizer
34+
from nncf.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
35+
from nncf.quantization.quantizer_setup import QuantizationPointId
36+
from nncf.quantization.structs import QuantizerConfig
3737
from nncf.tensorflow.algorithm_selector import TF_COMPRESSION_ALGORITHMS
3838
from nncf.tensorflow.graph.metatypes.tf_ops import TFOpWithWeightsMetatype
3939
from nncf.tensorflow.graph.transformations.commands import TFInsertionCommand

‎nncf/experimental/tensorflow/quantization/init_range.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
from nncf.common.logging.progress_bar import ProgressBar
1818
from nncf.common.quantization.initialization.range import RangeInitCollectorParams
1919
from nncf.common.quantization.initialization.range import RangeInitConfig
20-
from nncf.common.quantization.structs import QuantizerGroup
2120
from nncf.experimental.tensorflow.nncf_network import NNCFNetwork
2221
from nncf.experimental.tensorflow.quantization.quantizers import NNCF_QUANTIZATION_OPERATIONS_V2
2322
from nncf.experimental.tensorflow.quantization.quantizers import InputType
23+
from nncf.quantization.structs import QuantizerGroup
2424
from nncf.tensorflow.quantization.init_range import RangeInitializer
2525
from nncf.tensorflow.quantization.init_range import TFRangeInitParams
2626
from nncf.tensorflow.tensor_statistics.reduction import get_axes

‎nncf/experimental/tensorflow/quantization/quantizers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
import tensorflow as tf
1515

16-
from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
1716
from nncf.common.utils.registry import Registry
17+
from nncf.quantization.structs import QuantizationScheme as QuantizationMode
1818
from nncf.tensorflow.layers.operation import InputType
1919
from nncf.tensorflow.quantization.quantizers import AsymmetricQuantizer
2020
from nncf.tensorflow.quantization.quantizers import SymmetricQuantizer

‎nncf/experimental/torch/fx/quantization/quantize_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import nncf
2525
from nncf.common.factory import NNCFGraphFactory
2626
from nncf.common.logging import nncf_logger
27-
from nncf.common.quantization.structs import QuantizationPreset
2827
from nncf.data import Dataset
2928
from nncf.experimental.torch.fx.quantization.backend_parameters import is_weight_compression_needed
3029
from nncf.experimental.torch.fx.transformations import apply_quantization_transformations
@@ -40,6 +39,7 @@
4039
from nncf.quantization.advanced_parameters import AdvancedQuantizationParameters
4140
from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
4241
from nncf.quantization.algorithms.weight_compression.algorithm import WeightCompression
42+
from nncf.quantization.structs import QuantizationPreset
4343
from nncf.scopes import IgnoredScope
4444

4545
DEFAULT_RANGE_TYPE = "mean_min_max"

‎nncf/experimental/torch/fx/quantization/quantizer/openvino_adapter.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import torch.fx
1313

1414
from nncf.common.graph.graph import NNCFGraph
15-
from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
1615
from nncf.experimental.quantization.quantizer import Quantizer
1716
from nncf.experimental.torch.fx.quantization.quantizer.openvino_quantizer import OpenVINOQuantizer
17+
from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
1818

1919

2020
class OpenVINOQuantizerAdapter(Quantizer):

‎nncf/experimental/torch/fx/quantization/quantizer/openvino_quantizer.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525
import nncf
2626
from nncf.common.graph.graph import NNCFGraph
2727
from nncf.common.logging import nncf_logger
28-
from nncf.common.quantization.quantizer_propagation.solver import QuantizerPropagationRule
29-
from nncf.common.quantization.quantizer_setup import QuantizationPointBase
30-
from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
31-
from nncf.common.quantization.structs import QuantizationPreset
32-
from nncf.common.quantization.structs import QuantizationScheme
3328
from nncf.experimental.torch.fx.nncf_graph_builder import GraphConverter
3429
from nncf.experimental.torch.fx.node_utils import get_graph_node_by_name
3530
from nncf.experimental.torch.fx.transformations import fold_constant_except_qdq
@@ -40,6 +35,11 @@
4035
from nncf.quantization.advanced_parameters import OverflowFix
4136
from nncf.quantization.advanced_parameters import QuantizationParameters
4237
from nncf.quantization.algorithms.min_max.algorithm import MinMaxQuantization
38+
from nncf.quantization.quantizer_propagation.solver import QuantizerPropagationRule
39+
from nncf.quantization.quantizer_setup import QuantizationPointBase
40+
from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
41+
from nncf.quantization.structs import QuantizationPreset
42+
from nncf.quantization.structs import QuantizationScheme
4343
from nncf.scopes import IgnoredScope
4444
from nncf.torch.model_graph_manager import get_weight_tensor_port_ids
4545

‎nncf/experimental/torch/fx/quantization/quantizer/torch_ao_adapter.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
import nncf
2424
from nncf.common.graph.graph import NNCFGraph
2525
from nncf.common.logging import nncf_logger
26-
from nncf.common.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
27-
from nncf.common.quantization.quantizer_setup import QuantizationPointBase
28-
from nncf.common.quantization.quantizer_setup import SingleConfigQuantizationPoint
29-
from nncf.common.quantization.quantizer_setup import SingleConfigQuantizerSetup
30-
from nncf.common.quantization.quantizer_setup import WeightQuantizationInsertionPoint
31-
from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
32-
from nncf.common.quantization.structs import QuantizerConfig
3326
from nncf.experimental.quantization.quantizer import Quantizer
3427
from nncf.experimental.torch.fx.nncf_graph_builder import GraphConverter
28+
from nncf.quantization.quantizer_setup import ActivationQuantizationInsertionPoint
29+
from nncf.quantization.quantizer_setup import QuantizationPointBase
30+
from nncf.quantization.quantizer_setup import SingleConfigQuantizationPoint
31+
from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup
32+
from nncf.quantization.quantizer_setup import WeightQuantizationInsertionPoint
33+
from nncf.quantization.structs import QuantizationScheme as QuantizationMode
34+
from nncf.quantization.structs import QuantizerConfig
3535

3636
EdgeOrNode = Union[Tuple[torch.fx.Node, torch.fx.Node]]
3737

‎nncf/experimental/torch2/quantization/quantize_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import torch
1616

1717
import nncf
18-
from nncf.common.quantization.structs import QuantizationPreset
1918
from nncf.data import Dataset
2019
from nncf.experimental.torch2.function_hook import wrap_model
2120
from nncf.experimental.torch2.function_hook.nncf_graph.nncf_graph_builder import GraphModelWrapper
@@ -25,6 +24,7 @@
2524
from nncf.quantization.advanced_parameters import AdvancedQuantizationParameters
2625
from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
2726
from nncf.quantization.quantize_model import warning_model_no_batchwise_support
27+
from nncf.quantization.structs import QuantizationPreset
2828
from nncf.scopes import IgnoredScope
2929
from nncf.torch.graph.operator_metatypes import OPERATIONS_OUTPUT_HAS_NO_BATCH_AXIS
3030

‎nncf/onnx/quantization/default_quantization.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
# See the License for the specific language governing permissions and
1010
# limitations under the License.
1111

12-
from nncf.common.quantization.quantizer_propagation.structs import QuantizationTrait
1312
from nncf.onnx.graph.metatypes import onnx_metatypes
1413
from nncf.onnx.graph.metatypes.groups import INPUTS_QUANTIZABLE_OPERATIONS
1514
from nncf.onnx.graph.metatypes.groups import QUANTIZE_AGNOSTIC_OPERATIONS
15+
from nncf.quantization.quantizer_propagation.structs import QuantizationTrait
1616

1717
# If a metatype is not in this list, then it is considered to be QuantizationTrait.NON_QUANTIZABLE.
1818

‎nncf/onnx/quantization/quantize_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import nncf
1717
from nncf.common.logging.logger import nncf_logger
18-
from nncf.common.quantization.structs import QuantizationPreset
1918
from nncf.data import Dataset
2019
from nncf.onnx.graph.metatypes.groups import OPERATIONS_OUTPUT_HAS_NO_BATCH_AXIS
2120
from nncf.onnx.graph.nncf_graph_builder import GraphConverter
@@ -32,6 +31,7 @@
3231
from nncf.quantization.algorithms.post_training.algorithm import PostTrainingQuantization
3332
from nncf.quantization.quantize_model import quantize_with_tune_hyperparams
3433
from nncf.quantization.quantize_model import warning_model_no_batchwise_support
34+
from nncf.quantization.structs import QuantizationPreset
3535
from nncf.scopes import IgnoredScope
3636

3737
TTensor = TypeVar("TTensor")

‎nncf/openvino/quantization/default_quantization.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
# See the License for the specific language governing permissions and
1010
# limitations under the License.
1111

12-
from nncf.common.quantization.quantizer_propagation.structs import QuantizationTrait
1312
from nncf.openvino.graph.metatypes import openvino_metatypes as ov_metatypes
1413
from nncf.openvino.graph.metatypes.groups import INPUTS_QUANTIZABLE_OPERATIONS
1514
from nncf.openvino.graph.metatypes.groups import QUANTIZE_AGNOSTIC_OPERATIONS
15+
from nncf.quantization.quantizer_propagation.structs import QuantizationTrait
1616

1717
# If a metatype is not in this list, then it is considered to be QuantizationTrait.NON_QUANTIZABLE.
1818

‎nncf/openvino/quantization/quantize_model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from nncf.common.factory import NNCFGraphFactory
2020
from nncf.common.factory import StatisticsAggregatorFactory
2121
from nncf.common.logging import nncf_logger
22-
from nncf.common.quantization.structs import QuantizationPreset
2322
from nncf.data import Dataset
2423
from nncf.openvino.graph.metatypes.groups import OPERATIONS_OUTPUT_HAS_NO_BATCH_AXIS
2524
from nncf.openvino.graph.metatypes.openvino_metatypes import OVIfMetatype
@@ -53,6 +52,7 @@
5352
from nncf.quantization.quantize_model import warning_model_no_batchwise_support
5453
from nncf.quantization.statistics_caching import cache_weight_compression_statistics
5554
from nncf.quantization.statistics_caching import register_statistics_for_algorithm
55+
from nncf.quantization.structs import QuantizationPreset
5656
from nncf.scopes import IgnoredScope
5757
from nncf.scopes import validate_ignored_scope
5858

‎nncf/quantization/__init__.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# See the License for the specific language governing permissions and
1010
# limitations under the License.
1111
"""Post-training quantization APIs."""
12-
from nncf.common.quantization.structs import QuantizationPreset as QuantizationPreset
1312
from nncf.quantization.quantize_model import compress_weights as compress_weights
1413
from nncf.quantization.quantize_model import quantize as quantize
1514
from nncf.quantization.quantize_model import quantize_with_accuracy_control as quantize_with_accuracy_control
15+
from nncf.quantization.quantizer_setup import SingleConfigQuantizerSetup as SingleConfigQuantizerSetup
16+
from nncf.quantization.structs import QuantizationPreset as QuantizationPreset
17+
from nncf.quantization.structs import QuantizationScheme as QuantizationScheme

‎nncf/quantization/advanced_parameters.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
from typing import Any, Dict, Optional, Union
2222

2323
import nncf
24-
from nncf.common.quantization.quantizer_propagation.structs import QuantizerPropagationRule
25-
from nncf.common.quantization.structs import QuantizationScheme as QuantizationMode
2624
from nncf.common.utils.api_marker import api
2725
from nncf.parameters import StrEnum
26+
from nncf.quantization.quantizer_propagation.structs import QuantizerPropagationRule
2827
from nncf.quantization.range_estimator import AggregatorType
2928
from nncf.quantization.range_estimator import RangeEstimatorParameters
3029
from nncf.quantization.range_estimator import StatisticsType
30+
from nncf.quantization.structs import QuantizationScheme as QuantizationMode
3131

3232

3333
@api(canonical_alias="nncf.OverflowFix")

‎nncf/quantization/algorithms/accuracy_control/algorithm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from nncf.common.graph import NNCFNode
1919
from nncf.common.graph.utils import get_number_of_quantized_ops
2020
from nncf.common.logging import nncf_logger
21-
from nncf.common.quantization.quantizer_removal import revert_operations_to_floating_point_precision
2221
from nncf.common.utils.backend import BackendType
2322
from nncf.common.utils.backend import get_backend
2423
from nncf.common.utils.os import get_available_cpu_count
@@ -30,6 +29,7 @@
3029
from nncf.quantization.algorithms.accuracy_control.evaluator import Evaluator
3130
from nncf.quantization.algorithms.accuracy_control.evaluator import MetricResults
3231
from nncf.quantization.algorithms.accuracy_control.ranker import Ranker
32+
from nncf.quantization.quantizer_removal import revert_operations_to_floating_point_precision
3333

3434
TModel = TypeVar("TModel")
3535
TTensor = TypeVar("TTensor")

‎nncf/quantization/algorithms/accuracy_control/ranker.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
from nncf.common.graph import NNCFNode
2020
from nncf.common.logging import nncf_logger
2121
from nncf.common.logging.track_progress import track
22-
from nncf.common.quantization.quantizer_removal import find_quantizer_nodes_to_cut
23-
from nncf.common.quantization.quantizer_removal import revert_operations_to_floating_point_precision
2422
from nncf.common.utils.backend import BackendType
2523
from nncf.common.utils.backend import get_backend
2624
from nncf.common.utils.timer import timer
@@ -31,6 +29,8 @@
3129
from nncf.quantization.algorithms.accuracy_control.rank_functions import create_normalized_mse_func
3230
from nncf.quantization.algorithms.accuracy_control.subset_selection import select_subset
3331
from nncf.quantization.passes import find_shapeof_subgraphs
32+
from nncf.quantization.quantizer_removal import find_quantizer_nodes_to_cut
33+
from nncf.quantization.quantizer_removal import revert_operations_to_floating_point_precision
3434

3535
TModel = TypeVar("TModel")
3636
TPModel = TypeVar("TPModel")

‎nncf/quantization/algorithms/hyperparameter_tuner/param_grid.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import itertools
1313
from typing import Any, Dict, List
1414

15-
from nncf.common.quantization.quantizer_propagation.structs import QuantizerPropagationRule
16-
from nncf.common.quantization.structs import QuantizationPreset
1715
from nncf.common.utils.backend import BackendType
1816
from nncf.quantization.advanced_parameters import AdvancedSmoothQuantParameters
1917
from nncf.quantization.algorithms.bias_correction.algorithm import BiasCorrection
@@ -22,10 +20,12 @@
2220
from nncf.quantization.algorithms.min_max.algorithm import MinMaxQuantization
2321
from nncf.quantization.algorithms.pipeline import Pipeline
2422
from nncf.quantization.algorithms.smooth_quant.algorithm import SmoothQuant
23+
from nncf.quantization.quantizer_propagation.structs import QuantizerPropagationRule
2524
from nncf.quantization.range_estimator import AggregatorType
2625
from nncf.quantization.range_estimator import RangeEstimatorParameters
2726
from nncf.quantization.range_estimator import StatisticsCollectorParameters
2827
from nncf.quantization.range_estimator import StatisticsType
28+
from nncf.quantization.structs import QuantizationPreset
2929

3030
ParamGrid = Dict[str, List[Any]]
3131

0 commit comments

Comments
 (0)