mct-nightly 1.11.0.20240214.post405__tar.gz → 1.11.0.20240215.post404__tar.gz

{mct-nightly-1.11.0.20240214.post405 → mct-nightly-1.11.0.20240215.post404}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 1.11.0.20240214.post405
+Version: 1.11.0.20240215.post404
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN

{mct-nightly-1.11.0.20240214.post405 → mct-nightly-1.11.0.20240215.post404}/mct_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 1.11.0.20240214.post405
+Version: 1.11.0.20240215.post404
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN

{mct-nightly-1.11.0.20240214.post405 → mct-nightly-1.11.0.20240215.post404}/model_compression_toolkit/constants.py

@@ -104,18 +104,6 @@ VIRTUAL_WEIGHTS_SUFFIX = '_v_weights'
 VIRTUAL_ACTIVATION_SUFFIX = '_v_activation'
 VIRTUAL_ACTIVATION_WEIGHTS_NODE_PREFIX = 'virtual'
 
-# Quantization config candidate initialization
-ACTIVATION_QUANTIZATION_CFG = 'activation_quantization_cfg'
-WEIGHTS_QUANTIZATION_CFG = 'weights_quantization_cfg'
-QC = 'qc'
-OP_CFG = 'op_cfg'
-ACTIVATION_QUANTIZATION_FN = 'activation_quantization_fn'
-WEIGHTS_QUANTIZATION_FN = 'weights_quantization_fn'
-ACTIVATION_QUANT_PARAMS_FN = 'activation_quantization_params_fn'
-WEIGHTS_QUANT_PARAMS_FN = 'weights_quantization_params_fn'
-WEIGHTS_CHANNELS_AXIS = 'weights_channels_axis'
-WEIGHTS_CFG = 'weights_cfg'
-
 # Memory graph constants
 DUMMY_NODE = 'dummy_node'
 DUMMY_TENSOR = 'dummy_tensor'

mct-nightly-1.11.0.20240215.post404/model_compression_toolkit/core/common/quantization/candidate_node_quantization_config.py

@@ -0,0 +1,87 @@
+# Copyright 2022 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 typing import Callable
+
+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.logger import Logger
+
+
+##########################################
+# Every node holds a quantization configuration
+# for its weights quantization, and a different quantization
+# configuration for its activation quantization configuration.
+##########################################
+
+class CandidateNodeQuantizationConfig(BaseNodeQuantizationConfig):
+    """
+    Class for representing candidate node configuration, which includes weights and activation configuration combined.
+    """
+
+    def __init__(self,
+                 qc: QuantizationConfig = None,
+                 op_cfg: OpQuantizationConfig = None,
+                 activation_quantization_cfg: NodeActivationQuantizationConfig = None,
+                 activation_quantization_fn: Callable = None,
+                 activation_quantization_params_fn: Callable = None,
+                 weights_quantization_cfg: NodeWeightsQuantizationConfig = None,
+                 weights_quantization_fn: Callable = None,
+                 weights_quantization_params_fn: Callable = None,
+                 weights_channels_axis: int = None,
+                 weights_cfg: AttributeQuantizationConfig = None):
+        """
+
+        Args:
+            qc: QuantizationConfig to create the node's config from.
+            op_cfg: OpQuantizationConfig of the node with quantizers types to use when creating node quantization configuration.
+            activation_quantization_cfg: An option to pass a NodeActivationQuantizationConfig to create a new config from.
+            activation_quantization_fn: Function to use when quantizing the node's activations.
+            activation_quantization_params_fn: Function to use when computing the threshold for quantizing a node's activations.
+            weights_quantization_cfg: An option to pass a NodeWeightsQuantizationConfig to create a new config from.
+            weights_quantization_fn: Function to use when quantizing the node's weights.
+            weights_quantization_params_fn:  Function to use when computing the threshold for quantizing a node's weights.
+            weights_channels_axis: Axis to quantize a node's kernel when quantizing per-channel.
+            weights_cfg: Weights attribute quantization config.
+        """
+
+        if activation_quantization_cfg is not None:
+            self.activation_quantization_cfg = activation_quantization_cfg
+        else:
+            if any(v is None for v in (qc, op_cfg, activation_quantization_fn, activation_quantization_params_fn)):
+                Logger.error("Missing some required arguments to initialize "
+                             "a node activation quantization configuration.")
+            self.activation_quantization_cfg = (
+                NodeActivationQuantizationConfig(qc=qc,
+                                                 op_cfg=op_cfg,
+                                                 activation_quantization_fn=activation_quantization_fn,
+                                                 activation_quantization_params_fn=activation_quantization_params_fn))
+
+        if weights_quantization_cfg is not None:
+            self.weights_quantization_cfg = weights_quantization_cfg
+        else:
+            if any(v is None for v in (qc, op_cfg, weights_quantization_fn, weights_quantization_params_fn,
+                                       weights_cfg)):
+                Logger.error("Missing some required arguments to initialize "
+                             "a node weights quantization configuration.")
+            self.weights_quantization_cfg = (
+                NodeWeightsQuantizationConfig(qc=qc,
+                                              op_cfg=op_cfg,
+                                              weights_quantization_fn=weights_quantization_fn,
+                                              weights_quantization_params_fn=weights_quantization_params_fn,
+                                              weights_channels_axis=weights_channels_axis,
+                                              weights_cfg=weights_cfg))

