mct-nightly 1.9.0.20230814.post352__tar.gz → 1.9.0.20230816.post359__tar.gz

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 1.9.0.20230814.post352
+Version: 1.9.0.20230816.post359
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN
@@ -70,9 +70,9 @@ Description: # Model Compression Toolkit (MCT)
         
         | TensorFlow Version                                                                                   | PyTorch Version                                                                                          |
         |------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
-        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf212.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_13.yml/badge.svg) |
-        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf211.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_12.yml/badge.svg) |
-        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf210.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_11.yml/badge.svg) |
+        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf213.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_13.yml/badge.svg) |
+        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf212.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_12.yml/badge.svg) |
+        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf211.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_11.yml/badge.svg) |
         
         
         ## Supported Features

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/README.md

@@ -64,9 +64,9 @@ MCT supports compressing models built with the TensorFlow or PyTorch frameworks,
 
 | TensorFlow Version                                                                                   | PyTorch Version                                                                                          |
 |------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
-| ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf212.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_13.yml/badge.svg) |
-| ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf211.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_12.yml/badge.svg) |
-| ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf210.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_11.yml/badge.svg) |
+| ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf213.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_13.yml/badge.svg) |
+| ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf212.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_12.yml/badge.svg) |
+| ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf211.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_11.yml/badge.svg) |
 
 
 ## Supported Features

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/mct_nightly.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 1.9.0.20230814.post352
+Version: 1.9.0.20230816.post359
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN
@@ -70,9 +70,9 @@ Description: # Model Compression Toolkit (MCT)
         
         | TensorFlow Version                                                                                   | PyTorch Version                                                                                          |
         |------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------|
-        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf212.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_13.yml/badge.svg) |
-        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf211.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_12.yml/badge.svg) |
-        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf210.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_11.yml/badge.svg) |
+        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf213.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_13.yml/badge.svg) |
+        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf212.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_12.yml/badge.svg) |
+        | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_tf211.yml/badge.svg) | ![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_torch1_11.yml/badge.svg) |
         
         
         ## Supported Features

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/back2framework/keras_model_builder.py

@@ -20,12 +20,10 @@ from packaging import version
 from model_compression_toolkit.core.common.back2framework.base_model_builder import BaseModelBuilder
 from model_compression_toolkit.core.common.user_info import UserInformation
 
-# As from Tensorflow 2.6, keras is a separate package and some classes should be imported differently.
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Input
-    from tensorflow.python.keras.layers.core import TFOpLambda
-    from tensorflow.python.keras.engine.base_layer import TensorFlowOpLayer
-    from tensorflow.python.keras.layers import Layer
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras import Input
+    from keras.src.layers.core import TFOpLambda
+    from keras.src.engine.base_layer import TensorFlowOpLayer, Layer
 else:
     from keras import Input
     from keras.layers.core import TFOpLambda

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/back2framework/mixed_precision_model_builder.py

@@ -14,7 +14,13 @@
 # ==============================================================================
 from typing import Tuple, Any, Dict, Union, List
 
-from keras.engine.base_layer import Layer
+from packaging import version
+import tensorflow as tf
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.engine.base_layer import Layer
+else:
+    from keras.engine.base_layer import Layer
+
 from keras.models import Model
 from mct_quantizers import KerasQuantizationWrapper, KerasActivationQuantizationHolder, QuantizationTarget
 from mct_quantizers.common.get_quantizers import get_inferable_quantizer_class

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/back2framework/model_gradients.py

@@ -19,10 +19,10 @@ from packaging import version
 # As from Tensorflow 2.6, keras is a separate package and some classes should be imported differently.
 from tqdm import tqdm
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.python.keras.layers import Layer  # pragma: no cover
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.engine.base_layer import Layer
 else:
-    from keras.engine.base_layer import Layer
+    from tensorflow.python.keras.engine.base_layer import Layer
 
 from typing import Any, Dict, List, Tuple
 from tensorflow.python.util.object_identity import Reference as TFReference

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/default_framework_info.py

