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

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/common/base_trainable_quantizer.py

@@ -12,12 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-
-from typing import Union
+from abc import abstractmethod
+from enum import Enum
+from typing import Union, List, Any
 from inspect import signature
 
 from model_compression_toolkit.core import common
-from model_compression_toolkit.core.common import Logger
+from model_compression_toolkit.logger import Logger
 
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import BaseInferableQuantizer, \
     QuantizationTarget
@@ -27,6 +28,19 @@ from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructur
     QUANTIZATION_TARGET
 
 
+VAR = 'var'
+GROUP = 'group'
+
+class VariableGroup(Enum):
+    """
+    An enum for choosing trainable variable group
+    0. WEIGHTS
+    1. QPARAMS
+    """
+    WEIGHTS = 0
+    QPARAMS = 1
+
+
 class BaseTrainableQuantizer(BaseInferableQuantizer):
     def __init__(self,
                  quantization_config: Union[TrainableQuantizerActivationConfig, TrainableQuantizerWeightsConfig]):
@@ -41,9 +55,9 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
         for i, (k, v) in enumerate(self.get_sig().parameters.items()):
             if i == 0:
                 if v.annotation not in [TrainableQuantizerWeightsConfig, TrainableQuantizerActivationConfig]:
-                    common.Logger.error(f"First parameter must be either TrainableQuantizerWeightsConfig or TrainableQuantizerActivationConfig")  # pragma: no cover
+                    Logger.error(f"First parameter must be either TrainableQuantizerWeightsConfig or TrainableQuantizerActivationConfig")  # pragma: no cover
             elif v.default is v.empty:
-                common.Logger.error(f"Parameter {k} doesn't have a default value")  # pragma: no cover
+                Logger.error(f"Parameter {k} doesn't have a default value")  # pragma: no cover
 
         super(BaseTrainableQuantizer, self).__init__()
         self.quantization_config = quantization_config
@@ -59,17 +73,19 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
         if static_quantization_target == QuantizationTarget.Weights:
             self.validate_weights()
             if self.quantization_config.weights_quantization_method not in static_quantization_method:
