mct-nightly 1.8.0.8032023.post421__py3-none-any.whl → 1.8.0.8052023.post414__py3-none-any.whl

{mct_nightly-1.8.0.8032023.post421.dist-info → mct_nightly-1.8.0.8052023.post414.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

model_compression_toolkit/__init__.py

@@ -13,48 +13,19 @@
 # limitations under the License.
 # ==============================================================================
 
-from model_compression_toolkit.core.common.quantization.debug_config import DebugConfig
-from model_compression_toolkit.gptq.common.gptq_config import GradientPTQConfig, RoundingType, GradientPTQConfigV2
-from model_compression_toolkit.gptq.common.gptq_quantizer_config import GPTQQuantizerConfig, SoftQuantizerConfig
-from model_compression_toolkit.core.common.quantization import quantization_config
-from model_compression_toolkit.core.common.mixed_precision import mixed_precision_quantization_config
-from model_compression_toolkit.core.common.quantization.quantization_config import QuantizationConfig, \
-    QuantizationErrorMethod, DEFAULTCONFIG
-from model_compression_toolkit.core.common.quantization.core_config import CoreConfig
-from model_compression_toolkit.core.common import target_platform
-from model_compression_toolkit.core.tpc_models.get_target_platform_capabilities import get_target_platform_capabilities
-from model_compression_toolkit.core.common.mixed_precision.kpi_tools.kpi import KPI
-from model_compression_toolkit.core.common.mixed_precision.mixed_precision_quantization_config import \
-    MixedPrecisionQuantizationConfig, MixedPrecisionQuantizationConfigV2
-from model_compression_toolkit.qat.common.qat_config import QATConfig, TrainingMethod
-from model_compression_toolkit.core.common.logger import set_log_folder
-from model_compression_toolkit.core.common.data_loader import FolderImageLoader
-from model_compression_toolkit.core.common.framework_info import FrameworkInfo, ChannelAxis
-from model_compression_toolkit.core.common.defaultdict import DefaultDict
-from model_compression_toolkit.core.common import network_editors as network_editor
 
-from model_compression_toolkit.core.keras.quantization_facade import keras_post_training_quantization, \
-    keras_post_training_quantization_mixed_precision
-from model_compression_toolkit.ptq.keras.quantization_facade import keras_post_training_quantization_experimental
-from model_compression_toolkit.gptq.keras.quantization_facade import \
-    keras_gradient_post_training_quantization_experimental
-from model_compression_toolkit.gptq.keras.quantization_facade import get_keras_gptq_config
-from model_compression_toolkit.qat.keras.quantization_facade import keras_quantization_aware_training_init, \
-    keras_quantization_aware_training_finalize
-from model_compression_toolkit.qat.pytorch.quantization_facade import pytorch_quantization_aware_training_init, \
-    pytorch_quantization_aware_training_finalize
-from model_compression_toolkit.core.pytorch.quantization_facade import pytorch_post_training_quantization, \
-    pytorch_post_training_quantization_mixed_precision
-from model_compression_toolkit.ptq.pytorch.quantization_facade import pytorch_post_training_quantization_experimental
-from model_compression_toolkit.gptq.pytorch.quantization_facade import \
-    pytorch_gradient_post_training_quantization_experimental
-from model_compression_toolkit.gptq.pytorch.quantization_facade import get_pytorch_gptq_config
+from model_compression_toolkit.target_platform_capabilities import target_platform
+from model_compression_toolkit.target_platform_capabilities.tpc_models.get_target_platform_capabilities import get_target_platform_capabilities
+from model_compression_toolkit import core
+from model_compression_toolkit.logger import set_log_folder
+from model_compression_toolkit.legacy.keras_quantization_facade import keras_post_training_quantization, keras_post_training_quantization_mixed_precision
+from model_compression_toolkit.legacy.pytorch_quantization_facade import pytorch_post_training_quantization, pytorch_post_training_quantization_mixed_precision
+from model_compression_toolkit import quantizers_infrastructure
+from model_compression_toolkit import ptq
+from model_compression_toolkit import qat
+from model_compression_toolkit import exporter
+from model_compression_toolkit import gptq
+from model_compression_toolkit.gptq import GradientPTQConfig
 
-from model_compression_toolkit.core.keras.kpi_data_facade import keras_kpi_data, keras_kpi_data_experimental
-from model_compression_toolkit.core.pytorch.kpi_data_facade import pytorch_kpi_data, pytorch_kpi_data_experimental
-
-from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.keras.load_model import keras_load_quantized_model
-
-from model_compression_toolkit.exporter.model_exporter import tflite_export_model, TFLiteExportMode, keras_export_model, KerasExportMode, pytorch_export_model, PyTorchExportMode
 
 __version__ = "1.8.0"

model_compression_toolkit/{core/common/constants.py → constants.py}

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
+
 import importlib
 
 # Supported frameworks in MCT:
@@ -47,9 +48,6 @@ LAST_AXIS = -1
 DATA_TYPE = 'dtype'
 FLOAT_32 = 'float32'
 
-# Version
-LATEST = 'latest'
-
 # Number of Tensorboard cosine-similarity plots to add:
 NUM_SAMPLES_DISTANCE_TENSORBOARD = 20
 
@@ -119,12 +117,10 @@ WEIGHTS_CHANNELS_AXIS = 'weights_channels_axis'
 DUMMY_NODE = 'dummy_node'
 DUMMY_TENSOR = 'dummy_tensor'
 
-# TP Model constants
-OPS_SET_LIST = 'ops_set_list'
 
 # TF Input node base name
 INPUT_BASE_NAME = 'base_input'
 
 # Jacobian-weights constants
 MIN_JACOBIANS_ITER = 10
-JACOBIANS_COMP_TOLERANCE = 1e-3
+JACOBIANS_COMP_TOLERANCE = 1e-3

model_compression_toolkit/core/__init__.py

@@ -12,3 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
+
+from model_compression_toolkit.core.common.data_loader import FolderImageLoader
+from model_compression_toolkit.core.common.framework_info import FrameworkInfo, ChannelAxis
+from model_compression_toolkit.core.common.defaultdict import DefaultDict
+from model_compression_toolkit.core.common import network_editors as network_editor
+from model_compression_toolkit.core.common.quantization.debug_config import DebugConfig
+from model_compression_toolkit.core.common.quantization import quantization_config
+from model_compression_toolkit.core.common.mixed_precision import mixed_precision_quantization_config
+from model_compression_toolkit.core.common.quantization.quantization_config import QuantizationConfig, QuantizationErrorMethod, DEFAULTCONFIG
+from model_compression_toolkit.core.common.quantization.core_config import CoreConfig
+from model_compression_toolkit.core.common.mixed_precision.kpi_tools.kpi import KPI
+from model_compression_toolkit.core.common.mixed_precision.mixed_precision_quantization_config import MixedPrecisionQuantizationConfig, MixedPrecisionQuantizationConfigV2
+from model_compression_toolkit.core.keras.kpi_data_facade import keras_kpi_data, keras_kpi_data_experimental
+from model_compression_toolkit.core.pytorch.kpi_data_facade import pytorch_kpi_data, pytorch_kpi_data_experimental

model_compression_toolkit/core/analyzer.py

@@ -17,14 +17,15 @@
 from typing import Callable
 
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
-from model_compression_toolkit.core.common import FrameworkInfo, Logger
-from model_compression_toolkit.core.common.constants import NUM_SAMPLES_DISTANCE_TENSORBOARD
+from model_compression_toolkit.core.common import FrameworkInfo
+from model_compression_toolkit.constants import NUM_SAMPLES_DISTANCE_TENSORBOARD
 from model_compression_toolkit.core.common.graph.base_graph import Graph
 
 from model_compression_toolkit.core.common.similarity_analyzer import compute_cs
 from model_compression_toolkit.core.common.visualization.nn_visualizer import NNVisualizer
 
 from model_compression_toolkit.core.common.visualization.tensorboard_writer import TensorboardWriter
+from model_compression_toolkit.logger import Logger
 
 
 def analyzer_model_quantization(representative_data_gen: Callable,

model_compression_toolkit/core/common/__init__.py

@@ -17,7 +17,6 @@ from model_compression_toolkit.core.common.base_substitutions import BaseSubstit
 from model_compression_toolkit.core.common.framework_info import FrameworkInfo
 from model_compression_toolkit.core.common.graph.base_graph import Graph
 from model_compression_toolkit.core.common.graph.base_node import BaseNode
-from model_compression_toolkit.core.common.logger import Logger
 from model_compression_toolkit.core.common.quantization.quantization_config import QuantizationConfig, DEFAULTCONFIG
 from model_compression_toolkit.core.common.quantization.quantizers.quantizers_helpers import max_power_of_two
 from model_compression_toolkit.core.common.collectors.statistics_collector import StatsCollector, NoStatsCollector

model_compression_toolkit/core/common/collectors/base_collector.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 
 import numpy as np
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 
 
 class BaseCollector(object):

model_compression_toolkit/core/common/collectors/mean_collector.py

@@ -17,7 +17,7 @@
 import numpy as np
 
 from model_compression_toolkit.core.common.collectors.base_collector import BaseCollector
-from model_compression_toolkit.core.common.constants import LAST_AXIS
+from model_compression_toolkit.constants import LAST_AXIS
 
 
 class MeanCollector(BaseCollector):

model_compression_toolkit/core/common/collectors/min_max_per_channel_collector.py

@@ -16,7 +16,7 @@
 import numpy as np
 
 from model_compression_toolkit.core.common.collectors.base_collector import BaseCollector
-from model_compression_toolkit.core.common.constants import LAST_AXIS
+from model_compression_toolkit.constants import LAST_AXIS
 
 
 class MinMaxPerChannelCollector(BaseCollector):

model_compression_toolkit/core/common/framework_implementation.py

@@ -17,7 +17,7 @@ from typing import Callable, Any, List, Tuple, Dict
 
 import numpy as np
 
-from model_compression_toolkit import MixedPrecisionQuantizationConfigV2
+from model_compression_toolkit.core import MixedPrecisionQuantizationConfigV2
 from model_compression_toolkit.core import common
 from model_compression_toolkit.core.common import BaseNode
 from model_compression_toolkit.core.common.collectors.statistics_collector import BaseStatsCollector
@@ -288,13 +288,6 @@ class FrameworkImplementation(ABC):
                              f'framework\'s get_substitutions_after_second_moment_correction '
                              f'method.')  # pragma: no cover
 
-    @abstractmethod
-    def get_gptq_trainer_obj(self):
-        """
-        Returns: GPTQTrainer object
-        """
-        raise NotImplemented(f'{self.__class__.__name__} have to implement the '
-                             f'framework\'s get_gptq_trainer method.')  # pragma: no cover
 
     @abstractmethod
     def get_sensitivity_evaluator(self,

model_compression_toolkit/core/common/framework_info.py

@@ -22,7 +22,7 @@ from typing import Dict, Any, List
 
 from model_compression_toolkit.core.common.defaultdict import DefaultDict
 from model_compression_toolkit.core.common.graph.base_node import BaseNode
-from model_compression_toolkit.core.common.target_platform.op_quantization_config import QuantizationMethod
+from model_compression_toolkit.target_platform_capabilities.target_platform.op_quantization_config import QuantizationMethod
 
 
 class ChannelAxis(Enum):

model_compression_toolkit/core/common/fusion/layer_fusing.py

@@ -16,8 +16,8 @@ import copy
 from typing import Any, List
 from model_compression_toolkit.core.common.graph.base_graph import Graph
 from model_compression_toolkit.core.common.graph.base_node import BaseNode
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework import TargetPlatformCapabilities
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.layer_filter_params import LayerFilterParams
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework import TargetPlatformCapabilities
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.layer_filter_params import LayerFilterParams
 
 
 def filter_fusing_patterns(fusing_patterns: List[List[Any]], node: BaseNode, idx: int = 0) -> List[List[Any]]:
@@ -33,7 +33,7 @@ def filter_fusing_patterns(fusing_patterns: List[List[Any]], node: BaseNode, idx
     valid_fusing_patterns = []
     for i,fusing_pattern in enumerate(fusing_patterns):
         if idx < len(fusing_pattern):
-            if (type(fusing_pattern[idx]) == LayerFilterParams and fusing_pattern[idx].match(node)) or fusing_pattern[idx] == node.type:
+            if (type(fusing_pattern[idx]) == LayerFilterParams and node.is_match_filter_params(fusing_pattern[idx])) or fusing_pattern[idx] == node.type:
                 valid_fusing_patterns.append(fusing_pattern)
 
     # Return only valid patterns for this node
@@ -57,7 +57,7 @@ def is_valid_fusion(fusing_patterns: List[List[Any]], nodes: List[BaseNode]) ->
             continue
         counter = 0
         for i,layer in enumerate(fusing_pattern):
-            if (type(layer) == LayerFilterParams and layer.match(nodes[i])) or layer == nodes[i].type:
+            if (type(layer) == LayerFilterParams and nodes[i].is_match_filter_params(layer)) or layer == nodes[i].type:
                 counter += 1
         if counter == fusion_depth:
             return True

model_compression_toolkit/core/common/graph/base_graph.py

@@ -30,8 +30,8 @@ from model_compression_toolkit.core.common.graph.base_node import BaseNode
 from model_compression_toolkit.core.common.collectors.statistics_collector import BaseStatsCollector
 from model_compression_toolkit.core.common.collectors.statistics_collector import scale_statistics, shift_statistics
 from model_compression_toolkit.core.common.user_info import UserInformation
-from model_compression_toolkit.core.common.logger import Logger
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework import TargetPlatformCapabilities
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework import TargetPlatformCapabilities
 
 OutTensor = namedtuple('OutTensor', 'node node_out_index')
 

model_compression_toolkit/core/common/graph/base_node.py

@@ -18,8 +18,11 @@ from typing import Dict, Any, Tuple, List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import WEIGHTS_NBITS_ATTRIBUTE, CORRECTED_BIAS_ATTRIBUTE, \
+from model_compression_toolkit.constants import WEIGHTS_NBITS_ATTRIBUTE, CORRECTED_BIAS_ATTRIBUTE, \
     ACTIVATION_NBITS_ATTRIBUTE
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationConfigOptions, \
+    TargetPlatformCapabilities, LayerFilterParams
 
 
 class BaseNode:
@@ -429,3 +432,56 @@ class BaseNode:
 
         return len(self.candidates_quantization_cfg) > 0 and \
                any([c.activation_quantization_cfg.enable_activation_quantization for c in self.candidates_quantization_cfg])
+
+    def get_qco(self, tpc: TargetPlatformCapabilities) -> QuantizationConfigOptions:
+        """
+        Get the QuantizationConfigOptions of the node according
+        to the mappings from layers/LayerFilterParams to the OperatorsSet in the TargetPlatformModel.
+
+        Args:
+            tpc: TPC to extract the QuantizationConfigOptions for the node
+
+        Returns:
+            QuantizationConfigOptions of the node.
+        """
+
+        if tpc is None:
+            Logger.error(f'Can not retrieve QC options for None TPC')  # pragma: no cover
+
+        for fl, qco in tpc.filterlayer2qco.items():
+            if self.is_match_filter_params(fl):
+                return qco
+        if self.type in tpc.layer2qco:
+            return tpc.layer2qco.get(self.type)
+        return tpc.tp_model.default_qco
+
+
+    def is_match_filter_params(self, layer_filter_params: LayerFilterParams) -> bool:
+        """
+        Check if the node matches a LayerFilterParams according to its
+        layer, conditions and keyword-arguments.
+
+        Args:
+            layer_filter_params: LayerFilterParams to check if the node matches its properties.
+
+        Returns:
+            Whether the node matches to the LayerFilterParams properties.
+        """
+        # Check the node has the same type as the layer in LayerFilterParams
+        if layer_filter_params.layer != self.type:
+            return False
+
+        # Get attributes from node to filter
+        layer_config = self.framework_attr
+        if hasattr(self, "op_call_kwargs"):
+            layer_config.update(self.op_call_kwargs)
+
+        for attr, value in layer_filter_params.kwargs.items():
+            if layer_config.get(attr) != value:
+                return False
+
+        for c in layer_filter_params.conditions:
+            if not c.match(layer_config):
+                return False
+
+        return True

model_compression_toolkit/core/common/graph/memory_graph/bipartite_graph.py

@@ -16,7 +16,7 @@
 from typing import Any, List, Tuple
 import networkx as nx
 
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 
 
 class DirectedBipartiteGraph(nx.DiGraph):

model_compression_toolkit/core/common/graph/memory_graph/max_cut_astar.py

@@ -16,7 +16,7 @@ import copy
 from typing import List, Tuple, Dict
 
 from model_compression_toolkit.core.common import BaseNode
-from model_compression_toolkit.core.common.constants import DUMMY_TENSOR, DUMMY_NODE
+from model_compression_toolkit.constants import DUMMY_TENSOR, DUMMY_NODE
 from model_compression_toolkit.core.common.graph.memory_graph.cut import Cut
 from model_compression_toolkit.core.common.graph.memory_graph.memory_element import MemoryElements
 from model_compression_toolkit.core.common.graph.memory_graph.memory_graph import ActivationMemoryTensor, MemoryGraph

model_compression_toolkit/core/common/graph/virtual_activation_weights_node.py

@@ -15,8 +15,8 @@
 
 from typing import Dict, Any, Tuple
 
-from model_compression_toolkit import FrameworkInfo
-from model_compression_toolkit.core.common.constants import VIRTUAL_ACTIVATION_WEIGHTS_NODE_PREFIX, \
+from model_compression_toolkit.core import FrameworkInfo
+from model_compression_toolkit.constants import VIRTUAL_ACTIVATION_WEIGHTS_NODE_PREFIX, \
     VIRTUAL_WEIGHTS_SUFFIX, VIRTUAL_ACTIVATION_SUFFIX, FLOAT_BITWIDTH
 
 from model_compression_toolkit.core.common.graph.base_node import BaseNode

model_compression_toolkit/core/common/memory_computation.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from model_compression_toolkit.core.common.constants import BITS_TO_BYTES
+from model_compression_toolkit.constants import BITS_TO_BYTES
 
 
 def compute_quantize_tensor_memory_bytes(tensor_size: float, n_bits: int) -> float:

model_compression_toolkit/core/common/mixed_precision/bit_width_setter.py

@@ -18,11 +18,11 @@ import copy
 from typing import Any, List
 
 from model_compression_toolkit.core.common import Graph, BaseNode
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 
 
 def set_bit_widths(mixed_precision_enable: bool,
-                   graph_to_set_bit_widths: Graph,
+                   graph: Graph,
                    bit_widths_config: List[int] = None) -> Graph:
     """
     Set bit widths configuration to nodes in a graph. For each node, use the desired index
@@ -30,13 +30,11 @@ def set_bit_widths(mixed_precision_enable: bool,
 
     Args:
         mixed_precision_enable: Is mixed precision enabled.
-        graph_to_set_bit_widths: A prepared for quantization graph to set its bit widths.
+        graph: A prepared for quantization graph to set its bit widths.
         bit_widths_config: MP configuration (a list of indices: one for each node's candidate
         quantization configuration).
 
     """
-    graph = copy.deepcopy(graph_to_set_bit_widths)
-
     if mixed_precision_enable:
         assert all([len(n.candidates_quantization_cfg) > 0 for n in graph.get_configurable_sorted_nodes()]), \
             "All configurable nodes in graph should have at least one candidate configuration in mixed precision mode"

model_compression_toolkit/core/common/mixed_precision/kpi_tools/kpi_data.py

@@ -15,14 +15,13 @@
 from typing import Callable, Any
 import numpy as np
 
-from model_compression_toolkit import FrameworkInfo, KPI, CoreConfig
+from model_compression_toolkit.core import FrameworkInfo, KPI, CoreConfig
 from model_compression_toolkit.core.common import Graph
-from model_compression_toolkit.core.common.constants import FLOAT_BITWIDTH
+from model_compression_toolkit.constants import FLOAT_BITWIDTH
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
 from model_compression_toolkit.core.common.graph.edge import EDGE_SINK_INDEX
-from model_compression_toolkit.core.common.target_platform import TargetPlatformCapabilities
+from model_compression_toolkit.target_platform_capabilities.target_platform import TargetPlatformCapabilities
 from model_compression_toolkit.core.runner import read_model_to_graph, get_finalized_graph
-from model_compression_toolkit.core.common.logger import Logger
 
 
 def compute_kpi_data(in_model: Any,

model_compression_toolkit/core/common/mixed_precision/kpi_tools/kpi_methods.py

@@ -18,14 +18,14 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit import FrameworkInfo
+from model_compression_toolkit.core import FrameworkInfo
 from model_compression_toolkit.core.common import Graph, BaseNode
-from model_compression_toolkit.core.common.constants import BITS_TO_BYTES, FLOAT_BITWIDTH
+from model_compression_toolkit.constants import BITS_TO_BYTES, FLOAT_BITWIDTH
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
 from model_compression_toolkit.core.common.graph.edge import EDGE_SINK_INDEX
 from model_compression_toolkit.core.common.graph.virtual_activation_weights_node import VirtualActivationWeightsNode, \
     VirtualSplitWeightsNode, VirtualSplitActivationNode
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 
 
 def weights_size_kpi(mp_cfg: List[int],

model_compression_toolkit/core/common/mixed_precision/mixed_precision_quantization_config.py

@@ -16,7 +16,7 @@
 from enum import Enum
 from typing import List, Callable, Tuple
 
-from model_compression_toolkit.core.common import Logger
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.core.common.mixed_precision.distance_weighting import get_average_weights
 from model_compression_toolkit.core.common.quantization.quantization_config import QuantizationConfig, DEFAULTCONFIG
 from model_compression_toolkit.core.common.similarity_analyzer import compute_mse

model_compression_toolkit/core/common/mixed_precision/mixed_precision_search_facade.py

@@ -18,8 +18,8 @@ from enum import Enum
 import numpy as np
 from typing import List, Callable, Dict
 
-from model_compression_toolkit import MixedPrecisionQuantizationConfigV2
-from model_compression_toolkit.core.common import Graph, Logger
+from model_compression_toolkit.core import MixedPrecisionQuantizationConfigV2
+from model_compression_toolkit.core.common import Graph
 from model_compression_toolkit.core.common.mixed_precision.kpi_tools.kpi import KPI, KPITarget
 from model_compression_toolkit.core.common.mixed_precision.kpi_tools.kpi_functions_mapping import kpi_functions_mapping
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
@@ -30,6 +30,7 @@ from model_compression_toolkit.core.common.framework_info import FrameworkInfo
 from model_compression_toolkit.core.common.mixed_precision.solution_refinement_procedure import \
     greedy_solution_refinement_procedure
 from model_compression_toolkit.core.common.substitutions.apply_substitutions import substitute
+from model_compression_toolkit.logger import Logger
 
 
 class BitWidthSearchMethod(Enum):

model_compression_toolkit/core/common/mixed_precision/mixed_precision_search_manager.py

@@ -18,7 +18,7 @@ from typing import Dict, List
 import numpy as np
 
 from model_compression_toolkit.core.common import BaseNode
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
 from model_compression_toolkit.core.common.graph.base_graph import Graph
 from model_compression_toolkit.core.common.graph.virtual_activation_weights_node import VirtualActivationWeightsNode, \

model_compression_toolkit/core/common/mixed_precision/search_methods/linear_programming.py

@@ -18,7 +18,7 @@ from pulp import *
 from tqdm import tqdm
 from typing import Dict, List, Tuple, Callable
 
-from model_compression_toolkit.core.common import Logger
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.core.common.mixed_precision.kpi_tools.kpi import KPI, KPITarget
 from model_compression_toolkit.core.common.mixed_precision.mixed_precision_search_manager import MixedPrecisionSearchManager
 

model_compression_toolkit/core/common/mixed_precision/sensitivity_evaluation.py

@@ -17,10 +17,10 @@ import copy
 import numpy as np
 from typing import Callable, Any, List
 
-from model_compression_toolkit import FrameworkInfo, MixedPrecisionQuantizationConfigV2
+from model_compression_toolkit.core import FrameworkInfo, MixedPrecisionQuantizationConfigV2
 from model_compression_toolkit.core.common import Graph, BaseNode
 from model_compression_toolkit.core.common.model_builder_mode import ModelBuilderMode
-from model_compression_toolkit.core.common import Logger
+from model_compression_toolkit.logger import Logger
 
 
 class SensitivityEvaluation:

model_compression_toolkit/core/common/mixed_precision/solution_refinement_procedure.py

@@ -15,12 +15,12 @@
 
 from typing import List
 
-from model_compression_toolkit import KPI
+from model_compression_toolkit.core import KPI
 from model_compression_toolkit.core.common.mixed_precision.mixed_precision_search_manager import \
     MixedPrecisionSearchManager
 from model_compression_toolkit.core.common.quantization.candidate_node_quantization_config import \
     CandidateNodeQuantizationConfig
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 import numpy as np
 
 

model_compression_toolkit/core/common/model_collector.py

@@ -17,11 +17,11 @@
 import numpy as np
 from typing import List
 
-from model_compression_toolkit import FrameworkInfo
+from model_compression_toolkit.core import FrameworkInfo
 from model_compression_toolkit.core import common
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
 from model_compression_toolkit.core.common.graph.base_graph import Graph
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.core.common.model_builder_mode import ModelBuilderMode
 
 

model_compression_toolkit/core/common/model_validation.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from typing import Any
 
-from model_compression_toolkit import FrameworkInfo
+from model_compression_toolkit.core import FrameworkInfo
 
 
 class ModelValidation:

model_compression_toolkit/core/common/network_editors/actions.py

@@ -17,7 +17,10 @@ from abc import ABC, abstractmethod
 from collections import namedtuple
 from typing import Callable
 
-from model_compression_toolkit.core.common import Graph, Logger
+from model_compression_toolkit.core.common import Graph
+from model_compression_toolkit.logger import Logger
+
+
 from model_compression_toolkit.core.common.framework_info import FrameworkInfo
 from model_compression_toolkit.core.common.graph.base_node import BaseNode
 from model_compression_toolkit.core.common.quantization.quantization_params_fn_selection import \

model_compression_toolkit/core/common/network_editors/edit_network.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-import copy
 from typing import List
 
 from model_compression_toolkit.core.common.framework_info import FrameworkInfo
@@ -36,7 +35,6 @@ def edit_network_graph(graph: Graph,
         The graph after it has been applied the edit rules from the network editor list.
 
     """
-    # graph = copy.deepcopy(graph_to_edit)
     for edit_rule in network_editor:
         filtered_nodes = graph.filter(edit_rule.filter)
         for node in filtered_nodes:

model_compression_toolkit/core/common/quantization/candidate_node_quantization_config.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from model_compression_toolkit.core.common.constants import ACTIVATION_QUANTIZATION_CFG, WEIGHTS_QUANTIZATION_CFG, QC, \
+from model_compression_toolkit.constants import ACTIVATION_QUANTIZATION_CFG, WEIGHTS_QUANTIZATION_CFG, QC, \
     OP_CFG, ACTIVATION_QUANTIZATION_FN, WEIGHTS_QUANTIZATION_FN, ACTIVATION_QUANT_PARAMS_FN, WEIGHTS_QUANT_PARAMS_FN, \
     WEIGHTS_CHANNELS_AXIS
 from model_compression_toolkit.core.common.quantization.node_quantization_config import BaseNodeQuantizationConfig, \

model_compression_toolkit/core/common/quantization/filter_nodes_candidates.py

@@ -16,12 +16,12 @@ import copy
 from typing import List
 
 from model_compression_toolkit.core.common import Graph, BaseNode
-from model_compression_toolkit.core.common.constants import FLOAT_BITWIDTH
+from model_compression_toolkit.constants import FLOAT_BITWIDTH
 from model_compression_toolkit.core.common.quantization.candidate_node_quantization_config import \
     CandidateNodeQuantizationConfig
 
 
-def filter_nodes_candidates(graph_to_filter: Graph):
+def filter_nodes_candidates(graph: Graph):
     """
     Filters the graph's nodes candidates configuration list.
     We apply this after mark activation operation to eliminate nodes that their activation are no longer being quantized
@@ -29,9 +29,8 @@ def filter_nodes_candidates(graph_to_filter: Graph):
     Updating the lists is preformed inplace on the graph object.
 
     Args:
-        graph_to_filter: Graph for which to add quantization info to each node.
+        graph: Graph for which to add quantization info to each node.
     """
-    graph = copy.deepcopy(graph_to_filter)
     nodes = list(graph.nodes)
     for n in nodes:
         n.candidates_quantization_cfg = filter_node_candidates(node=n)

model_compression_toolkit/core/common/quantization/node_quantization_config.py

@@ -18,13 +18,13 @@ from typing import Callable, Any
 
 import numpy as np
 
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.core.common.quantization.quantization_params_fn_selection import \
     get_activation_quantization_params_fn, get_weights_quantization_params_fn
 
 from model_compression_toolkit.core.common.quantization.quantization_config import QuantizationConfig, \
     QuantizationErrorMethod
-from model_compression_toolkit.core.common.target_platform import OpQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.target_platform import OpQuantizationConfig
 
 
 ##########################################
@@ -256,7 +256,7 @@ class NodeWeightsQuantizationConfig(BaseNodeQuantizationConfig):
         self.weights_n_bits = op_cfg.weights_n_bits
         self.weights_bias_correction = qc.weights_bias_correction
         self.weights_second_moment_correction = qc.weights_second_moment_correction
-        self.weights_per_channel_threshold = qc.weights_per_channel_threshold
+        self.weights_per_channel_threshold = op_cfg.weights_per_channel_threshold
         self.enable_weights_quantization = op_cfg.enable_weights_quantization
         self.min_threshold = qc.min_threshold
         self.l_p_value = qc.l_p_value