@@ -19,8 +19,8 @@ import tensorflow as tf
 from model_compression_toolkit.core.keras.quantizer.lut_fake_quant import activation_lut_kmean_quantizer
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Conv2DTranspose, Softmax, ELU
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Conv2DTranspose, Softmax, ELU
 else:
     from keras.layers import Conv2D, DepthwiseConv2D, Dense, Conv2DTranspose, Softmax, ELU
 

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/graph_substitutions/substitutions/multi_head_attention_decomposition.py

@@ -16,9 +16,9 @@ import numpy as np
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.python.keras.layers.core import TFOpLambda
-    from tensorflow.keras.layers import MultiHeadAttention, Conv2D, Softmax, Concatenate, Reshape, Permute
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers.core import TFOpLambda
+    from keras.src.layers import MultiHeadAttention, Conv2D, Softmax, Concatenate, Reshape, Permute
 else:
     from keras.layers.core import TFOpLambda
     from keras.layers import MultiHeadAttention, Conv2D, Softmax, Concatenate, Reshape, Permute

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/graph_substitutions/substitutions/shift_negative_activation.py

@@ -16,11 +16,16 @@
 from typing import Tuple, Any
 
 import numpy as np
-import tensorflow as tf
 
+from packaging import version
+import tensorflow as tf
 from tensorflow.python.keras.layers.core import TFOpLambda
-from tensorflow.keras.layers import Activation, Conv2D, Dense, DepthwiseConv2D, ZeroPadding2D, Reshape, \
-    GlobalAveragePooling2D, Dropout, ReLU, PReLU, ELU
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Activation, Conv2D, Dense, DepthwiseConv2D, ZeroPadding2D, Reshape, \
+        GlobalAveragePooling2D, Dropout, ReLU, PReLU, ELU
+else:
+    from tensorflow.keras.layers import Activation, Conv2D, Dense, DepthwiseConv2D, ZeroPadding2D, Reshape, \
+        GlobalAveragePooling2D, Dropout, ReLU, PReLU, ELU
 
 from model_compression_toolkit.core import CoreConfig, FrameworkInfo
 from model_compression_toolkit.core.common import BaseNode, Graph

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/keras_implementation.py

@@ -41,9 +41,10 @@ from model_compression_toolkit.core.keras.statistics_correction.apply_second_mom
     keras_apply_second_moment_correction
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Dense, Activation, Conv2D, DepthwiseConv2D, Conv2DTranspose, Concatenate, Add
-    from tensorflow.python.keras.layers.core import TFOpLambda
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Dense, Activation, Conv2D, DepthwiseConv2D, Conv2DTranspose, \
+        Concatenate, Add
+    from keras.src.layers.core import TFOpLambda
 else:
     from keras.layers import Dense, Activation, Conv2D, DepthwiseConv2D, Conv2DTranspose, \
         Concatenate, Add

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/keras_node_prior_info.py

@@ -3,8 +3,8 @@ import numpy as np
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Activation, ReLU, BatchNormalization
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Activation, ReLU, BatchNormalization
 else:
     from keras.layers import Activation, ReLU, BatchNormalization
 

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/reader/common.py

@@ -17,12 +17,12 @@
 import tensorflow as tf
 from packaging import version
 
-# As from Tensorflow 2.6, keras is a separate package and some classes should be imported differently.
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.python.keras.engine.node import Node as KerasNode
-    from tensorflow.keras.layers import InputLayer
-    from tensorflow.python.keras.engine.functional import Functional
-    from tensorflow.python.keras.engine.sequential import Sequential
+
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.engine.input_layer import InputLayer
+    from keras.src.engine.node import Node as KerasNode
+    from keras.src.engine.functional import Functional
+    from keras.src.engine.sequential import Sequential
 else:
     from keras.engine.input_layer import InputLayer
     from keras.engine.node import Node as KerasNode

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/reader/connectivity_handler.py

@@ -17,9 +17,8 @@
 import tensorflow as tf
 from packaging import version
 
