mct-nightly 1.11.0.20240214.post405__py3-none-any.whl → 1.11.0.20240215.post404__py3-none-any.whl

{mct_nightly-1.11.0.20240214.post405.dist-info → mct_nightly-1.11.0.20240215.post404.dist-info}/METADATA

@@ -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.dist-info → mct_nightly-1.11.0.20240215.post404.dist-info}/RECORD

@@ -1,5 +1,5 @@
 model_compression_toolkit/__init__.py,sha256=WXRBerevhP4sQ4NIHd-tcHcMEan7Qx_Wz1sTtF-HuQc,3697
-model_compression_toolkit/constants.py,sha256=5aystyH4YQv3J9X3Xx3eQvnfFBpo1NDju8jwfqH4z2A,4131
+model_compression_toolkit/constants.py,sha256=_OW_bUeQmf08Bb4oVZ0KfUt-rcCeNOmdBv3aP7NF5fM,3631
 model_compression_toolkit/defaultdict.py,sha256=LSc-sbZYXENMCw3U9F4GiXuv67IKpdn0Qm7Fr11jy-4,2277
 model_compression_toolkit/logger.py,sha256=b9DVktZ-LymFcRxv2aL_sdiE6S2sSrFGWltx6dgEuUY,4863
 model_compression_toolkit/core/__init__.py,sha256=pRP8FZ_46vpd6MVrcec5O5wnoByQqRzq_tMzaDRiMmM,1934
@@ -99,7 +99,7 @@ model_compression_toolkit/core/common/pruning/mask/__init__.py,sha256=huHoBUcKNB
 model_compression_toolkit/core/common/pruning/mask/per_channel_mask.py,sha256=hkm8xU4o9LvFeCc_KRg7PGYd_eQa6Kbjx-rGHvgajnA,5054
 model_compression_toolkit/core/common/pruning/mask/per_simd_group_mask.py,sha256=gmzD32xsfJH8vkkqaspS7vYa6VWayk1GJe-NfoAEugQ,5901
 model_compression_toolkit/core/common/quantization/__init__.py,sha256=sw7LOPN1bM82o3SkMaklyH0jw-TLGK0-fl2Wq73rffI,697
-model_compression_toolkit/core/common/quantization/candidate_node_quantization_config.py,sha256=2iu35iI5gnWLHBKSaLVsPQWr1ssly6Z-gbaNCauvcQM,3223
+model_compression_toolkit/core/common/quantization/candidate_node_quantization_config.py,sha256=VW0vGCPKMxbhl2cB_zHx3g9c7cNS4ctVEAvnaNq17jw,5153
 model_compression_toolkit/core/common/quantization/core_config.py,sha256=8DRM4Ar4Er-bllo56LG-Lcx9U2Ebd3jJctf4t2hOcXc,2021
 model_compression_toolkit/core/common/quantization/debug_config.py,sha256=HtkMmneN-EmAzgZK4Vp4M8Sqm5QKdrvNyyZMpaVqYzY,1482
 model_compression_toolkit/core/common/quantization/filter_nodes_candidates.py,sha256=4GCr4Z6pRMbxIAnq4s7YtdMSqwbRwUzTzCFfs2ahVfk,6137
@@ -110,7 +110,7 @@ model_compression_toolkit/core/common/quantization/quantization_fn_selection.py,
 model_compression_toolkit/core/common/quantization/quantization_params_fn_selection.py,sha256=sEPDeClFxh0uHEGznX7E3bSOJ_t0kUvyWcdxcyZJdwA,4090
 model_compression_toolkit/core/common/quantization/quantize_graph_weights.py,sha256=_OQEFAdYDTHu2Qp-qs02Z1CDxugUKG6k5eCePS1WpXY,2939
 model_compression_toolkit/core/common/quantization/quantize_node.py,sha256=UK_YshvZI0-LrKeT9gFGYcMA7pma1kaR5JAfzJH3HNw,3614
-model_compression_toolkit/core/common/quantization/set_node_quantization_config.py,sha256=3Z5XiR6bESBrPPkvq9JetndiJ-R7hwXNQgMtxo_P2mc,12302
+model_compression_toolkit/core/common/quantization/set_node_quantization_config.py,sha256=qkrWJXLyDSIJhvT8tO9Nh51f4abyVR8zMFuaaMRRrRw,12304
 model_compression_toolkit/core/common/quantization/quantization_params_generation/__init__.py,sha256=_U4IFPuzGyyAymjDjsPl2NF6UbFggqBaiA1Td3sug3I,1608
 model_compression_toolkit/core/common/quantization/quantization_params_generation/error_functions.py,sha256=rwCedE0zggamSBY50rqh-xqZpIMrn8o96YH_jMCuPrk,16505
 model_compression_toolkit/core/common/quantization/quantization_params_generation/kmeans_params.py,sha256=qDfJbvY64KLOG6n18ddEPTFGrKHlaXzZ136TrVpgH9s,2917
@@ -475,8 +475,8 @@ model_compression_toolkit/trainable_infrastructure/keras/quantize_wrapper.py,sha
 model_compression_toolkit/trainable_infrastructure/keras/quantizer_utils.py,sha256=MVwXNymmFRB2NXIBx4e2mdJ1RfoHxRPYRgjb1MQP5kY,1797
 model_compression_toolkit/trainable_infrastructure/pytorch/__init__.py,sha256=huHoBUcKNB6BnY6YaUCcFvdyBtBI172ZoUD8ZYeNc6o,696
 model_compression_toolkit/trainable_infrastructure/pytorch/base_pytorch_quantizer.py,sha256=SbvRlIdE32PEBsINt1bhSqvrKL_zbM9V-aeSkOn-sw4,3083
-mct_nightly-1.11.0.20240214.post405.dist-info/LICENSE.md,sha256=aYSSIb-5AFPeITTvXm1UAoe0uYBiMmSS8flvXaaFUks,10174
-mct_nightly-1.11.0.20240214.post405.dist-info/METADATA,sha256=TXs2_xJNIcftwxAehbXIhw2lWurHXIynJmjlxohQJqU,17187
-mct_nightly-1.11.0.20240214.post405.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-mct_nightly-1.11.0.20240214.post405.dist-info/top_level.txt,sha256=gsYA8juk0Z-ZmQRKULkb3JLGdOdz8jW_cMRjisn9ga4,26
-mct_nightly-1.11.0.20240214.post405.dist-info/RECORD,,
+mct_nightly-1.11.0.20240215.post404.dist-info/LICENSE.md,sha256=aYSSIb-5AFPeITTvXm1UAoe0uYBiMmSS8flvXaaFUks,10174
+mct_nightly-1.11.0.20240215.post404.dist-info/METADATA,sha256=4EU04O01WY1IopkRRWpPxNvWs6FTE-1etC_M8XzDLaM,17187
+mct_nightly-1.11.0.20240215.post404.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mct_nightly-1.11.0.20240215.post404.dist-info/top_level.txt,sha256=gsYA8juk0Z-ZmQRKULkb3JLGdOdz8jW_cMRjisn9ga4,26
+mct_nightly-1.11.0.20240215.post404.dist-info/RECORD,,

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'

model_compression_toolkit/core/common/quantization/candidate_node_quantization_config.py

@@ -12,12 +12,14 @@
 # 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 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.constants import KERNEL_ATTR
+from model_compression_toolkit.target_platform_capabilities.target_platform import OpQuantizationConfig, \
+    AttributeQuantizationConfig
+from model_compression_toolkit.logger import Logger
 
 
 ##########################################
@@ -31,22 +33,55 @@ 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)
+    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:
-            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 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:
-            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))
+            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))

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)