mct-nightly 2.2.0.20241201.617__tar.gz → 2.2.0.20241202.131715__tar.gz

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 2.2.0.20241201.617
+Version: 2.2.0.20241202.131715
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/mct_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 2.2.0.20241201.617
+Version: 2.2.0.20241202.131715
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/mct_nightly.egg-info/SOURCES.txt

@@ -439,13 +439,13 @@ model_compression_toolkit/qat/pytorch/quantizer/ste_rounding/uniform_ste.py
 model_compression_toolkit/target_platform_capabilities/__init__.py
 model_compression_toolkit/target_platform_capabilities/constants.py
 model_compression_toolkit/target_platform_capabilities/immutable.py
+model_compression_toolkit/target_platform_capabilities/schema/__init__.py
+model_compression_toolkit/target_platform_capabilities/schema/mct_current_schema.py
+model_compression_toolkit/target_platform_capabilities/schema/schema_functions.py
+model_compression_toolkit/target_platform_capabilities/schema/v1.py
 model_compression_toolkit/target_platform_capabilities/target_platform/__init__.py
 model_compression_toolkit/target_platform_capabilities/target_platform/current_tp_model.py
-model_compression_toolkit/target_platform_capabilities/target_platform/fusing.py
-model_compression_toolkit/target_platform_capabilities/target_platform/op_quantization_config.py
-model_compression_toolkit/target_platform_capabilities/target_platform/operators.py
 model_compression_toolkit/target_platform_capabilities/target_platform/target_platform_model.py
-model_compression_toolkit/target_platform_capabilities/target_platform/target_platform_model_component.py
 model_compression_toolkit/target_platform_capabilities/target_platform/targetplatform2framework/__init__.py
 model_compression_toolkit/target_platform_capabilities/target_platform/targetplatform2framework/attribute_filter.py
 model_compression_toolkit/target_platform_capabilities/target_platform/targetplatform2framework/current_tpc.py

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/__init__.py

@@ -27,4 +27,4 @@ from model_compression_toolkit import data_generation
 from model_compression_toolkit import pruning
 from model_compression_toolkit.trainable_infrastructure.keras.load_model import keras_load_quantized_model
 
-__version__ = "2.2.0.20241201.000617"
+__version__ = "2.2.0.20241202.131715"

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/constants.py

@@ -18,9 +18,6 @@
 TENSORFLOW = 'tensorflow'
 PYTORCH = 'pytorch'
 
-# Metadata fields
-MCT_VERSION = 'mct_version'
-TPC_VERSION = 'tpc_version'
 
 WEIGHTS_SIGNED = True
 # Minimal threshold to use for quantization ranges:

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/graph/base_node.py

@@ -22,8 +22,9 @@ from model_compression_toolkit.constants import WEIGHTS_NBITS_ATTRIBUTE, CORRECT
     ACTIVATION_N_BITS_ATTRIBUTE, FP32_BYTES_PER_PARAMETER
 from model_compression_toolkit.core.common.quantization.node_quantization_config import WeightsAttrQuantizationConfig
 from model_compression_toolkit.logger import Logger
-from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationConfigOptions, \
-    TargetPlatformCapabilities, LayerFilterParams, OpQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import QuantizationConfigOptions, \
+    OpQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.target_platform import TargetPlatformCapabilities, LayerFilterParams
 
 
 class BaseNode:
@@ -556,9 +557,10 @@ class BaseNode:
         # Extract qco with is_match_type to overcome mismatch of function types in TF 2.15
         matching_qcos = [_qco for _type, _qco in tpc.layer2qco.items() if self.is_match_type(_type)]
         if matching_qcos:
-            if len(matching_qcos) > 1:
-                Logger.error('Found duplicate qco types!')
-            return matching_qcos[0]
+            if all([_qco == matching_qcos[0] for _qco in matching_qcos]):
+                return matching_qcos[0]
+            else:
+                Logger.critical(f"Found duplicate qco types for node '{self.name}' of type '{self.type}'!")  # pragma: no cover
         return tpc.tp_model.default_qco
 
     def filter_node_qco_by_graph(self, tpc: TargetPlatformCapabilities,

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/graph/functional_node.py

@@ -85,5 +85,5 @@ class FunctionalNode(BaseNode):
             Whether _type matches the self node type
 
         """
-        names_match = _type.__name__ == self.type.__name__ if FOUND_TF else False
+        names_match = _type.__name__ == self.type.__name__
         return super().is_match_type(_type) or names_match

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/mixed_precision/resource_utilization_tools/resource_utilization_data.py

@@ -23,8 +23,8 @@ from model_compression_toolkit.core.common import Graph
 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.graph_prep_runner import graph_preparation_runner
-from model_compression_toolkit.target_platform_capabilities.target_platform import TargetPlatformCapabilities, \
-    QuantizationConfigOptions
+from model_compression_toolkit.target_platform_capabilities.target_platform import TargetPlatformCapabilities
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import QuantizationConfigOptions
 
 
 def compute_resource_utilization_data(in_model: Any,

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/quantization/candidate_node_quantization_config.py

@@ -17,8 +17,8 @@ from typing import Callable, List, Tuple
 from model_compression_toolkit.core import QuantizationConfig
 from model_compression_toolkit.core.common.quantization.node_quantization_config import BaseNodeQuantizationConfig, \
     NodeWeightsQuantizationConfig, NodeActivationQuantizationConfig
-from model_compression_toolkit.target_platform_capabilities.target_platform import OpQuantizationConfig, \
-    AttributeQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import AttributeQuantizationConfig, \
+    OpQuantizationConfig
 from model_compression_toolkit.logger import Logger
 
 

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/quantization/node_quantization_config.py

@@ -25,8 +25,8 @@ from model_compression_toolkit.core.common.quantization.quantization_params_fn_s
 
 from model_compression_toolkit.core.common.quantization.quantization_config import QuantizationConfig, \
     QuantizationErrorMethod
-from model_compression_toolkit.target_platform_capabilities.target_platform import OpQuantizationConfig, \
-    AttributeQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import AttributeQuantizationConfig, \
+    OpQuantizationConfig
 
 
 ##########################################

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/quantization/quantization_params_generation/qparams_activations_computation.py

@@ -15,7 +15,8 @@
 import numpy as np
 from typing import Dict, Union
 
-from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod, Signedness
+from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import Signedness
 from model_compression_toolkit.core.common.collectors.statistics_collector import BaseStatsCollector
 from model_compression_toolkit.core.common.quantization import quantization_params_generation
 from model_compression_toolkit.core.common.node_prior_info import NodePriorInfo

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/quantization/set_node_quantization_config.py

@@ -33,7 +33,7 @@ from model_compression_toolkit.core.common.quantization.quantization_params_fn_s
 from model_compression_toolkit.core.common.quantization.quantization_fn_selection import \
     get_weights_quantization_fn
 from model_compression_toolkit.target_platform_capabilities.target_platform.targetplatform2framework import TargetPlatformCapabilities
-from model_compression_toolkit.target_platform_capabilities.target_platform.op_quantization_config import OpQuantizationConfig, \
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import OpQuantizationConfig, \
     QuantizationConfigOptions
 
 

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/statistics_correction/apply_activation_bias_correction_to_graph.py

@@ -17,7 +17,7 @@ from model_compression_toolkit.core import CoreConfig, 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.quantization.node_quantization_config import WeightsAttrQuantizationConfig
-from model_compression_toolkit.target_platform_capabilities.target_platform import AttributeQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import AttributeQuantizationConfig
 
 
 def apply_activation_bias_correction_to_graph(graph: Graph,

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/statistics_correction/apply_bias_correction_to_graph.py

@@ -19,7 +19,7 @@ from model_compression_toolkit.core import CoreConfig
 from model_compression_toolkit.core.common import Graph, BaseNode
 from model_compression_toolkit.core.common.framework_implementation import FrameworkImplementation
 from model_compression_toolkit.core.common.quantization.node_quantization_config import WeightsAttrQuantizationConfig
-from model_compression_toolkit.target_platform_capabilities.target_platform import AttributeQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import AttributeQuantizationConfig
 
 
 def apply_bias_correction_to_graph(graph_to_apply_bias_correction: Graph,

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/substitutions/batchnorm_reconstruction.py

@@ -26,8 +26,8 @@ from model_compression_toolkit.logger import Logger
 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.graph.graph_matchers import NodeOperationMatcher
-from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod, \
-    AttributeQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import AttributeQuantizationConfig
 
 
 class BatchNormalizationReconstruction(common.BaseSubstitution):

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/common/substitutions/shift_negative_activation.py

@@ -22,8 +22,8 @@ from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.core.common import FrameworkInfo, Graph, BaseNode
 from model_compression_toolkit.constants import THRESHOLD, SIGNED, SHIFT_NEGATIVE_NON_LINEAR_NUM_BITS
 from model_compression_toolkit.core.common.graph.graph_matchers import NodeOperationMatcher
-from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod, \
-    AttributeQuantizationConfig
+from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
+from model_compression_toolkit.target_platform_capabilities.schema.mct_current_schema import AttributeQuantizationConfig
 from model_compression_toolkit.core.common.quantization.set_node_quantization_config import create_node_activation_qc, \
     set_quantization_configs_to_node
 from model_compression_toolkit.core.common.quantization.core_config import CoreConfig

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/core/keras/back2framework/keras_model_builder.py

@@ -302,7 +302,11 @@ class KerasModelBuilder(BaseModelBuilder):
             # Build a functional node using its args
             if isinstance(n, FunctionalNode):
                 if n.inputs_as_list:  # If the first argument should be a list of tensors:
-                    out_tensors_of_n_float = op_func(input_tensors, *n.op_call_args, **op_call_kwargs)
+                    if isinstance(op_func, KerasQuantizationWrapper):
+                        # in wrapped nodes, the op args & kwargs are already in the KerasQuantizationWrapper.
+                        out_tensors_of_n_float = op_func(input_tensors)
+                    else:
+                        out_tensors_of_n_float = op_func(input_tensors, *n.op_call_args, **op_call_kwargs)
                 else:  # If the input tensors should not be a list but iterated:
                     out_tensors_of_n_float = op_func(*input_tensors, *n.op_call_args, **op_call_kwargs)
             else:

{mct-nightly-2.2.0.20241201.617 → mct-nightly-2.2.0.20241202.131715}/model_compression_toolkit/metadata.py

@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
+from dataclasses import dataclass, asdict
 
 from typing import Dict, Any
-from model_compression_toolkit.constants import MCT_VERSION, TPC_VERSION, OPERATORS_SCHEDULING, FUSED_NODES_MAPPING, \
-    CUTS, MAX_CUT, OP_ORDER, OP_RECORD, SHAPE, NODE_OUTPUT_INDEX, NODE_NAME, TOTAL_SIZE, MEM_ELEMENTS
+from model_compression_toolkit.constants import OPERATORS_SCHEDULING, FUSED_NODES_MAPPING, CUTS, MAX_CUT, OP_ORDER, \
+    OP_RECORD, SHAPE, NODE_OUTPUT_INDEX, NODE_NAME, TOTAL_SIZE, MEM_ELEMENTS
 from model_compression_toolkit.core.common.graph.memory_graph.compute_graph_max_cut import SchedulerInfo
 from model_compression_toolkit.target_platform_capabilities.target_platform import TargetPlatformCapabilities
 
@@ -43,13 +44,21 @@ def create_model_metadata(tpc: TargetPlatformCapabilities,
 def get_versions_dict(tpc) -> Dict:
     """
 
-    Returns: A dictionary with TPC and MCT versions.
+    Returns: A dictionary with TPC, MCT and TPC-Schema versions.
 
     """
     # imported inside to avoid circular import error
     from model_compression_toolkit import __version__ as mct_version
-    tpc_version = f'{tpc.name}.{tpc.version}'
-    return {MCT_VERSION: mct_version, TPC_VERSION: tpc_version}
+
+    @dataclass
+    class TPCVersions:
+        mct_version: str
+        tpc_minor_version: str = f'{tpc.tp_model.tpc_minor_version}'
+        tpc_patch_version: str = f'{tpc.tp_model.tpc_patch_version}'
+        tpc_platform_type: str = f'{tpc.tp_model.tpc_platform_type}'
+        tpc_schema: str = f'{tpc.tp_model.SCHEMA_VERSION}'
+
+    return asdict(TPCVersions(mct_version))
 
 
 def get_scheduler_metadata(scheduler_info: SchedulerInfo) -> Dict[str, Any]:

mct-nightly-2.2.0.20241202.131715/model_compression_toolkit/target_platform_capabilities/schema/__init__.py

@@ -0,0 +1,14 @@
+# Copyright 2024 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.
+# ==============================================================================

mct-nightly-2.2.0.20241202.131715/model_compression_toolkit/target_platform_capabilities/schema/mct_current_schema.py

@@ -0,0 +1,11 @@
+import model_compression_toolkit.target_platform_capabilities.schema.v1 as schema
+
+Signedness = schema.Signedness
+AttributeQuantizationConfig = schema.AttributeQuantizationConfig
+OpQuantizationConfig = schema.OpQuantizationConfig
+QuantizationConfigOptions = schema.QuantizationConfigOptions
+OperatorsSetBase = schema.OperatorsSetBase
+OperatorsSet = schema.OperatorsSet
+OperatorSetConcat= schema.OperatorSetConcat
+Fusing = schema.Fusing
+TargetPlatformModel = schema.TargetPlatformModel

mct-nightly-2.2.0.20241202.131715/model_compression_toolkit/target_platform_capabilities/schema/schema_functions.py

@@ -0,0 +1,37 @@
+# Copyright 2024 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.
+# ==============================================================================
+import copy
+from typing import Any, Dict
+
+
+def clone_and_edit_object_params(obj: Any, **kwargs: Dict) -> Any:
+    """
+    Clones the given object and edit some of its parameters.
+
+    Args:
+        obj: An object to clone.
+        **kwargs: Keyword arguments to edit in the cloned object.
+
+    Returns:
+        Edited copy of the given object.
+    """
+
+    obj_copy = copy.deepcopy(obj)
+    for k, v in kwargs.items():
+        assert hasattr(obj_copy,
+                       k), f'Edit parameter is possible only for existing parameters in the given object, ' \
+                           f'but {k} is not a parameter of {obj_copy}.'
+        setattr(obj_copy, k, v)
+    return obj_copy