mct-nightly 2.1.0.20240720.437__py3-none-any.whl → 2.1.0.20240722.456__py3-none-any.whl

{mct_nightly-2.1.0.20240720.437.dist-info → mct_nightly-2.1.0.20240722.456.dist-info}/METADATA

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

{mct_nightly-2.1.0.20240720.437.dist-info → mct_nightly-2.1.0.20240722.456.dist-info}/RECORD

@@ -1,4 +1,4 @@
-model_compression_toolkit/__init__.py,sha256=GauKXfn9ZVxjijkYY7K0vVx30gkSYDMaCJSxHNtkfBM,1573
+model_compression_toolkit/__init__.py,sha256=iezGRE9BMbpwAOs234q9S_hM-r__OjgRKtfVjPT5EOc,1573
 model_compression_toolkit/constants.py,sha256=9pVleMwnhlM4QwIL2HcEq42I1uF4rlSw63RUjkxOF4w,3923
 model_compression_toolkit/defaultdict.py,sha256=LSc-sbZYXENMCw3U9F4GiXuv67IKpdn0Qm7Fr11jy-4,2277
 model_compression_toolkit/logger.py,sha256=3DByV41XHRR3kLTJNbpaMmikL8icd9e1N-nkQAY9oDk,4567
@@ -199,7 +199,7 @@ model_compression_toolkit/core/keras/quantizer/lut_fake_quant.py,sha256=Up3-sbuA
 model_compression_toolkit/core/keras/reader/__init__.py,sha256=mjbqLD-KcG3eNeCYpu1GBS7VclGVOQ63x2p6mAAuba4,698
 model_compression_toolkit/core/keras/reader/common.py,sha256=eZWjBcvTDUX7fCWmy1OAH4lYLFTh59_UQ_nP_Gjp4yw,2594
 model_compression_toolkit/core/keras/reader/connectivity_handler.py,sha256=AgF6qXZOJMeXvc-pBnGY23BJz7wPBx2aTYxHiO8efec,11303
-model_compression_toolkit/core/keras/reader/node_builder.py,sha256=H4ZvaRKt7W7zKzmEDlhveHWf_rLlUCxM0G1s7lnLzn0,13953
+model_compression_toolkit/core/keras/reader/node_builder.py,sha256=NDgrEiy2WEe9k5ZuBaTynCFpwNrVIEIDdG_HNjI4MAM,14129
 model_compression_toolkit/core/keras/reader/reader.py,sha256=wS9UQ2wJKnkZYe9JHwQp7ygDr6CRlzrxmIyLDv1Qz6U,8109
 model_compression_toolkit/core/keras/reader/nested_model/__init__.py,sha256=mjbqLD-KcG3eNeCYpu1GBS7VclGVOQ63x2p6mAAuba4,698
 model_compression_toolkit/core/keras/reader/nested_model/edges_merger.py,sha256=K6KAH9o8KSG6baLmhKoCrYK-i-wb6gRKiZmoijFqEYA,7906
@@ -517,8 +517,8 @@ model_compression_toolkit/xquant/pytorch/model_analyzer.py,sha256=b93o800yVB3Z-i
 model_compression_toolkit/xquant/pytorch/pytorch_report_utils.py,sha256=yrZNVRm2IRU7r7R-hjS2lOQ6wvEEvbeunvf2jKoWjXk,3277
 model_compression_toolkit/xquant/pytorch/similarity_functions.py,sha256=CERxq5K8rqaiE-DlwhZBTUd9x69dtYJlkHOPLB54vm8,2354
 model_compression_toolkit/xquant/pytorch/tensorboard_utils.py,sha256=eyMoXt5o5EnMr6d-rpCwQdX5mAiYiymvbgKv4tf7-a0,4576
-mct_nightly-2.1.0.20240720.437.dist-info/LICENSE.md,sha256=aYSSIb-5AFPeITTvXm1UAoe0uYBiMmSS8flvXaaFUks,10174
-mct_nightly-2.1.0.20240720.437.dist-info/METADATA,sha256=AITjqIIjGdtL_48nTJrEgyCiDXyws6UR1vPZL7EIdLI,19719
-mct_nightly-2.1.0.20240720.437.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mct_nightly-2.1.0.20240720.437.dist-info/top_level.txt,sha256=gsYA8juk0Z-ZmQRKULkb3JLGdOdz8jW_cMRjisn9ga4,26
-mct_nightly-2.1.0.20240720.437.dist-info/RECORD,,
+mct_nightly-2.1.0.20240722.456.dist-info/LICENSE.md,sha256=aYSSIb-5AFPeITTvXm1UAoe0uYBiMmSS8flvXaaFUks,10174
+mct_nightly-2.1.0.20240722.456.dist-info/METADATA,sha256=Y6Uw2eCZDA8p3Lvun9r2JjrjxfAMHaCWHKIYyfqatzA,19719
+mct_nightly-2.1.0.20240722.456.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mct_nightly-2.1.0.20240722.456.dist-info/top_level.txt,sha256=gsYA8juk0Z-ZmQRKULkb3JLGdOdz8jW_cMRjisn9ga4,26
+mct_nightly-2.1.0.20240722.456.dist-info/RECORD,,

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.1.0.20240720.000437"
+__version__ = "2.1.0.20240722.000456"

model_compression_toolkit/core/keras/reader/node_builder.py

@@ -242,10 +242,10 @@ def build_node(node: KerasNode,
     output_shape = keras_layer.get_output_shape_at(io_index)
 
     if layer_class in [TFOpLambda, SlicingOpLambda]:
-        # Some functional ops (such as tf.concat) should receive the input tensors as a list
-        # and some are not (such as tf.multiply), so each FunctionalNode holds
-        # a flag to indicate that.
-        inputs_as_list = __is_functional_inputs_a_list(op_call_args)
+        # Some functional ops should receive the input tensors as a list,
+        # so each FunctionalNode holds a flag to indicate that.
+        # Other functional ops can receive each argument as list, but in that case not all inputs appear in that list.
+        inputs_as_list = __is_functional_inputs_a_list(op_call_args, keras_layer)
 
         kwarg2index = get_kwargs2index(keras_layer)
 
@@ -301,21 +301,20 @@ def build_node(node: KerasNode,
     return node
 
 
-def __is_functional_inputs_a_list(op_call_args: Any) -> bool:
+def __is_functional_inputs_a_list(op_call_args: Any, keras_layer: Any) -> bool:
     """
     Check whether the input tensors should be passed as a list
-    or not.
+    or not. This is relevant only for specific TF operators that are specified in the function's condition.
 
     Args:
         op_call_args: Arguments list to check.
+        keras_layer: TFOpLambda layer.
 
     Returns:
         Whether the input tensors should be passed as a list or not.
     """
 
-    if len(op_call_args) > 0 and isinstance(op_call_args[0], list):
-        inputs_as_list = True
-        for arg in op_call_args[0]:
-            inputs_as_list = inputs_as_list and (is_tensor(arg) or is_const(arg))
-        return inputs_as_list
-    return False
+    return (keras_layer.symbol in
+            [TFOpLambda(tf.concat).symbol, TFOpLambda(tf.stack).symbol,TFOpLambda(tf.add_n).symbol] and
+            len(op_call_args) > 0 and
+            isinstance(op_call_args[0], list))