{mct-nightly-1.11.0.20240214.post405 → mct-nightly-1.11.0.20240215.post404}/model_compression_toolkit/core/common/quantization/set_node_quantization_config.py

@@ -169,7 +169,7 @@ def _create_node_single_candidate_qc(qc: QuantizationConfig,
                                            activation_quantization_params_fn=activation_quantization_params_fn,
                                            weights_quantization_fn=weights_quantization_fn,
                                            weights_quantization_params_fn=weights_quantization_params_fn,
-                                           weight_channel_axis=weight_channel_axis,
+                                           weights_channels_axis=weight_channel_axis,
                                            weights_cfg=weights_cfg)
 
 

{mct-nightly-1.11.0.20240214.post405 → mct-nightly-1.11.0.20240215.post404}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 description-file = README.md
-version = 1.11.0.20240214-000405
+version = 1.11.0.20240215-000404
 
 [egg_info]
 tag_build = 

mct-nightly-1.11.0.20240214.post405/model_compression_toolkit/core/common/quantization/candidate_node_quantization_config.py

@@ -1,52 +0,0 @@
-# Copyright 2022 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 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, WEIGHTS_CFG
-from model_compression_toolkit.core.common.quantization.node_quantization_config import BaseNodeQuantizationConfig, \
-    NodeWeightsQuantizationConfig, NodeActivationQuantizationConfig
-from model_compression_toolkit.target_platform_capabilities.constants import KERNEL_ATTR
-
-
-##########################################
-# Every node holds a quantization configuration
-# for its weights quantization, and a different quantization
-# configuration for its activation quantization configuration.
-##########################################
-
-class CandidateNodeQuantizationConfig(BaseNodeQuantizationConfig):
-    """
-    Class for representing candidate node configuration, which includes weights and activation configuration combined.
-    """
-
-    def __init__(self, **kwargs):
-        activation_quantization_cfg = kwargs.get(ACTIVATION_QUANTIZATION_CFG, None)
-        if activation_quantization_cfg is not None:
-            self.activation_quantization_cfg = activation_quantization_cfg
-        else:
-            self.activation_quantization_cfg = NodeActivationQuantizationConfig(kwargs.get(QC),
-                                                                                kwargs.get(OP_CFG),
-                                                                                kwargs.get(ACTIVATION_QUANTIZATION_FN),
-                                                                                kwargs.get(ACTIVATION_QUANT_PARAMS_FN))
-        weights_quantization_cfg = kwargs.get(WEIGHTS_QUANTIZATION_CFG, None)
-        if weights_quantization_cfg is not None:
-            self.weights_quantization_cfg = weights_quantization_cfg
-        else:
-            self.weights_quantization_cfg = NodeWeightsQuantizationConfig(kwargs.get(QC),
-                                                                          kwargs.get(OP_CFG),
-                                                                          kwargs.get(WEIGHTS_QUANTIZATION_FN),
-                                                                          kwargs.get(WEIGHTS_QUANT_PARAMS_FN),
-                                                                          kwargs.get(WEIGHTS_CHANNELS_AXIS),
-                                                                          kwargs.get(WEIGHTS_CFG))