-                common.Logger.error(
+                Logger.error(
                     f'Quantization method mismatch expected: {static_quantization_method} and got  {self.quantization_config.weights_quantization_method}')
         elif static_quantization_target == QuantizationTarget.Activation:
             self.validate_activation()
             if self.quantization_config.activation_quantization_method not in static_quantization_method:
-                common.Logger.error(
+                Logger.error(
                     f'Quantization method mismatch expected: {static_quantization_method} and got  {self.quantization_config.activation_quantization_method}')
         else:
-            common.Logger.error(
+            Logger.error(
                 f'Unknown Quantization Part:{static_quantization_target}')  # pragma: no cover
 
+        self.quantizer_parameters = {}
+
     @classmethod
     def get_sig(cls):
         return signature(cls)
@@ -129,7 +145,7 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
 
         """
         if self.activation_quantization() or not self.weights_quantization():
-            common.Logger.error(f'Expect weight quantization got activation')
+            Logger.error(f'Expect weight quantization got activation')
 
     def validate_activation(self) -> None:
         """
@@ -137,7 +153,7 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
 
         """
         if not self.activation_quantization() or self.weights_quantization():
-            common.Logger.error(f'Expect activation quantization got weight')
+            Logger.error(f'Expect activation quantization got weight')
 
     def convert2inferable(self) -> BaseInferableQuantizer:
         """
@@ -147,3 +163,38 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
             BaseInferableQuantizer object.
         """
         raise NotImplemented  # pragma: no cover
+
+    def add_quantizer_variable(self, name: str, variable: Any, group: VariableGroup = VariableGroup.WEIGHTS):
+        """
+        Add a quantizer variable to quantizer_parameters dictionary
+        """
+        self.quantizer_parameters.update({name: {VAR: variable, GROUP: group}})
+
+    def get_quantizer_variable(self, name: str) -> Any:
+        """
+        Get a quantizer variable by name
+
+        Args:
+            name: variable name
+
+        Returns:
+            trainable variable
+        """
+        if name in self.quantizer_parameters:
+            return self.quantizer_parameters[name][VAR]
+        else:
+            Logger.error(f'Variable {name} is not exist in quantizers parameters!') # pragma: no cover
+
+
+    @abstractmethod
+    def get_trainable_variables(self, group: VariableGroup) -> List[Any]:
+        """
+        Get trainable parameters with specific group from quantizer
+
+        Args:
+            group: Enum of variable group
+
+        Returns:
+            List of trainable variables
+        """
+        raise NotImplemented  # pragma: no cover

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/common/get_quantizer_config.py

@@ -13,7 +13,8 @@
 # limitations under the License.
 # ==============================================================================
 from typing import List
-from model_compression_toolkit.core.common import BaseNode, Logger
+from model_compression_toolkit.core.common import BaseNode
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.trainable_quantizer_config import \
     TrainableQuantizerWeightsConfig, TrainableQuantizerActivationConfig, TrainableQuantizerCandidateConfig
 

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/common/get_quantizers.py

@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from typing import Union
+from typing import Union, Any
 
-from model_compression_toolkit import TrainingMethod, RoundingType
-from model_compression_toolkit.core.common import Logger
-from model_compression_toolkit.core.common.target_platform import QuantizationMethod
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure import QuantizationTarget
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.constants \
     import QUANTIZATION_TARGET, QUANTIZATION_METHOD, QUANTIZER_TYPE
@@ -25,7 +24,7 @@ from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructur
 
 
 def get_trainable_quantizer_class(quant_target: QuantizationTarget,
-                                  quantizer_type: Union[TrainingMethod, RoundingType],
+                                  quantizer_type: Union[Any, Any],
                                   quant_method: QuantizationMethod,
                                   quantizer_base_class: type) -> type:
     """

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/common/trainable_quantizer_config.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 from abc import ABC
 from typing import Dict, List
-from model_compression_toolkit.core.common.target_platform import QuantizationMethod
+from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 
 
 class TrainableQuantizerCandidateConfig:

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/keras/base_keras_quantizer.py

@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from typing import Dict, Any, Union
+from typing import Dict, Any, Union, List
 
-from model_compression_toolkit.core.common import Logger
-from model_compression_toolkit.core.common.constants import FOUND_TF
-
-from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.base_trainable_quantizer import BaseTrainableQuantizer
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.constants import FOUND_TF
+from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.base_trainable_quantizer import VariableGroup
+from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.base_trainable_quantizer import BaseTrainableQuantizer, VAR, GROUP
 from model_compression_toolkit.quantizers_infrastructure import TrainableQuantizerWeightsConfig, \
     TrainableQuantizerActivationConfig
 
@@ -25,7 +25,7 @@ if FOUND_TF:
     QUANTIZATION_CONFIG = 'quantization_config'
     from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.keras.config_serialization import config_serialization, \
         config_deserialization
-
+    import tensorflow as tf
 
     class BaseKerasTrainableQuantizer(BaseTrainableQuantizer):
         def __init__(self,
@@ -61,6 +61,24 @@ if FOUND_TF:
             # Note that a quantizer only receive quantization config and the rest of define hardcoded inside the speficie quantizer.
             return cls(quantization_config=quantization_config)
 
+        def get_trainable_variables(self, group: VariableGroup) -> List[tf.Tensor]:
+            """
+            Get trainable parameters with specific group from quantizer
+
+            Args:
+                group: Enum of variable group
+
+            Returns:
+                List of trainable variables
+            """
+            quantizer_trainable = []
+            for name, parameter_dict in self.quantizer_parameters.items():
+                quantizer_parameter, parameter_group = parameter_dict[VAR], parameter_dict[GROUP]
+                if quantizer_parameter.trainable and parameter_group == group:
+                    quantizer_trainable.append(quantizer_parameter)
+            return quantizer_trainable
+
+
 else:
     class BaseKerasTrainableQuantizer(BaseTrainableQuantizer):
         def __init__(self,

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/keras/config_serialization.py

@@ -17,7 +17,7 @@ import copy
 from typing import Any, Union
 from enum import Enum
 
-from model_compression_toolkit.core.common.target_platform import QuantizationMethod
+from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.trainable_quantizer_config import \
     TrainableQuantizerActivationConfig, TrainableQuantizerWeightsConfig
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common import constants as C

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/pytorch/base_pytorch_quantizer.py

@@ -12,17 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from typing import Union
+from typing import Union, List
 
-from model_compression_toolkit.core.common.logger import Logger
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
-
-from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.base_trainable_quantizer import BaseTrainableQuantizer
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.constants import FOUND_TORCH
+from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.base_trainable_quantizer import VariableGroup
+from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.base_trainable_quantizer import BaseTrainableQuantizer, VAR, GROUP
 from model_compression_toolkit.quantizers_infrastructure import TrainableQuantizerWeightsConfig, \
     TrainableQuantizerActivationConfig
 
+
 if FOUND_TORCH:
 
+    import torch
+
     class BasePytorchTrainableQuantizer(BaseTrainableQuantizer):
         def __init__(self,
                      quantization_config: Union[TrainableQuantizerWeightsConfig, TrainableQuantizerActivationConfig]):
@@ -35,6 +38,24 @@ if FOUND_TORCH:
             """
             super().__init__(quantization_config)
 
+
+        def get_trainable_variables(self, group: VariableGroup) -> List[torch.Tensor]:
+            """
+            Get trainable parameters with specific group from quantizer
+
+            Args:
+                group: Enum of variable group
+
+            Returns:
+                List of trainable variables
+            """
+            quantizer_trainable = []
+            for name, parameter_dict in self.quantizer_parameters.items():
+                quantizer_parameter, parameter_group = parameter_dict[VAR], parameter_dict[GROUP]
+                if quantizer_parameter.requires_grad and parameter_group == group:
+                    quantizer_trainable.append(quantizer_parameter)
+            return quantizer_trainable
+
 else:
     class BasePytorchTrainableQuantizer(BaseTrainableQuantizer):
         def __init__(self,

model_compression_toolkit/target_platform_capabilities/constants.py

@@ -0,0 +1,27 @@
+# Copyright 2023 Sony Semiconductor Israel, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+# TP Model constants
+OPS_SET_LIST = 'ops_set_list'
+
+# Version
+LATEST = 'latest'
+
+
+# Supported TP models names:
+DEFAULT_TP_MODEL = 'default'
+IMX500_TP_MODEL = 'imx500'
+TFLITE_TP_MODEL = 'tflite'
+QNNPACK_TP_MODEL = 'qnnpack'

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/__init__.py

@@ -13,16 +13,16 @@
 # limitations under the License.
 # ==============================================================================
 
-from model_compression_toolkit.core.common.target_platform.fusing import Fusing
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework import \
+from model_compression_toolkit.target_platform_capabilities.target_platform.fusing import Fusing
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework import \
     TargetPlatformCapabilities, OperationsSetToLayers, Smaller, SmallerEq, NotEq, Eq, GreaterEq, Greater, LayerFilterParams, OperationsToLayers, get_current_tpc
 
-from model_compression_toolkit.core.common.target_platform.target_platform_model import \
+from model_compression_toolkit.target_platform_capabilities.target_platform.target_platform_model import \
     get_default_quantization_config_options, TargetPlatformModel
 
-from model_compression_toolkit.core.common.target_platform.op_quantization_config import OpQuantizationConfig, \
+from model_compression_toolkit.target_platform_capabilities.target_platform.op_quantization_config import OpQuantizationConfig, \
     QuantizationConfigOptions, QuantizationMethod
-from model_compression_toolkit.core.common.target_platform.operators import OperatorsSet, OperatorSetConcat
+from model_compression_toolkit.target_platform_capabilities.target_platform.operators import OperatorsSet, OperatorSetConcat
 
 
 

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/current_tp_model.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 
 def get_current_tp_model():
     """

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/fusing.py

@@ -16,8 +16,8 @@
 
 from typing import Any
 
-from model_compression_toolkit.core.common.target_platform.operators import OperatorSetConcat
-from model_compression_toolkit.core.common.target_platform.target_platform_model_component import TargetPlatformModelComponent
+from model_compression_toolkit.target_platform_capabilities.target_platform.operators import OperatorSetConcat
+from model_compression_toolkit.target_platform_capabilities.target_platform.target_platform_model_component import TargetPlatformModelComponent
 
 
 class Fusing(TargetPlatformModelComponent):

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/operators.py

@@ -14,10 +14,10 @@
 # ==============================================================================
 from typing import Dict, Any
 
-from model_compression_toolkit.core.common.constants import OPS_SET_LIST
-from model_compression_toolkit.core.common.target_platform.target_platform_model_component import TargetPlatformModelComponent
-from model_compression_toolkit.core.common.target_platform.current_tp_model import _current_tp_model
-from model_compression_toolkit.core.common.target_platform.op_quantization_config import QuantizationConfigOptions
+from model_compression_toolkit.target_platform_capabilities.constants import OPS_SET_LIST
+from model_compression_toolkit.target_platform_capabilities.target_platform.target_platform_model_component import TargetPlatformModelComponent
+from model_compression_toolkit.target_platform_capabilities.target_platform.current_tp_model import _current_tp_model
+from model_compression_toolkit.target_platform_capabilities.target_platform.op_quantization_config import QuantizationConfigOptions
 
 
 class OperatorsSetBase(TargetPlatformModelComponent):

model_compression_toolkit/target_platform_capabilities/target_platform/quantization_format.py

@@ -0,0 +1,20 @@
+# Copyright 2023 Sony Semiconductor Israel, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+from enum import Enum
+
+
+class QuantizationFormat(Enum):
+    FAKELY_QUANT = 0
+    INT8 = 1

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/target_platform_model.py

@@ -16,16 +16,16 @@
 import pprint
 from typing import Any, Dict
 
-from model_compression_toolkit.core.common.target_platform.current_tp_model import _current_tp_model, \
+from model_compression_toolkit.target_platform_capabilities.target_platform.current_tp_model import _current_tp_model, \
     get_current_tp_model
-from model_compression_toolkit.core.common.target_platform.fusing import Fusing
-from model_compression_toolkit.core.common.target_platform.target_platform_model_component import \
+from model_compression_toolkit.target_platform_capabilities.target_platform.fusing import Fusing
+from model_compression_toolkit.target_platform_capabilities.target_platform.target_platform_model_component import \
     TargetPlatformModelComponent
-from model_compression_toolkit.core.common.target_platform.op_quantization_config import OpQuantizationConfig, \
+from model_compression_toolkit.target_platform_capabilities.target_platform.op_quantization_config import OpQuantizationConfig, \
     QuantizationConfigOptions
-from model_compression_toolkit.core.common.target_platform.operators import OperatorsSetBase
-from model_compression_toolkit.core.common.immutable import ImmutableClass
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.target_platform_capabilities.target_platform.operators import OperatorsSetBase
+from model_compression_toolkit.target_platform_capabilities.immutable import ImmutableClass
+from model_compression_toolkit.logger import Logger
 
 
 def get_default_quantization_config_options() -> QuantizationConfigOptions:
@@ -223,3 +223,12 @@ class TargetPlatformModel(ImmutableClass):
 
         """
         pprint.pprint(self.get_info(), sort_dicts=False)
+
+    def set_quantization_format(self,
+                                quantization_format: Any):
+        """
+        Set quantization format.
+        Args:
+            quantization_format: A quantization format (fake-quant, int8 etc.) from enum QuantizationFormat.
+        """
+        self.quantization_format = quantization_format

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/target_platform_model_component.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 from typing import Any, Dict
 
-from model_compression_toolkit.core.common.target_platform.current_tp_model import _current_tp_model
+from model_compression_toolkit.target_platform_capabilities.target_platform.current_tp_model import _current_tp_model
 
 
 class TargetPlatformModelComponent:

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/targetplatform2framework/__init__.py

@@ -13,13 +13,13 @@
 # limitations under the License.
 # ==============================================================================
 
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.current_tpc import get_current_tpc
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.target_platform_capabilities import TargetPlatformCapabilities
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.attribute_filter import \
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.current_tpc import get_current_tpc
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.target_platform_capabilities import TargetPlatformCapabilities
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.attribute_filter import \
     Eq, GreaterEq, NotEq, SmallerEq, Greater, Smaller
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.layer_filter_params import \
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.layer_filter_params import \
     LayerFilterParams
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.operations_to_layers import \
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.operations_to_layers import \
     OperationsToLayers, OperationsSetToLayers
 
 

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/targetplatform2framework/attribute_filter.py

@@ -16,7 +16,7 @@
 import operator
 from typing import Any, Callable, Dict
 
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.logger import Logger
 
 
 class Filter:

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/targetplatform2framework/layer_filter_params.py

@@ -13,10 +13,8 @@
 # limitations under the License.
 # ==============================================================================
 
-from typing import Any, Dict
-
-from model_compression_toolkit.core.common.graph.base_node import BaseNode
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.attribute_filter import AttributeFilter
+from typing import Any
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.attribute_filter import AttributeFilter
 
 
 class LayerFilterParams:
@@ -87,34 +85,34 @@ class LayerFilterParams:
         params.extend([str(c) for c in self.conditions])
         params_str = ', '.join(params)
         return f'{self.layer.__name__}({params_str})'
-
-    def match(self,
-              node: BaseNode) -> bool:
-        """
-        Check if a node matches the layer, conditions and keyword-arguments of
-        the LayerFilterParams.
-
-        Args:
-            node: Node to check if matches to the LayerFilterParams properties.
-
-        Returns:
-            Whether the node matches to the LayerFilterParams properties.
-        """
-        # Check the node has the same type as the layer in LayerFilterParams
-        if self.layer != node.type:
-            return False
-
-        # Get attributes from node to filter
-        layer_config = node.framework_attr
-        if hasattr(node, "op_call_kwargs"):
-            layer_config.update(node.op_call_kwargs)
-
-        for attr, value in self.kwargs.items():
-            if layer_config.get(attr) != value:
-                return False
-
-        for c in self.conditions:
-            if not c.match(layer_config):
-                return False
-
-        return True
+    #
+    # def match(self,
+    #           node: BaseNode) -> bool:
+    #     """
+    #     Check if a node matches the layer, conditions and keyword-arguments of
+    #     the LayerFilterParams.
+    #
+    #     Args:
+    #         node: Node to check if matches to the LayerFilterParams properties.
+    #
+    #     Returns:
+    #         Whether the node matches to the LayerFilterParams properties.
+    #     """
+    #     # Check the node has the same type as the layer in LayerFilterParams
+    #     if self.layer != node.type:
+    #         return False
+    #
+    #     # Get attributes from node to filter
+    #     layer_config = node.framework_attr
+    #     if hasattr(node, "op_call_kwargs"):
+    #         layer_config.update(node.op_call_kwargs)
+    #
+    #     for attr, value in self.kwargs.items():
+    #         if layer_config.get(attr) != value:
+    #             return False
+    #
+    #     for c in self.conditions:
+    #         if not c.match(layer_config):
+    #             return False
+    #
+    #     return True

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/targetplatform2framework/operations_to_layers.py

@@ -15,10 +15,10 @@
 
 from typing import List, Any
 
-from model_compression_toolkit.core.common.logger import Logger
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.current_tpc import  _current_tpc
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.target_platform_capabilities_component import TargetPlatformCapabilitiesComponent
-from model_compression_toolkit.core.common.target_platform.operators import OperatorsSet, OperatorSetConcat, \
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.current_tpc import  _current_tpc
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.target_platform_capabilities_component import TargetPlatformCapabilitiesComponent
+from model_compression_toolkit.target_platform_capabilities.target_platform.operators import OperatorSetConcat, \
     OperatorsSetBase
 
 

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/targetplatform2framework/target_platform_capabilities.py

@@ -18,18 +18,17 @@ import itertools
 import pprint
 from typing import List, Any, Dict, Tuple
 
-from model_compression_toolkit.core.common.logger import Logger
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.operations_to_layers import \
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.operations_to_layers import \
     OperationsToLayers, OperationsSetToLayers
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.target_platform_capabilities_component import TargetPlatformCapabilitiesComponent
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.layer_filter_params import LayerFilterParams
-from model_compression_toolkit.core.common.immutable import ImmutableClass
-from model_compression_toolkit.core.common.graph.base_node import BaseNode
-from model_compression_toolkit.core.common.target_platform.op_quantization_config import QuantizationConfigOptions, \
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.target_platform_capabilities_component import TargetPlatformCapabilitiesComponent
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.layer_filter_params import LayerFilterParams
+from model_compression_toolkit.target_platform_capabilities.immutable import ImmutableClass
+from model_compression_toolkit.target_platform_capabilities.target_platform.op_quantization_config import QuantizationConfigOptions, \
     OpQuantizationConfig
-from model_compression_toolkit.core.common.target_platform.operators import OperatorsSet, OperatorsSetBase
-from model_compression_toolkit.core.common.target_platform.target_platform_model import TargetPlatformModel
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.current_tpc import _current_tpc
+from model_compression_toolkit.target_platform_capabilities.target_platform.operators import OperatorsSetBase
+from model_compression_toolkit.target_platform_capabilities.target_platform.target_platform_model import TargetPlatformModel
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.current_tpc import _current_tpc
 
 
 class TargetPlatformCapabilities(ImmutableClass):
@@ -163,26 +162,6 @@ class TargetPlatformCapabilities(ImmutableClass):
         """
         return self.tp_model.get_default_op_quantization_config()
 
-    def get_qco_by_node(self,
-                        node: BaseNode) -> QuantizationConfigOptions:
-        """
-        Get the QuantizationConfigOptions of a node in a graph according
-        to the mappings from layers/LayerFilterParams to the OperatorsSet in the TargetPlatformModel.
-
-        Args:
-            node: Node from graph to get its QuantizationConfigOptions.
-
-        Returns:
-            QuantizationConfigOptions of the node.
-        """
-        if node is None:
-            Logger.error(f'Can not retrieve QC options for None node')  # pragma: no cover
-        for fl, qco in self.filterlayer2qco.items():
-            if fl.match(node):
-                return qco
-        if node.type in self.layer2qco:
-            return self.layer2qco.get(node.type)
-        return self.tp_model.default_qco
 
     def _get_config_options_mapping(self) -> Tuple[Dict[Any, QuantizationConfigOptions],
                                                    Dict[LayerFilterParams, QuantizationConfigOptions]]:

model_compression_toolkit/{core/common → target_platform_capabilities}/target_platform/targetplatform2framework/target_platform_capabilities_component.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-from model_compression_toolkit.core.common.target_platform.targetplatform2framework.current_tpc import  _current_tpc
+from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework.current_tpc import  _current_tpc
 
 
 class TargetPlatformCapabilitiesComponent: