Apply changes for ONNX

Author: aobolensk

src/nncf/onnx/quantization/backend_parameters.py

@@ -24,23 +24,9 @@ class BackendParameters:
         is skipped.
     """
 
-    COMPRESS_WEIGHTS = "compress_weights"
     EXTERNAL_DATA_DIR = "external_data_dir"
 
 
-def is_weight_compression_needed(advanced_parameters: Optional[AdvancedQuantizationParameters]) -> bool:
-    """
-    Determines whether weight compression is needed based on the provided
-    advanced quantization parameters.
-
-    :param advanced_parameters: Advanced quantization parameters.
-    :return: `True` if weight compression is needed, `False` otherwise.
-    """
-    if advanced_parameters is not None and advanced_parameters.backend_params is not None:
-        return advanced_parameters.backend_params.get(BackendParameters.COMPRESS_WEIGHTS, True)
-    return True
-
-
 def get_external_data_dir(
     advanced_parameters: Optional[Union[AdvancedQuantizationParameters, AdvancedCompressionParameters]],
 ) -> Optional[str]:

src/nncf/onnx/quantization/quantize_model.py

@@ -32,9 +32,7 @@
 from nncf.onnx.graph.nncf_graph_builder import GraphConverter
 from nncf.onnx.graph.passes import apply_preprocess_passes
 from nncf.onnx.graph.passes import compress_quantize_weights_transformation
-from nncf.onnx.quantization.backend_parameters import BackendParameters
 from nncf.onnx.quantization.backend_parameters import get_external_data_dir
-from nncf.onnx.quantization.backend_parameters import is_weight_compression_needed
 from nncf.parameters import BackupMode
 from nncf.parameters import CompressionFormat
 from nncf.parameters import CompressWeightsMode
@@ -47,6 +45,7 @@
 from nncf.quantization.advanced_parameters import AdvancedCompressionParameters
 from nncf.quantization.advanced_parameters import AdvancedQuantizationParameters
 from nncf.quantization.advanced_parameters import QuantizationParameters
+from nncf.quantization.advanced_parameters import is_weight_compression_needed
 from nncf.quantization.algorithms.accuracy_control.algorithm import QuantizationAccuracyRestorer
 from nncf.quantization.algorithms.accuracy_control.algorithm import calculate_accuracy_drop
 from nncf.quantization.algorithms.accuracy_control.evaluator import Evaluator
@@ -215,7 +214,7 @@ def quantize_with_accuracy_control_impl(
         copied_parameters = AdvancedQuantizationParameters()
     else:
         copied_parameters = deepcopy(advanced_quantization_parameters)
-    copied_parameters.backend_params[BackendParameters.COMPRESS_WEIGHTS] = False
+    copied_parameters.compress_weights = False
 
     quantized_model = quantize_impl(
         model=model,

tests/onnx/test_passes.py

@@ -14,7 +14,6 @@
 import nncf
 from nncf.onnx.graph.passes import apply_preprocess_passes
 from nncf.onnx.graph.passes import compress_quantize_weights_transformation
-from nncf.onnx.quantization.backend_parameters import BackendParameters
 from tests.onnx.common import ModelBuilder
 from tests.onnx.models import build_matmul_model_with_nop_cast
 
@@ -60,7 +59,7 @@ def test_compress_quantize_weights_transformation():
         model,
         calibration_dataset,
         advanced_parameters=nncf.AdvancedQuantizationParameters(
-            backend_params={BackendParameters.COMPRESS_WEIGHTS: False}
+            compress_weights=False,
         ),
     )