fixes after rebase

Author: irenab

model_compression_toolkit/core/common/graph/base_graph.py

@@ -873,11 +873,7 @@ def override_fused_node_activation_quantization_candidates(self):
             fusing_op_quantization_cfg = self.fusing_info.get_fused_op_quantization_config(fused_node_op_id)
             if fusing_op_quantization_cfg is not None and fusing_op_quantization_cfg.enable_activation_quantization:
                 def update(qc):
-                    qc.activation_quantization_cfg = NodeActivationQuantizationConfig(
-                        fusing_op_quantization_cfg,
-                        qc.activation_quantization_cfg.activation_quantization_fn,
-                        qc.activation_quantization_cfg.activation_quantization_params_fn
-                    )
+                    qc.activation_quantization_cfg = NodeActivationQuantizationConfig(fusing_op_quantization_cfg)
                     qc.activation_quantization_cfg.quant_mode = ActivationQuantizationMode.FLN_QUANT
                 node.quantization_cfg.update_all(update)
                 node.quantization_cfg.remove_duplicates()

model_compression_toolkit/core/common/network_editors/actions.py

@@ -20,11 +20,8 @@
 from mct_quantizers import QuantizationMethod
 from model_compression_toolkit.core.common import Graph
 from model_compression_toolkit.logger import Logger
-
-
 from model_compression_toolkit.core.common.graph.base_node import BaseNode
-from model_compression_toolkit.core.common.quantization.quantization_fn_selection import \
-    get_weights_quantization_fn
+
 
 _EditRule = namedtuple('EditRule', 'filter action')
 

model_compression_toolkit/core/common/statistics_correction/apply_second_moment_correction_to_graph.py

@@ -50,7 +50,7 @@ def _collect_and_assign_act_threshold(graph: Graph,
     for _data in tqdm(representative_data_gen()):
         mi.infer(_data)
 
-    for n in list(graph.nodes):
+    for n in graph.nodes:
         if n.is_activation_quantization_enabled():
             activation_params = compute_activation_qparams(activation_quant_cfg=n.final_activation_quantization_cfg,
                                                            node_prior_info=n.prior_info,

model_compression_toolkit/core/common/statistics_correction/compute_activation_bias_correction_of_graph.py

@@ -18,7 +18,6 @@
 from model_compression_toolkit.core import QuantizationConfig
 from model_compression_toolkit.core.common import BaseNode, Graph
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
-from model_compression_toolkit.core.common.framework_info import FrameworkInfo
 from model_compression_toolkit.core.common.quantization.quantization_fn_selection import get_activation_quantization_fn
 
 

tests_pytest/common_tests/unit_tests/core/graph/test_base_graph.py

@@ -13,24 +13,18 @@
 # limitations under the License.
 # ==============================================================================
 import itertools
-from copy import deepcopy 
 
 import pytest
-from unittest.mock import Mock, PropertyMock
+from unittest.mock import Mock
 
 from mct_quantizers import QuantizationMethod
 from model_compression_toolkit.core.common import Graph
-from model_compression_toolkit.core.common.graph.base_node import BaseNode
 from model_compression_toolkit.core.common.fusion.fusing_info import FusingInfo
 from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import Signedness
-from tests.common_tests.helpers.generate_test_tpc import generate_test_attr_configs, generate_test_op_qc
 from model_compression_toolkit.core.common.quantization.node_quantization_config import ActivationQuantizationMode, NodeActivationQuantizationConfig
 from model_compression_toolkit.core.common.quantization.candidate_node_quantization_config import \
     CandidateNodeQuantizationConfig, NodeQuantizationConfig
-from model_compression_toolkit.core.common.quantization.quantization_params_generation.power_of_two_selection import power_of_two_selection_histogram
-from model_compression_toolkit.core.common.quantization.quantization_params_generation.symmetric_selection import symmetric_selection_histogram
-from model_compression_toolkit.core import QuantizationErrorMethod
-from tests_pytest._test_util.graph_builder_utils import build_node, build_nbits_qc
+from tests_pytest._test_util.graph_builder_utils import build_node
 
 
 def build_mock_fusing_info(nodes, idx):
@@ -42,7 +36,6 @@ def build_mock_fusing_info(nodes, idx):
     OpQCfg.activation_n_bits = 16
     OpQCfg.signedness = Signedness.AUTO
     OpQCfg.activation_quantization_method = QuantizationMethod.POWER_OF_TWO
-    OpQCfg.activation_quantization_params_fn = power_of_two_selection_histogram
     OpQCfg.quantization_preserving = False
 
     fusing_info = Mock(spec=FusingInfo)
@@ -70,8 +63,6 @@ def eq(self_, other):
     a_cfgs = [Mock(spec=NodeActivationQuantizationConfig,
                    quant_mode=Mock(),
                    activation_n_bits=b,
-                   activation_quantization_fn=symmetric_selection_histogram,
-                   activation_quantization_params_fn=power_of_two_selection_histogram,
                    __eq__=eq) for b in [5, 6]]
 
     qcs = [CandidateNodeQuantizationConfig(a_cfg, w_cfg) for a_cfg, w_cfg in itertools.product(a_cfgs, w_cfgs)]
@@ -124,7 +115,6 @@ def test_override_fused_node_activation_quantization_candidates(self, idx, patch
                 assert qc.activation_quantization_cfg.activation_n_bits == 16
                 assert qc.activation_quantization_cfg.signedness == Signedness.AUTO
                 assert qc.activation_quantization_cfg.activation_quantization_method == QuantizationMethod.POWER_OF_TWO
-                assert qc.activation_quantization_cfg.activation_quantization_params_fn == power_of_two_selection_histogram
                 assert qc.weights_quantization_cfg == w_cfgs[i]
             base_cfg0 = nodes[0].quantization_cfg.base_quantization_cfg
             assert base_cfg0.activation_quantization_cfg.activation_n_bits == 16