-# As from Tensorflow 2.6, keras is a separate package and some classes should be imported differently.
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.python.keras.engine.node import Node as KerasNode
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.engine.node import Node as KerasNode
 else:
     from keras.engine.node import Node as KerasNode
 

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/core/keras/reader/node_builder.py

@@ -20,10 +20,10 @@ from packaging import version
 from model_compression_toolkit.core.keras.custom_layer_validation import is_keras_custom_layer
 from model_compression_toolkit.logger import Logger
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.python.keras.layers.core import TFOpLambda, SlicingOpLambda
-    from tensorflow.python.keras.engine.keras_tensor import KerasTensor
-    from tensorflow.python.keras.engine.node import Node as KerasNode
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers.core import TFOpLambda, SlicingOpLambda
+    from keras.src.engine.keras_tensor import KerasTensor
+    from keras.src.engine.node import Node as KerasNode
 else:
     from keras.layers.core import TFOpLambda, SlicingOpLambda
     from keras.engine.keras_tensor import KerasTensor

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/exporter/model_exporter/keras/fakely_quant_keras_exporter.py

@@ -18,7 +18,11 @@ from typing import Dict, Callable
 
 import keras.models
 import tensorflow as tf
-from keras.engine.base_layer import Layer
+from packaging import version
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.engine.base_layer import Layer
+else:
+    from keras.engine.base_layer import Layer
 
 from mct_quantizers import KerasQuantizationWrapper
 from mct_quantizers.logger import Logger
@@ -27,8 +31,8 @@ layers = keras.layers
 
 from model_compression_toolkit.exporter.model_exporter.keras.base_keras_exporter import BaseKerasExporter
 
-from keras.engine import base_layer_utils
-from keras import backend
+from tensorflow.python.keras.engine import base_layer_utils
+from tensorflow.python.keras import backend
 
 
 class FakelyQuantKerasExporter(BaseKerasExporter):

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/exporter/model_wrapper/keras/validate_layer.py

@@ -19,8 +19,15 @@ from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.logger import Logger
 
 if FOUND_TF:
-    from keras.engine.base_layer import Layer
-    from keras.engine.input_layer import InputLayer
+    from packaging import version
+    import tensorflow as tf
+    if version.parse(tf.__version__) >= version.parse("2.13"):
+        from keras.src.engine.base_layer import Layer
+        from keras.src.engine.input_layer import InputLayer
+    else:
+        from keras.engine.base_layer import Layer
+        from keras.engine.input_layer import InputLayer
+
     from mct_quantizers import KerasQuantizationWrapper
 
     def is_keras_layer_exportable(layer: Any) -> bool:

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/exporter/model_wrapper/pytorch/builder/node_to_quantizer.py

@@ -51,15 +51,15 @@ def get_weights_inferable_quantizer_kwargs(node_qc: NodeWeightsQuantizationConfi
     if quantization_method in [QuantizationMethod.POWER_OF_TWO,
                                QuantizationMethod.SYMMETRIC]:
         return {qi_inferable_quantizers_constants.NUM_BITS: node_qc.weights_n_bits,
-                qi_inferable_quantizers_constants.THRESHOLD: node_qc.weights_quantization_params[THRESHOLD].flatten(),
+                qi_inferable_quantizers_constants.THRESHOLD: node_qc.weights_quantization_params[THRESHOLD].flatten().tolist(),
                 qi_inferable_quantizers_constants.PER_CHANNEL: node_qc.weights_per_channel_threshold,
                 qi_inferable_quantizers_constants.CHANNEL_AXIS: node_qc.weights_channels_axis}
 
     elif quantization_method in [QuantizationMethod.UNIFORM]:
         return {qi_inferable_quantizers_constants.NUM_BITS: node_qc.weights_n_bits,
                 qi_inferable_quantizers_constants.PER_CHANNEL: node_qc.weights_per_channel_threshold,
-                qi_inferable_quantizers_constants.MIN_RANGE: node_qc.weights_quantization_params[RANGE_MIN].flatten(),
-                qi_inferable_quantizers_constants.MAX_RANGE: node_qc.weights_quantization_params[RANGE_MAX].flatten(),
+                qi_inferable_quantizers_constants.MIN_RANGE: node_qc.weights_quantization_params[RANGE_MIN].flatten().tolist(),
+                qi_inferable_quantizers_constants.MAX_RANGE: node_qc.weights_quantization_params[RANGE_MAX].flatten().tolist(),
                 qi_inferable_quantizers_constants.CHANNEL_AXIS: node_qc.weights_channels_axis}
 
     elif quantization_method in [QuantizationMethod.LUT_POT_QUANTIZER, QuantizationMethod.LUT_SYM_QUANTIZER]:
@@ -96,13 +96,13 @@ def get_activation_inferable_quantizer_kwargs(node_qc: NodeActivationQuantizatio
     if quantization_method in [QuantizationMethod.POWER_OF_TWO,
                                QuantizationMethod.SYMMETRIC]:
         return {qi_inferable_quantizers_constants.NUM_BITS: node_qc.activation_n_bits,
-                qi_inferable_quantizers_constants.THRESHOLD: np.asarray([node_qc.activation_quantization_params[THRESHOLD]]),
+                qi_inferable_quantizers_constants.THRESHOLD: [node_qc.activation_quantization_params[THRESHOLD]],
                 qi_inferable_quantizers_constants.SIGNED: node_qc.activation_quantization_params.get(SIGNED)}
 
     elif quantization_method in [QuantizationMethod.UNIFORM]:
         return {qi_inferable_quantizers_constants.NUM_BITS: node_qc.activation_n_bits,
-                qi_inferable_quantizers_constants.MIN_RANGE: np.asarray([node_qc.activation_quantization_params[RANGE_MIN]]),
-                qi_inferable_quantizers_constants.MAX_RANGE: np.asarray([node_qc.activation_quantization_params[RANGE_MAX]])}
+                qi_inferable_quantizers_constants.MIN_RANGE: [node_qc.activation_quantization_params[RANGE_MIN]],
+                qi_inferable_quantizers_constants.MAX_RANGE: [node_qc.activation_quantization_params[RANGE_MAX]]}
 
     elif quantization_method in [QuantizationMethod.LUT_POT_QUANTIZER]:
         return {qi_inferable_quantizers_constants.NUM_BITS: node_qc.activation_n_bits,

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/gptq/keras/gptq_training.py

@@ -28,8 +28,8 @@ from model_compression_toolkit.gptq.keras.quantizer.quantization_builder import
 from model_compression_toolkit.logger import Logger
 from mct_quantizers import KerasQuantizationWrapper, KerasActivationQuantizationHolder
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.python.keras.engine.base_layer import TensorFlowOpLayer
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.engine.base_layer import TensorFlowOpLayer
 else:
     from keras.engine.base_layer import TensorFlowOpLayer
 

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/qat/pytorch/quantizer/ste_rounding/symmetric_ste.py

@@ -119,12 +119,12 @@ class STEWeightQATQuantizer(BasePytorchQATTrainableQuantizer):
         if self.power_of_two:
             pot_threshold = 2 ** np.ceil(np.log2(np_threshold))
             return WeightsPOTInferableQuantizer(num_bits=self.num_bits,
-                                                threshold=pot_threshold,
+                                                threshold=pot_threshold.tolist(),
                                                 per_channel=self.quantization_config.weights_per_channel_threshold,
                                                 channel_axis=self.quantization_config.weights_channels_axis)
         else:
             return WeightsSymmetricInferableQuantizer(num_bits=self.num_bits,
-                                                      threshold=np_threshold,
+                                                      threshold=np_threshold.tolist(),
                                                       per_channel=self.quantization_config.weights_per_channel_threshold,
                                                       channel_axis=self.quantization_config.weights_channels_axis)
 
@@ -198,9 +198,9 @@ class STEActivationQATQuantizer(BasePytorchQATTrainableQuantizer):
         if self.power_of_two:
             pot_threshold = np.power(2.0, np.ceil(np.log2(np_threshold)))
             return ActivationPOTInferableQuantizer(num_bits=self.num_bits,
-                                                   threshold=pot_threshold,
+                                                   threshold=pot_threshold.tolist(),
                                                    signed=self.sign)
         else:
             return ActivationSymmetricInferableQuantizer(num_bits=self.num_bits,
-                                                         threshold=np_threshold,
+                                                         threshold=np_threshold.tolist(),
                                                          signed=self.sign)

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/qat/pytorch/quantizer/ste_rounding/uniform_ste.py

@@ -190,4 +190,5 @@ class STEUniformActivationQATQuantizer(BasePytorchQATTrainableQuantizer):
         _max = self.get_quantizer_variable(FQ_MAX).cpu().detach().numpy()
 
         return ActivationUniformInferableQuantizer(num_bits=self.num_bits,
-                                                   min_range=_min, max_range=_max)
+                                                   min_range=_min.tolist(),
+                                                   max_range=_max.tolist())

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/default_tpc/v1/tpc_keras.py

@@ -15,9 +15,8 @@
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Reshape, ZeroPadding2D, \
-        Dropout, \
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Reshape, ZeroPadding2D, Dropout, \
         MaxPooling2D, Activation, ReLU, Flatten, Cropping2D
 else:
     from keras.layers import Conv2D, DepthwiseConv2D, Reshape, ZeroPadding2D, \

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/default_tpc/v2/tpc_keras.py

@@ -16,10 +16,9 @@ import tensorflow as tf
 
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
-        Dropout, \
-        MaxPooling2D, Activation, ReLU, PReLU, Flatten, Cropping2D
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
+        Dropout, MaxPooling2D, Activation, ReLU, PReLU, Flatten, Cropping2D
 else:
     from keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
         Dropout, MaxPooling2D, Activation, ReLU, PReLU, Flatten, Cropping2D

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/default_tpc/v3/tpc_keras.py

@@ -15,10 +15,9 @@
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
-        Dropout, \
-        MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
+        Dropout, MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D
 else:
     from keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
         Dropout, MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/default_tpc/v3_lut/tpc_keras.py

@@ -16,10 +16,9 @@ import tensorflow as tf
 from packaging import version
 from model_compression_toolkit.target_platform_capabilities.tpc_models.default_tpc.v3_lut import __version__ as TPC_VERSION
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
-        Dropout, \
-        MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
+        Dropout, MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D
 else:
     from keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, \
         Dropout, MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/default_tpc/v4/tpc_keras.py

@@ -15,8 +15,8 @@
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
         MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D, LeakyReLU, Permute, \
         Conv2DTranspose
 else:

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/default_tpc/v4_lut/tpc_keras.py

@@ -16,8 +16,8 @@ import tensorflow as tf
 from packaging import version
 from model_compression_toolkit.target_platform_capabilities.tpc_models.default_tpc.v4_lut import __version__ as TPC_VERSION
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
         MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D, LeakyReLU, Permute, \
         Conv2DTranspose
 else:

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/default_tpc/v5/tpc_keras.py

@@ -15,8 +15,8 @@
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
         MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D, LeakyReLU, Permute, \
         Conv2DTranspose
 else:

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/imx500_tpc/v1/tpc_keras.py

@@ -15,8 +15,9 @@
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
+
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
         MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D, LeakyReLU, Permute, \
         Conv2DTranspose
 else:

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/imx500_tpc/v1_lut/tpc_keras.py

@@ -15,8 +15,8 @@
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Dense, Reshape, ZeroPadding2D, Dropout, \
         MaxPooling2D, Activation, ReLU, Add, Subtract, Multiply, PReLU, Flatten, Cropping2D, LeakyReLU, Permute, \
         Conv2DTranspose
 else:

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/qnnpack_tpc/v1/tpc_keras.py

@@ -17,9 +17,8 @@ import tensorflow as tf
 from packaging import version
 from model_compression_toolkit.target_platform_capabilities.tpc_models.qnnpack_tpc.v1 import __version__ as TPC_VERSION
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, DepthwiseConv2D, Conv2DTranspose, Dense, BatchNormalization, ReLU, \
-        Activation
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, DepthwiseConv2D, Conv2DTranspose, Dense, BatchNormalization, ReLU, Activation
 else:
     from keras.layers import Conv2D, DepthwiseConv2D, Conv2DTranspose, Dense, BatchNormalization, ReLU, Activation
 

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/target_platform_capabilities/tpc_models/tflite_tpc/v1/tpc_keras.py

@@ -15,9 +15,9 @@
 import tensorflow as tf
 from packaging import version
 
-if version.parse(tf.__version__) < version.parse("2.6"):
-    from tensorflow.keras.layers import Conv2D, Dense, Reshape, ZeroPadding2D, AveragePooling2D, Activation, \
-        DepthwiseConv2D, MaxPooling2D, ReLU, Add, Softmax, Concatenate, Multiply, Maximum, Minimum, BatchNormalization
+if version.parse(tf.__version__) >= version.parse("2.13"):
+    from keras.src.layers import Conv2D, Dense, Reshape, ZeroPadding2D, AveragePooling2D, Activation, DepthwiseConv2D, \
+        MaxPooling2D, ReLU, Add, Softmax, Concatenate, Multiply, Maximum, Minimum, BatchNormalization
 else:
     from keras.layers import Conv2D, Dense, Reshape, ZeroPadding2D, AveragePooling2D, Activation, DepthwiseConv2D, \
         MaxPooling2D, ReLU, Add, Softmax, Concatenate, Multiply, Maximum, Minimum, BatchNormalization

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/model_compression_toolkit/trainable_infrastructure/keras/config_serialization.py

@@ -17,12 +17,17 @@ import copy
 from typing import Any, Union
 from enum import Enum
 
+import numpy as np
+
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.trainable_infrastructure.common.trainable_quantizer_config import \
     TrainableQuantizerActivationConfig, TrainableQuantizerWeightsConfig
 from mct_quantizers.common import constants as C
 
 
+CONFIG = "config"
+VALUE = "value"
+
 def transform_enum(v: Any):
     """
     If an enum is received it value is return otherwise the input is returned.
@@ -63,9 +68,13 @@ def config_deserialization(in_config: dict) -> Union[TrainableQuantizerWeightsCo
     """
     in_config = copy.deepcopy(in_config)
     if in_config[C.IS_WEIGHTS]:
+        weights_quantization_params = {}
+        for key, value in in_config[C.WEIGHTS_QUANTIZATION_PARAMS].items():
+            # In TF2.13.0, serialization of numpy array is dictionary with parameters
+            weights_quantization_params.update({key: np.array(value[CONFIG][VALUE] if isinstance(value, dict) else value)})
         return TrainableQuantizerWeightsConfig(weights_quantization_method=QuantizationMethod(in_config[C.WEIGHTS_QUANTIZATION_METHOD]),
                                                weights_n_bits=in_config[C.WEIGHTS_N_BITS],
-                                               weights_quantization_params=in_config[C.WEIGHTS_QUANTIZATION_PARAMS],
+                                               weights_quantization_params=weights_quantization_params,
                                                enable_weights_quantization=in_config[C.ENABLE_WEIGHTS_QUANTIZATION],
                                                weights_channels_axis=in_config[C.WEIGHTS_CHANNELS_AXIS],
                                                weights_per_channel_threshold=in_config[C.WEIGHTS_PER_CHANNEL_THRESHOLD],

{mct-nightly-1.9.0.20230814.post352 → mct-nightly-1.9.0.20230816.post359}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 description-file = README.md
-version = 1.9.0.20230814-000352
+version = 1.9.0.20230816-000359
 
 [egg_info]
 tag_build =