mct-nightly 1.1.0.6012022.post2521__py3-none-any.whl → 1.1.0.07122021-002414__py3-none-any.whl

{mct_nightly-1.1.0.6012022.post2521.dist-info → mct_nightly-1.1.0.7122021.post2414.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 1.1.0.6012022.post2521
+Version: 1.1.0.07122021-002414
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN
@@ -23,7 +23,7 @@ Requires-Dist: PuLP
 Requires-Dist: matplotlib
 
 # Model Compression Toolkit (MCT)
-![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_suite_tf27.yml/badge.svg)
+![tests](https://github.com/sony/model_optimization/actions/workflows/run_tests_suite.yml/badge.svg)
 
 
 Model Compression Toolkit (MCT) is an open source project for neural network model optimization under efficient, constrained hardware. <br />
@@ -124,7 +124,7 @@ Tensorboard Visualization (Experimental):
 
 Note that currently we only have full support for Keras layers. Using the TensorFlow native layers may lead to unexpected behavior. This limitation will be removed in future releases. 
 
-MCT is tested with Tensorflow Version 2.7. 
+MCT is tested with Tensorflow Version 2.5. 
 
 ## Tutorials and Results
 As part of the MCT library, we have a set of example networks on image classification. These networks can be used as examples when using the package.

{mct_nightly-1.1.0.6012022.post2521.dist-info → mct_nightly-1.1.0.7122021.post2414.dist-info}/RECORD

@@ -1,38 +1,35 @@
 model_compression_toolkit/__init__.py,sha256=67dpO_HEzKkzOdx7tCF8ucJ2vvgwI65cYd7bo46_qbY,1860
-model_compression_toolkit/common/__init__.py,sha256=3YqXHpeO2qfyt5RPJ5Q2PH1ur5Dh6bA4rJKApi34_Dg,1474
+model_compression_toolkit/common/__init__.py,sha256=LtklANR21DvGL9oO4ila5u6Ft7M83-dqftICub6Vowk,1454
 model_compression_toolkit/common/base_substitutions.py,sha256=FHVBXTdn_sh6QpkdOpZ4IObcoeF49klPvak3T1XSHzs,1656
-model_compression_toolkit/common/constants.py,sha256=uA3ZoM2beuzRzfXrcSN2athrU46HomVSJCRaIJOudDo,1493
+model_compression_toolkit/common/constants.py,sha256=DWcVXmyONazCWZYp6LT-0Kav0bbMxfB8sDWjMRAxqxY,1472
 model_compression_toolkit/common/data_loader.py,sha256=fqTPODRsWZAhkXExE4iP2kgtHv5kOw1UzBojWXIrq7c,4018
 model_compression_toolkit/common/defaultdict.py,sha256=C9LVHx7D0WniqOsoiENkPNdUj49kiQEabESr6FRT5OA,2132
-model_compression_toolkit/common/framework_implementation.py,sha256=mV9ze8MrUeELuO2HDDtWOYk7swtbg0q7VYsxsGzhTAg,10541
-model_compression_toolkit/common/framework_info.py,sha256=T-ea_iWhB7im4kXslqLcduTG04S0zix1tDBqra0G1fM,8892
+model_compression_toolkit/common/framework_implementation.py,sha256=mz3WI7wgXoo_jIs_XM-D1uCl7S-gEPml3UKDjAGri3w,9827
+model_compression_toolkit/common/framework_info.py,sha256=mpPvVS8JYa987MYqmfj32iEsLY-vhqY8UGtgoUYK3_k,7723
 model_compression_toolkit/common/logger.py,sha256=RrDE9VCndUrdbQ_4DL5VP8z10fr5BMCJvxswHIvb3Os,4674
 model_compression_toolkit/common/model_builder_mode.py,sha256=G06Tpf-p7vBpa_k0Z8sNdbwhN_QEX-3lf0ajafSrQKA,1488
-model_compression_toolkit/common/model_collector.py,sha256=a-II4daawarxAK-AfBAackRiVOxPcV5eyHI47nt0uc4,4931
-model_compression_toolkit/common/model_validation.py,sha256=hnK2S4OIAMJImvfPzoEzSjqR95E58NAxYekbe0McVVI,1176
-model_compression_toolkit/common/node_prior_info.py,sha256=Vhw4XgJs9h1GPKWxpIocmuMj98TdEhu2GiQMrSkwxPc,793
-model_compression_toolkit/common/post_training_quantization.py,sha256=ZzeYeiF6bcQQMT_X52hQRndwWC5EG9kNc5u7nN-045w,23068
+model_compression_toolkit/common/model_collector.py,sha256=c-wy-ln9o9FI7jgpS4pXEB3h81XLXwXKPrY0qjdHQuw,4665
+model_compression_toolkit/common/post_training_quantization.py,sha256=T6T9YmoKgXZMdRuLKVZVVviXb7SaefnQ4HNsk5AiWv4,22575
 model_compression_toolkit/common/similarity_analyzer.py,sha256=8PhDElbAhWA2v_pWXDL7kxxXr-xQo0RNulo0y9pmI2c,5411
+model_compression_toolkit/common/statistics_collector.py,sha256=cv-qrVM9JY9JLyxfC5G2EzqPAdbOBMN4Gm3Qf9tOhIY,7973
 model_compression_toolkit/common/user_info.py,sha256=OYUdFBma5TKrDLBXEjgo1Oj0RK0zpvkVmP_5ZJ0X-2c,1535
 model_compression_toolkit/common/bias_correction/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
-model_compression_toolkit/common/bias_correction/apply_bias_correction_to_graph.py,sha256=aY1zooBiovB_wBohS1_rW48rdPK3ymgHgW6srjX1uck,3336
-model_compression_toolkit/common/bias_correction/compute_bias_correction_of_graph.py,sha256=OOlY_DT9GnCaw4koEd5dDr9kJs1WvGT_bkM4j-9QIDw,8338
+model_compression_toolkit/common/bias_correction/apply_bias_correction_to_graph.py,sha256=xYQoZ24IuFrm-4c415BCirYbRaDjKl9OnCW4TDUxO7k,3328
+model_compression_toolkit/common/bias_correction/compute_bias_correction_of_graph.py,sha256=UKpQZzK7U8xc5Tu2ZJIRk2b_rNB8I-lJDDIYWvcfr1A,8372
 model_compression_toolkit/common/collectors/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
 model_compression_toolkit/common/collectors/base_collector.py,sha256=s1Kne14LcFUajwftMBrusu0wTPHCUQx4TegPcFSWVss,2427
 model_compression_toolkit/common/collectors/histogram_collector.py,sha256=_MDJPsa98rsuN1p8ix3fhoeCg6k9lEZjBvyqTLQ9Fqw,6860
-model_compression_toolkit/common/collectors/mean_collector.py,sha256=1yDz21qofGXsLjaRlX7lOe8DxkX_745c-0hsF3HSvfU,3930
-model_compression_toolkit/common/collectors/min_max_per_channel_collector.py,sha256=maItBKVREv1cyuMhe8jVupoMtyREuoJBYGwTLVc6cqI,5254
-model_compression_toolkit/common/collectors/statistics_collector.py,sha256=1iLprwqDiMe8jID2VUn535YsR6bPDwfeAUmwKWQ52AA,7882
-model_compression_toolkit/common/collectors/statistics_collector_generator.py,sha256=02vovEDuGGYtHVN9AlEqccjqCyVQx_Kh39-FCooK4Qw,1857
+model_compression_toolkit/common/collectors/mean_collector.py,sha256=x3n2dmZl2EuXh_LgEQnO7YMlL6G7s0nFltsIhXGx6W0,3835
+model_compression_toolkit/common/collectors/min_max_per_channel_collector.py,sha256=ZzJkogbqDkVj_tiS3gzHfTsEkomroeHBcJrXod0ga4k,5031
 model_compression_toolkit/common/gptq/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
 model_compression_toolkit/common/gptq/gptq_config.py,sha256=XDfJgamLEyJKyq4rmhX5gqhM30a1DiJjKqoy3N6t1pM,2787
-model_compression_toolkit/common/graph/__init__.py,sha256=cGtOcHTvkY-krRVYjk2o-YrfSeOu5K8XCna4vI3tyXc,769
-model_compression_toolkit/common/graph/base_graph.py,sha256=BYWTin5GbDPvrOqJzjnaLp2hO1VVyPdfPY4mMya6igw,18620
-model_compression_toolkit/common/graph/base_node.py,sha256=R4Wp4mEya1uoOaSgR-rKxB-wBYWd1HzcGfIHrM5MBrU,6946
-model_compression_toolkit/common/graph/edge.py,sha256=y9_cbrLYf5MCJ-uCXnAs6ImQkbMEorGOBvusK5ddlxU,3729
-model_compression_toolkit/common/graph/functional_node.py,sha256=GZ6VUP0oef_C_kb-tCMakpIPVTEpb8fG7ycr4z1sTZc,2483
-model_compression_toolkit/common/graph/graph_matchers.py,sha256=QcmJpq9c3y1sPLYOZKAgPMvI_1HtXfBST7JEUbAVmt0,4775
-model_compression_toolkit/common/graph/graph_searches.py,sha256=FrDTomG5jJRfF7XrhfN7zq1fAy4vyHX1cdveWYWoVbg,5114
+model_compression_toolkit/common/graph/__init__.py,sha256=3x8iejFh5xa6tUnOtu5tU7KFOKdRqADhNac89pDItWo,760
+model_compression_toolkit/common/graph/base_graph.py,sha256=jUDItUWIDquKTmEtVtQ-WC2gK8l7QPZKN_1LHF-tmhs,18408
+model_compression_toolkit/common/graph/edge.py,sha256=J1ksD-NHXNA_aMqoEQEaR81URLuAht2KNwu_ARwODHE,3712
+model_compression_toolkit/common/graph/graph_matchers.py,sha256=8m51Ve__sQ-joGxNSyQZJImUE5zGgkp2xuSdhWIb1zY,4754
+model_compression_toolkit/common/graph/graph_searches.py,sha256=HYG5f1SN3cKA3Jeq9iUnubk1EJiPD6k-g6ufFTXaIKc,5093
+model_compression_toolkit/common/graph/graph_vis.py,sha256=NqWkLW75ap2n-RX_TmooVtxJ63iR3BgtfRR6f4eUWYs,3704
+model_compression_toolkit/common/graph/node.py,sha256=LUi8l1-mzrI-0_USw1Zt-1j6xkHT4tDSAPx9OXBc5pI,7527
 model_compression_toolkit/common/matchers/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
 model_compression_toolkit/common/matchers/base_graph_filter.py,sha256=I7MGK5YMfk9jvUeh_oD3LMgpVg4DLWWKjcVLhXQdQOo,3092
 model_compression_toolkit/common/matchers/base_matcher.py,sha256=qpj-Xfmbd6Vdv46GCWx5w1xrOA8FyOVUlBXLCWVH76A,2151
@@ -41,26 +38,26 @@ model_compression_toolkit/common/matchers/function.py,sha256=Aqe0gLQJUSAn-unHYF5
 model_compression_toolkit/common/matchers/node_matcher.py,sha256=fyKrVaC_S1qU-Fx-SJVW0YxEDv7LMHDUZQyfMgbH-xY,2746
 model_compression_toolkit/common/matchers/walk_matcher.py,sha256=wZuTitcKe4CeGizwb4P1_D5o1wd7ZfaKRA_tTng8FeQ,1112
 model_compression_toolkit/common/mixed_precision/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
-model_compression_toolkit/common/mixed_precision/bit_width_setter.py,sha256=hBpRNVYAkQSJLTpc9-OAqKz8z4rO3iXpEXCTG8636C8,6452
+model_compression_toolkit/common/mixed_precision/bit_width_setter.py,sha256=DpgZatq-gEhUHfuN4xw3iagiMrNih1poWGd3uVDVW8g,6431
 model_compression_toolkit/common/mixed_precision/distance_weighting.py,sha256=-UPf9wXIOKZC4xSs_qvvtPr3_dUoQKk5_Y5LW-btgQY,3591
 model_compression_toolkit/common/mixed_precision/kpi.py,sha256=eUYXmR7LJC2SG77XI2yy29UkS_2uimxcS03EzXZJox4,1279
 model_compression_toolkit/common/mixed_precision/mixed_precision_quantization_config.py,sha256=AdBlSHCK3J9Yr3c2tXkD1iRB70Blcpj0aKm6XKojbVY,3009
 model_compression_toolkit/common/mixed_precision/mixed_precision_search_facade.py,sha256=9sop2XIDqJKP-fpvpiNfHQF8VcgRbQ1OqKsd_3Wt6L0,4713
-model_compression_toolkit/common/mixed_precision/mixed_precision_search_manager.py,sha256=vLYzj6aBLvk0-75VLvdHPqFrYTUiTjjb42-wT7nWj_E,5890
+model_compression_toolkit/common/mixed_precision/mixed_precision_search_manager.py,sha256=fhew3IF3xZEKTahgVzoZwqJaAsAmHxc5eqhK82tC2VU,5904
 model_compression_toolkit/common/mixed_precision/search_methods/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
 model_compression_toolkit/common/mixed_precision/search_methods/linear_programming.py,sha256=-6KfaChr2Ub-ewN9IN7Z16CgniTkoJBhAJdALOiHzJU,13199
 model_compression_toolkit/common/network_editors/__init__.py,sha256=dJWrbHs2NeGYW7Kzy7m7waIw8Ounjd1tiiL0a4nRAos,1235
-model_compression_toolkit/common/network_editors/actions.py,sha256=MpUN7076_Mo_pIqREJc9UcsCkVIDDYjZZeORV70DfhM,13001
+model_compression_toolkit/common/network_editors/actions.py,sha256=czJlYQnC6r38XJcpipvcCy2DQNd01QRwkIh_d3BLwSg,13118
 model_compression_toolkit/common/network_editors/edit_network.py,sha256=KsfILh0y_n5kqkaAJDeuHtJ5Pgf4OW6oWjl13ySV0QQ,1723
 model_compression_toolkit/common/network_editors/node_filters.py,sha256=W10GgyW8JicTgc10VjJtbFTuFVHuoOb8HDwWzxl4qdg,3151
 model_compression_toolkit/common/quantization/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
-model_compression_toolkit/common/quantization/node_quantization_config.py,sha256=CXPwPvmiIVEpPsKQ-bp-PeBdvW9HuKucayPkPrG2Llk,9699
-model_compression_toolkit/common/quantization/quantization_analyzer.py,sha256=hREW_EHD1FWyJa1mpf_U9N3ZgVhSS9U9P_aFTD7cGTw,3439
-model_compression_toolkit/common/quantization/quantization_config.py,sha256=oAURWTEddKX0gkze0N-dTUxOgfvgLj6VPlbe-vV4fLU,8628
-model_compression_toolkit/common/quantization/quantization_params_fn_selection.py,sha256=jyzgB1BONrBG6hXXzVlQ6SKT2d3ms0xdL-kqaB-MM8w,5372
+model_compression_toolkit/common/quantization/node_quantization_config.py,sha256=e81Yoqtp6e8saCDZFd2bYJMRtdxQ7aPCorwhYQSws6g,9359
+model_compression_toolkit/common/quantization/quantization_analyzer.py,sha256=xcZ2BPvUZ5ATNStavKjWOcJnvx8OQ7yBG0O_GgcsvuE,2972
+model_compression_toolkit/common/quantization/quantization_config.py,sha256=N2JZFO2AFlAqv9KbKYtIZlfKi2Dsb5RjNCNR8O76DPs,8503
+model_compression_toolkit/common/quantization/quantization_params_fn_selection.py,sha256=WSarcRfTcG2t62JCXIIucbe86oM_856vCb_1ygn-FeM,5448
 model_compression_toolkit/common/quantization/quantize_graph_weights.py,sha256=VopC_NxKd1rWjXhSTigZdnyldEocfsPAyeX-3WtEzkM,2993
-model_compression_toolkit/common/quantization/quantize_node.py,sha256=QbYL5ZI0lQsRKoqNBLiH0ElJ678pZ2qJo5koR3kpWxM,3606
-model_compression_toolkit/common/quantization/set_node_quantization_config.py,sha256=UOkuD9DpMeGlWMAOI8OtbadxNM3Vbj4Ey87jONjRxL8,7877
+model_compression_toolkit/common/quantization/quantize_node.py,sha256=MatcsOaUX0ogXzD8WH5v7zUc2ITsHBTpBGw3diYT88w,3593
+model_compression_toolkit/common/quantization/set_node_quantization_config.py,sha256=MNn4o26souwd1rkdxWbXF97TA_12knNEuRiVaj4vlCw,7729
 model_compression_toolkit/common/quantization/quantization_params_generation/__init__.py,sha256=8wFyT6t-uX0MQ-2QCa4qGZYmquhWroEdBrsren6wrlI,2045
 model_compression_toolkit/common/quantization/quantization_params_generation/kl_selection.py,sha256=Rk7yKNZDXePffzcOxlqK1er8mXkw0k_Qn3TY-Ve18eE,15158
 model_compression_toolkit/common/quantization/quantization_params_generation/kmeans_params.py,sha256=e8E7Htdc00mqATtHpOJUATadDY-LuHSUfJBh1-FLeKw,2648
@@ -70,8 +67,8 @@ model_compression_toolkit/common/quantization/quantization_params_generation/mae
 model_compression_toolkit/common/quantization/quantization_params_generation/mse_selection.py,sha256=R2pBjOIeozczdVi-nqfQvy0Auj0QLP0XsgaCIH6DdMk,5420
 model_compression_toolkit/common/quantization/quantization_params_generation/no_clipping.py,sha256=0TTU_rptXNjhldoH_K1-CE8eWEGq-EoSJPLlRM8dxUQ,6466
 model_compression_toolkit/common/quantization/quantization_params_generation/outlier_filter.py,sha256=SeouwEGp5oQ9vZu6OxHKpw3Hu01mqYmCoS-xneLN4kk,1773
-model_compression_toolkit/common/quantization/quantization_params_generation/qparams_activations_computation.py,sha256=vGcgdLUyS0AxLB3c7UQe4sOsMW7wkVxC0-tZXfVg_UE,3297
-model_compression_toolkit/common/quantization/quantization_params_generation/qparams_computation.py,sha256=pxoPd7zwgjY9S2Q1IUrk4uBoP-BZ5MgXOXqy0n1Izs4,4769
+model_compression_toolkit/common/quantization/quantization_params_generation/qparams_activations_computation.py,sha256=4pHn5oX2vfzfiLv2g7YX925wnSnF0qd5o-q0VcLtbSI,3066
+model_compression_toolkit/common/quantization/quantization_params_generation/qparams_computation.py,sha256=OFrboVTE1D1taaP9a1tgY5P2FCvQkJaB4EvHoPZF4WE,4941
 model_compression_toolkit/common/quantization/quantization_params_generation/qparams_search.py,sha256=RP1ylMBISrCAxRVZfPoD6RC5msb-Y6bvrJN9lC8xKGk,8565
 model_compression_toolkit/common/quantization/quantization_params_generation/qparams_weights_computation.py,sha256=G_IqFKpn4yVT6Q-uKbtJaF0N0QUxKvHeKdcNEGKlxwc,4943
 model_compression_toolkit/common/quantization/quantizers/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
@@ -82,65 +79,64 @@ model_compression_toolkit/common/quantization/quantizers/quantizers_helpers.py,s
 model_compression_toolkit/common/substitutions/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
 model_compression_toolkit/common/substitutions/apply_substitutions.py,sha256=hfRgeqS873jMnF9CQJCUVMlElYX1tddGSFo1HfEOMuM,1459
 model_compression_toolkit/common/visualization/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
-model_compression_toolkit/common/visualization/tensorboard_writer.py,sha256=59fzuCVeeoMPZFRxU2I6NtrKPv4ymvI-pM2bnuBMtnM,17113
+model_compression_toolkit/common/visualization/tensorboard_writer.py,sha256=_aqRGqgZ7XcWK5gWl8aYFoMMk79K2Ex3c9aRvrqFAMI,16899
 model_compression_toolkit/keras/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
-model_compression_toolkit/keras/constants.py,sha256=KL__xiGcvADRKrJjnd4HQCo9vnVY0xTsE8c2AFF5ZA8,1530
-model_compression_toolkit/keras/default_framework_info.py,sha256=cnAFjIfFZrGUwIoesFxiILn6dhvEIFr_qVMJCdYl3Qo,6074
-model_compression_toolkit/keras/keras_implementation.py,sha256=rNJhv0mh5Re_NQsFRuTMBz9XmhohOHrJJ6VmZBg9Shw,11703
-model_compression_toolkit/keras/keras_model_validation.py,sha256=UXfTozBKo5--sCNl-6q-v_RIVCyUTwZdR9qsG3xpoF0,1660
-model_compression_toolkit/keras/keras_node_prior_info.py,sha256=rySA4-N8Pe5vTJrKUSy8UtrSw0Y9UCnocOFSY10wdkY,2163
-model_compression_toolkit/keras/quantization_facade.py,sha256=KoZvYxTssFTwZ_3DRTpwQKT7qxzDPMDiqCVrLXimBfg,13735
+model_compression_toolkit/keras/constants.py,sha256=NbsC3VSuZ4Tl28o7FR5PFIJwG5y3iGhHbsqUM90gaFs,1418
+model_compression_toolkit/keras/default_framework_info.py,sha256=_wZv6luoQOk4eaHGRHXasGVOKqZx5nGVwj3VCi4dPec,5188
+model_compression_toolkit/keras/keras_implementation.py,sha256=FoGhblVhLN7aQtEp6VNJn1qBc56f9avlEYWOFlHAxko,10763
+model_compression_toolkit/keras/quantization_facade.py,sha256=hYzQaVrhFcR0x4uBhDrb11_PN4OssRCqDY9Utgoexmg,13440
+model_compression_toolkit/keras/tensor_marking.py,sha256=lfVqpVW3Pfb1BS7Q2d0yra3dFfKBsqGzy9CjkCfwnZA,5067
 model_compression_toolkit/keras/back2framework/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
-model_compression_toolkit/keras/back2framework/instance_builder.py,sha256=qCM-dp7VuoX1tvOw9u3Xcfe6eqnGw5dZwAn_VXol5pU,3364
-model_compression_toolkit/keras/back2framework/model_builder.py,sha256=5RPaSNjE7ZeN6Bx78bAz7c0iQy7H2PtARWJ0EiR_BHY,14614
+model_compression_toolkit/keras/back2framework/instance_builder.py,sha256=PO_UaPVEWlKqfw8dexOdEeesQF_SUIACT_kGSLoDDHI,3344
+model_compression_toolkit/keras/back2framework/model_builder.py,sha256=b4qnP2hDrLl6DU5gGHzgej7Ol2Wxp6ZdcCd0-Qos3jg,14531
 model_compression_toolkit/keras/gradient_ptq/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
 model_compression_toolkit/keras/gradient_ptq/gptq_loss.py,sha256=GGog0LDTb2_XptBjrlNjn2CJUlh6n7T32GNM1bMi5yo,1841
-model_compression_toolkit/keras/gradient_ptq/graph_info.py,sha256=aQYmdoyZ1fn4-BoiCeRg-5O7980Zx-ac0sX-7nC82zQ,3201
-model_compression_toolkit/keras/gradient_ptq/graph_update.py,sha256=XAkO1iRl2E5DB37x3Ew0Haebb3bXIHmH5Ovg2-6I5ao,3628
-model_compression_toolkit/keras/gradient_ptq/training_wrapper.py,sha256=kCpo_8fQs8pfdGq_Q95UuiorPqXWLgk0W6pjHCR8whg,5922
+model_compression_toolkit/keras/gradient_ptq/graph_info.py,sha256=3538-D-4u1K8nXQcOeDyC-8dcP1tEk7pfv2cbRXwvzE,3188
+model_compression_toolkit/keras/gradient_ptq/graph_update.py,sha256=vdbO2ZyXR4tkMf47CCW67bxuxFp4uTrlVYwK_BHN4Pc,3405
+model_compression_toolkit/keras/gradient_ptq/training_wrapper.py,sha256=38n9GKmig5-Ll8EPotJtVGY9h-6Tt9-onB6aq-67LNg,5991
 model_compression_toolkit/keras/graph_substitutions/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
 model_compression_toolkit/keras/graph_substitutions/substitutions/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
-model_compression_toolkit/keras/graph_substitutions/substitutions/activation_decomposition.py,sha256=EGsRpuOTamTbSNTlY_5LmQ-gDoD423lQ_DnSyHt7ZBY,3925
-model_compression_toolkit/keras/graph_substitutions/substitutions/batchnorm_folding.py,sha256=OtjTTcb9Ele1fbtJ1Fh8pFoI9pXsvdVe1XbW2Bt79zA,5207
-model_compression_toolkit/keras/graph_substitutions/substitutions/input_scaling.py,sha256=pGzL2fPzRUUSXJC-wem_x7qHnDoWjeZ2_NUI7RIYyyM,5197
-model_compression_toolkit/keras/graph_substitutions/substitutions/mark_activation.py,sha256=3yBT4R-rrhU0aoMkK00pPLAwvLY6-g8aXn0KeIjEkKo,3094
-model_compression_toolkit/keras/graph_substitutions/substitutions/relu_bound_correction.py,sha256=A0nLmiSgPc1_Ur4yFUnfP6PHWq9OmHTjiC46Lf93teg,5074
-model_compression_toolkit/keras/graph_substitutions/substitutions/remove_relu_upper_bound.py,sha256=81gtSTMRBtN5WTeARofXmV9Pz7VYb4FyXH67vgH3G6o,2245
-model_compression_toolkit/keras/graph_substitutions/substitutions/scale_equalization.py,sha256=CTK6jFKoGLcRZ_XwglpRFNJv-AL0H719r3ktzH8utCc,15496
-model_compression_toolkit/keras/graph_substitutions/substitutions/separableconv_decomposition.py,sha256=uNO67cQrPouJbHX07bbP-7j52rJKbpJy1MZtNV-gclk,7690
-model_compression_toolkit/keras/graph_substitutions/substitutions/shift_negative_activation.py,sha256=yx0-A-eJeuSlv8R9pO-bhHAg5PLxNe65Dcwi2KsW6M8,24231
+model_compression_toolkit/keras/graph_substitutions/substitutions/activation_decomposition.py,sha256=S-Y3FBIk_IrigIsuJCENa23ZkRSq9PoTDvGe-_8snyY,3886
+model_compression_toolkit/keras/graph_substitutions/substitutions/batchnorm_folding.py,sha256=U2OjwCZ2sfS_OR4SLVjtx5w79Fg6fte5pLyLU_ec_2Q,5190
+model_compression_toolkit/keras/graph_substitutions/substitutions/input_scaling.py,sha256=KSR73RspupgO_ETr7BQWvvjjhRY86VEGtqDSN9ZeEYw,5184
+model_compression_toolkit/keras/graph_substitutions/substitutions/mark_activation.py,sha256=uCZfrIWXw6OyihHV5UlGVy9S6HVnO1HHhZ6V5wmEFbM,3038
+model_compression_toolkit/keras/graph_substitutions/substitutions/relu_bound_correction.py,sha256=ltBqOQKwRn3PNIKiFS62fmXi8aa3HA-WLYypWsIHXLs,5167
+model_compression_toolkit/keras/graph_substitutions/substitutions/remove_relu_upper_bound.py,sha256=8wOjEGvTG2nAR5Zq2TSny_eeDep_8sYbDqyOT_xGtbY,2237
+model_compression_toolkit/keras/graph_substitutions/substitutions/scale_equalization.py,sha256=nRMmqGMF-MJlp3dd6hGSSldGWq6P-wCvGyvSRClf_JI,15460
+model_compression_toolkit/keras/graph_substitutions/substitutions/separableconv_decomposition.py,sha256=rL3dqnRXN7vj8PkBcdP73fwVV__BajBTRLMF8ilViBc,7609
+model_compression_toolkit/keras/graph_substitutions/substitutions/shift_negative_activation.py,sha256=iBCF1K2lHCnVlmjaeE6GfbVRHZuH3jmQcGce9DOoYkQ,23234
 model_compression_toolkit/keras/mixed_precision/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
-model_compression_toolkit/keras/mixed_precision/sensitivity_evaluation.py,sha256=EB74TrHjTbb1ONPw1SCPBar16atHbqYMMLwimUenOqQ,12761
+model_compression_toolkit/keras/mixed_precision/sensitivity_evaluation.py,sha256=lb9pt4anZ4ZE5lRkwqN6OKA82Tcriy7o25OSJ3JLSPY,12753
 model_compression_toolkit/keras/quantizer/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
 model_compression_toolkit/keras/quantizer/base_quantizer.py,sha256=WoD4UrgXcCjZSXPnOX9slxJLrYDYN7go6nKs-bWjfuo,1735
-model_compression_toolkit/keras/quantizer/fake_quant_builder.py,sha256=VlUJ66CKwp6ecsgccQCqWiWpufeFVKaG2LOL5vd_53A,3286
+model_compression_toolkit/keras/quantizer/fake_quant_builder.py,sha256=jtGyNrTGFt6PFoPG9eQA56eIKUDLsulDAsde7o0mx2A,3342
 model_compression_toolkit/keras/quantizer/gradient_ptq/__init__.py,sha256=7PRuw9ayT3yXklOYNNv4MdiSc5dQlCVbMS4h3EkyyEw,1081
-model_compression_toolkit/keras/quantizer/gradient_ptq/activation_quantizer.py,sha256=OFUKxitC2SKgijmgSeo7yrfEi6QFPLN2kv270xrVg_Y,8712
-model_compression_toolkit/keras/quantizer/gradient_ptq/activation_quantizer_gptq_config.py,sha256=T8wlqqLLxm4L52I6FEMp_JXMnC-2oGlrstBVUVx5mbA,4395
-model_compression_toolkit/keras/quantizer/gradient_ptq/activation_weight_quantizer_gptq_config.py,sha256=62GVuuuEnANdIwRN_nzqkIB4QnJj0MWTipstUDWoXw4,8835
+model_compression_toolkit/keras/quantizer/gradient_ptq/activation_quantizer.py,sha256=U-0bah9yTbNdUGfgqUdXwrmgMF1TafbppAxw6uE23Q4,8667
+model_compression_toolkit/keras/quantizer/gradient_ptq/activation_quantizer_gptq_config.py,sha256=Ht5sjWKlu9OnZaq2mHIRZQyGNy5DkhYD0wGtLUui71s,4210
+model_compression_toolkit/keras/quantizer/gradient_ptq/activation_weight_quantizer_gptq_config.py,sha256=9Clxkudq98sfQvn5p6FKvcNSJMBdmpquPZN-Gr22q58,8660
 model_compression_toolkit/keras/quantizer/gradient_ptq/base_quantizer_gptq_config.py,sha256=9Qac2Y5J82UsBELXilksn8-NejAUlUQx9NLtGHK2Zl0,2189
-model_compression_toolkit/keras/quantizer/gradient_ptq/config_factory.py,sha256=U47w6aa-CosDZhWums-m54AI0Q-C_p7-Rq6zLgDX6e8,4266
+model_compression_toolkit/keras/quantizer/gradient_ptq/config_factory.py,sha256=1_hSRr6E1sT9ibZp--k5treqNyqNQjSxi2bhoEWYfzY,4399
 model_compression_toolkit/keras/quantizer/gradient_ptq/utils.py,sha256=0iAjvi5uNedpH5ZtCcuJZx2YK0Gle7M7HQI5z0M4UBY,5092
 model_compression_toolkit/keras/quantizer/gradient_ptq/weight_quantizer.py,sha256=z_17BT6OljXp3W1V9njnOs1pVfjHRnQTva2ZUq0U0NY,8299
-model_compression_toolkit/keras/quantizer/gradient_ptq/weight_quantizer_gptq_config.py,sha256=4HgsvwwfIYkdJUY5Fgegg5RunWlQ1eiuRSJ9zkaJ9Ko,7144
+model_compression_toolkit/keras/quantizer/gradient_ptq/weight_quantizer_gptq_config.py,sha256=fb16XSZBoBFoEdIR4CzJijVoWkt5WrTlaf9mDjE_8Js,6931
 model_compression_toolkit/keras/quantizer/mixed_precision/__init__.py,sha256=vXN-Q5V_3byIScc1j2ePqHBwR60knX1Vy6-Oh-Ke5sk,698
-model_compression_toolkit/keras/quantizer/mixed_precision/quantization_config_factory.py,sha256=9NLziFt_L402XnF1BT4cbouuqCdRcCLM_abxkp2oIe8,2567
+model_compression_toolkit/keras/quantizer/mixed_precision/quantization_config_factory.py,sha256=fWXX3XgLxtMgnWV2w5vQxSz9P43k_H-vXxKhFFdd9xI,2563
 model_compression_toolkit/keras/quantizer/mixed_precision/selective_quantizer.py,sha256=7FafdolmRzGQEOL4mRUAYS1xz4PCvSRxXsZYDcrpja0,8009
-model_compression_toolkit/keras/quantizer/mixed_precision/selective_weights_quantize_config.py,sha256=sy5PQfXlK2FzAOJMJzyGQSTfJ9cBLt_2LurYUitqKqk,7731
+model_compression_toolkit/keras/quantizer/mixed_precision/selective_weights_quantize_config.py,sha256=zGiaXcUmbiNRIb2Q9E6BocyCL4cyQjuDpfguC9sFVf8,7521
 model_compression_toolkit/keras/reader/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
-model_compression_toolkit/keras/reader/common.py,sha256=UjarmULn_X_hL5qSc2bgYVPxjn_SDm0R7WRmjprmvqQ,2491
-model_compression_toolkit/keras/reader/connectivity_handler.py,sha256=yN0YJfB8IPBfvckwXvgdajzcN9PMjZHmQGPOtxA8Ox8,11346
-model_compression_toolkit/keras/reader/node_builder.py,sha256=il0g5XTkHqJDfdGDJgGH_I4xHWXvrL9IIOouRd9R1sk,5882
-model_compression_toolkit/keras/reader/reader.py,sha256=mPBb5KtMs93f7zPLNsvBPvkHvID2KNW7Nq1bDj0PL00,8068
+model_compression_toolkit/keras/reader/common.py,sha256=KCsvLFOeFltb9NBqQ2nU0MHYVPDBCYDBKF3oeoaangg,2417
+model_compression_toolkit/keras/reader/connectivity_handler.py,sha256=Pj4nmZl0C2K7iIbaC4PYS5Uvd82flvA9ctbI6DYYB7E,11115
+model_compression_toolkit/keras/reader/node_builder.py,sha256=N9KSkY7AaZeq0-Zxi5MhKdCsTW2qmFp1yjqk5aPVPpA,3420
+model_compression_toolkit/keras/reader/reader.py,sha256=0i9GT3rTWDDK5fKbtt6PTqFpM59obk8mK0SDXVbycn4,7939
 model_compression_toolkit/keras/reader/nested_model/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
-model_compression_toolkit/keras/reader/nested_model/edges_merger.py,sha256=yA15OoCMBRNus2mh4J1ZtdKFVPqspfO7E2V_bhaUWDE,7887
-model_compression_toolkit/keras/reader/nested_model/nested_model_handler.py,sha256=Pt9I4a_3ydGzaBWAP1G54RzHqzIQxEanreSO0iboxc0,2701
-model_compression_toolkit/keras/reader/nested_model/nodes_merger.py,sha256=llmNnGiuSA9riIYjyvJnU-qI8sqvQXGVUi5-qzISXSM,2184
-model_compression_toolkit/keras/reader/nested_model/outputs_merger.py,sha256=g5JrbPnIZxchhTQA2eJdZSpr0AyyYEIy0AaPqHD7XFE,2394
+model_compression_toolkit/keras/reader/nested_model/edges_merger.py,sha256=6JFeMSSQ0dSXwMt2BM5Jvx3XZXXgOa3i7M4V_VjLRCU,7858
+model_compression_toolkit/keras/reader/nested_model/nested_model_handler.py,sha256=vcv3oPZ4QvWmi9R37yY9ItV_9Pmd3KLjXFAgFQGC1Sg,2688
+model_compression_toolkit/keras/reader/nested_model/nodes_merger.py,sha256=iI63gMLuE4_C-8aKSOLT3xRowViI3Je8aN8r5A37vy0,2167
+model_compression_toolkit/keras/reader/nested_model/outputs_merger.py,sha256=bTzVEtXk-7zrtGN7_NZSAKSuCeBWTXd_sPe7RFYgHUQ,2381
 model_compression_toolkit/keras/visualization/__init__.py,sha256=fpP2DhMfJXbHLoq20ziy48ymPyevl5N7P2U1fzlYRSY,699
-model_compression_toolkit/keras/visualization/nn_visualizer.py,sha256=9BEE7IuwkKpfsMWokvOdA4unr6Pok4OiAgKtd93KYGI,4802
-mct_nightly-1.1.0.6012022.post2521.dist-info/LICENSE,sha256=aYSSIb-5AFPeITTvXm1UAoe0uYBiMmSS8flvXaaFUks,10174
-mct_nightly-1.1.0.6012022.post2521.dist-info/METADATA,sha256=Y3mJI396z4LlUPxli5vr9xhjSQMWwj4mjCwObDRjRQU,5947
-mct_nightly-1.1.0.6012022.post2521.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-mct_nightly-1.1.0.6012022.post2521.dist-info/top_level.txt,sha256=gsYA8juk0Z-ZmQRKULkb3JLGdOdz8jW_cMRjisn9ga4,26
-mct_nightly-1.1.0.6012022.post2521.dist-info/RECORD,,
+model_compression_toolkit/keras/visualization/nn_visualizer.py,sha256=ya6r3l_O5i6RJCYMean8uoKiv8BXOMK9298nI-yBCe4,4789
+mct_nightly-1.1.0.7122021.post2414.dist-info/LICENSE,sha256=aYSSIb-5AFPeITTvXm1UAoe0uYBiMmSS8flvXaaFUks,10174
+mct_nightly-1.1.0.7122021.post2414.dist-info/METADATA,sha256=nFwNHOXdo4i3cb-Xh5K0hLR0U71bUxR6VbkhtT0esv4,5941
+mct_nightly-1.1.0.7122021.post2414.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+mct_nightly-1.1.0.7122021.post2414.dist-info/top_level.txt,sha256=gsYA8juk0Z-ZmQRKULkb3JLGdOdz8jW_cMRjisn9ga4,26
+mct_nightly-1.1.0.7122021.post2414.dist-info/RECORD,,

{mct_nightly-1.1.0.6012022.post2521.dist-info → mct_nightly-1.1.0.7122021.post2414.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.37.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

model_compression_toolkit/common/__init__.py

@@ -16,9 +16,9 @@ from model_compression_toolkit.common.quantization import quantization_params_ge
 from model_compression_toolkit.common.base_substitutions import BaseSubstitution
 from model_compression_toolkit.common.framework_info import FrameworkInfo
 from model_compression_toolkit.common.graph.base_graph import Graph
-from model_compression_toolkit.common.graph.base_node import BaseNode
+from model_compression_toolkit.common.graph.node import Node
 from model_compression_toolkit.common.logger import Logger
 from model_compression_toolkit.common.quantization.quantization_config import QuantizationConfig, DEFAULTCONFIG
 from model_compression_toolkit.common.quantization.quantizers.quantizers_helpers import power_of_two_constraint
-from model_compression_toolkit.common.collectors.statistics_collector import StatsCollector, NoStatsCollector
+from model_compression_toolkit.common.statistics_collector import StatsContainer, NoStatsContainer
 

model_compression_toolkit/common/bias_correction/apply_bias_correction_to_graph.py

@@ -16,7 +16,7 @@ import copy
 
 from model_compression_toolkit.common.framework_implementation import FrameworkImplementation
 from model_compression_toolkit.common.framework_info import FrameworkInfo
-from model_compression_toolkit.common import Graph, BaseNode
+from model_compression_toolkit.common import Graph, Node
 
 def apply_bias_correction_to_graph(graph_to_apply_bias_correction: Graph,
                                    fw_info: FrameworkInfo,
@@ -44,7 +44,7 @@ def apply_bias_correction_to_graph(graph_to_apply_bias_correction: Graph,
     return graph
 
 
-def _apply_bias_correction_to_node(node:BaseNode,
+def _apply_bias_correction_to_node(node:Node,
                                    fw_impl: FrameworkImplementation):
     """
     Set new bias to node using the bias-correction term that is stored in the

model_compression_toolkit/common/bias_correction/compute_bias_correction_of_graph.py

@@ -20,9 +20,9 @@ import numpy as np
 
 from model_compression_toolkit.common.framework_implementation import FrameworkImplementation
 from model_compression_toolkit.common.framework_info import FrameworkInfo
-from model_compression_toolkit.common import BaseNode, Logger, Graph
+from model_compression_toolkit.common import Node, Logger, Graph
 from model_compression_toolkit.common.quantization.quantize_node import get_quantized_kernel_by_weights_qc
-from model_compression_toolkit.common.collectors.statistics_collector import BaseStatsCollector
+from model_compression_toolkit.common.statistics_collector import BaseStatsContainer
 
 
 def compute_bias_correction_of_graph(graph_co_compute_bias: Graph,
@@ -53,9 +53,9 @@ def compute_bias_correction_of_graph(graph_co_compute_bias: Graph,
     return graph
 
 
-def _compute_bias_correction_per_candidate_qc(node: BaseNode,
+def _compute_bias_correction_per_candidate_qc(node: Node,
                                               fw_info: FrameworkInfo,
-                                              node_in_stats_collector: BaseStatsCollector,
+                                              node_in_stats_collector: BaseStatsContainer,
                                               fw_impl: FrameworkImplementation):
     """
     For each candidate weights quantization configuration of a given node,
@@ -69,9 +69,9 @@ def _compute_bias_correction_per_candidate_qc(node: BaseNode,
 
     """
 
-    if node.is_weights_quantization_enabled():
+    if node.candidates_weights_quantization_cfg is not None:
         for weights_qc in node.candidates_weights_quantization_cfg:
-            if fw_info.in_kernel_ops(node):
+            if fw_info.in_kernel_ops(node) and weights_qc.enable_weights_quantization:
                 quantized_kernel, io_channels_axes = get_quantized_kernel_by_weights_qc(fw_info,
                                                                                         node,
                                                                                         weights_qc,
@@ -93,7 +93,7 @@ def _compute_bias_correction_per_candidate_qc(node: BaseNode,
 
 def _compute_bias_correction(kernel: np.ndarray,
                              quantized_kernel: np.ndarray,
-                             in_statistics_container: BaseStatsCollector,
+                             in_statistics_container: BaseStatsContainer,
                              output_channels_axis: int,
                              input_channels: int) -> Any:
     """
@@ -132,8 +132,8 @@ def _compute_bias_correction(kernel: np.ndarray,
 
 
 def _get_bias_correction_term_of_node(input_channels_axis: int,
-                                      n: BaseNode,
-                                      node_in_stats_collector: BaseStatsCollector,
+                                      n: Node,
+                                      node_in_stats_collector: BaseStatsContainer,
                                       output_channels_axis: int,
                                       quantized_kernel: np.ndarray,
                                       fw_impl: FrameworkImplementation):

model_compression_toolkit/common/collectors/mean_collector.py

@@ -17,7 +17,6 @@
 import numpy as np
 
 from model_compression_toolkit.common.collectors.base_collector import BaseCollector
-from model_compression_toolkit.common.framework_info import ChannelAxis
 
 
 class MeanCollector(BaseCollector):
@@ -27,7 +26,7 @@ class MeanCollector(BaseCollector):
     """
 
     def __init__(self,
-                 axis: ChannelAxis,
+                 axis: int = -1,
                  beta: float = 0.99):
         """
         Instantiate a per channel mean collector using a exponential moving average with bias correction.
@@ -91,7 +90,7 @@ class MeanCollector(BaseCollector):
         """
 
         self.i += 1  # Update the iteration index
-        axis = (len(x.shape) - 1) if self.axis == ChannelAxis.NHWC else self.axis.value  # convert
+        axis = (len(x.shape) - 1) if self.axis == -1 else self.axis  # convert
         n = x.shape[axis]
         transpose_index = [axis, *[i for i in range(len(x.shape)) if i != axis]]
         mu = np.mean(np.reshape(np.transpose(x, transpose_index), [n, -1]), axis=-1)  # compute mean per channel

model_compression_toolkit/common/collectors/min_max_per_channel_collector.py

@@ -16,7 +16,6 @@
 import numpy as np
 
 from model_compression_toolkit.common.collectors.base_collector import BaseCollector
-from model_compression_toolkit.common.framework_info import ChannelAxis
 
 
 class MinMaxPerChannelCollector(BaseCollector):
@@ -25,15 +24,13 @@ class MinMaxPerChannelCollector(BaseCollector):
     """
 
     def __init__(self,
-                 axis: ChannelAxis,
                  init_min_value: float = None,
-                 init_max_value: float = None):
+                 init_max_value: float = None,
+                 axis=-1):
         """
         Instantiate a collector for collecting min/max values of tensor per-channel.
         Args:
             axis: Compute the min/max values with regard to this axis.
-            init_max_value: Initial maximal output value.
-            init_min_value: Initial minimal output value.
         """
         super().__init__()
         self.axis = axis
@@ -130,7 +127,7 @@ class MinMaxPerChannelCollector(BaseCollector):
             x: Tensor that goes through the collector and needs to be considered in the min/max computation.
         """
 
-        axis = (len(x.shape) - 1) if self.axis == ChannelAxis.NHWC else self.axis.NCHW.value  # convert
+        axis = (len(x.shape) - 1) if self.axis == -1 else self.axis  # convert
         n = x.shape[axis]
         transpose_index = [axis, *[i for i in range(len(x.shape)) if i != axis]]
         x_reshape = np.reshape(np.transpose(x, transpose_index), [n, -1])

model_compression_toolkit/common/constants.py

@@ -22,7 +22,6 @@ MULTIPLIER_N_BITS = 8
 # Quantization attributes:
 OUTPUT_SCALE = 'output_scale'
 THRESHOLD = 'threshold'
-SIGNED = 'is_signed'
 CLUSTER_CENTERS = 'cluster_centers'
 SCALE_PER_CHANNEL = 'scale_per_channel'
 

model_compression_toolkit/common/framework_implementation.py

@@ -18,12 +18,10 @@ from typing import Callable, Any, List, Tuple
 import numpy as np
 
 from model_compression_toolkit import common, GradientPTQConfig, MixedPrecisionQuantizationConfig
-from model_compression_toolkit.common import BaseNode
-from model_compression_toolkit.common.collectors.statistics_collector import BaseStatsCollector
+from model_compression_toolkit.common import Node
 from model_compression_toolkit.common.framework_info import FrameworkInfo
 from model_compression_toolkit.common.graph.base_graph import Graph
 from model_compression_toolkit.common.model_builder_mode import ModelBuilderMode
-from model_compression_toolkit.common.node_prior_info import NodePriorInfo
 from model_compression_toolkit.common.quantization.quantization_config import QuantizationConfig
 from model_compression_toolkit.common.user_info import UserInformation
 
@@ -112,14 +110,15 @@ class FrameworkImplementation(ABC):
                              f'framework\'s model_reader method.')
 
     @abstractmethod
-    def attach_sc_to_node(self, node: BaseNode, output_channel_index: int) -> BaseStatsCollector:
+    def attach_sc_to_node(self, node:Node,
+                          fw_info:FrameworkInfo) -> common.statistics_collector.BaseStatsContainer:
         """
         Return a statistics collector that should be attached to a node's output
         during statistics collection.
 
         Args:
             node: Node to return its collector.
-            output_channel_index: Index of output channels (for statistics per-channel).
+            fw_info: FrameworkInfo object with information about the specific framework's model
 
         Returns:
             Statistics collector for the node.
@@ -148,6 +147,7 @@ class FrameworkImplementation(ABC):
         raise NotImplemented(f'{self.__class__.__name__} have to implement the '
                              f'framework\'s get_substitutions_pre_statistics_collection method.')
 
+
     @abstractmethod
     def get_substitutions_pre_build(self) -> List[common.BaseSubstitution]:
         """
@@ -159,8 +159,7 @@ class FrameworkImplementation(ABC):
                              f'framework\'s get_substitutions_pre_build method.')
 
     @abstractmethod
-    def get_substitutions_post_statistics_collection(self, quant_config: QuantizationConfig) -> List[
-        common.BaseSubstitution]:
+    def get_substitutions_post_statistics_collection(self, quant_config:QuantizationConfig) -> List[common.BaseSubstitution]:
         """
         Return a list of the framework substitutions used after we collect statistics.
 
@@ -237,19 +236,4 @@ class FrameworkImplementation(ABC):
         raise NotImplemented(f'{self.__class__.__name__} have to implement the '
                              f'framework\'s get_sensitivity_evaluation_fn method.')
 
-    def get_node_prior_info(self, node: BaseNode,
-                            fw_info: FrameworkInfo) -> NodePriorInfo:
-        """
-        Get a NodePriorInfo object for a node.
-
-        Args:
-            node: Node to get its prior info.
-            fw_info: Framework specific information needed to create the prior info of the node.
-
-        Returns:
-            NodePriorInfo with information about the node.
-        """
-
-        raise NotImplemented(f'{self.__class__.__name__} have to implement the '
-                             f'framework\'s get_node_prior_info method.')
 

model_compression_toolkit/common/framework_info.py

@@ -15,23 +15,10 @@
 
 
 from collections import Callable
-from enum import Enum
 from typing import Dict, Any, List
-
-from model_compression_toolkit.common.graph.functional_node import FunctionalNode
 from model_compression_toolkit.common.quantization.quantization_config import QuantizationMethod
 from model_compression_toolkit.common.defaultdict import DefaultDict
-from model_compression_toolkit.common.graph.base_node import BaseNode
-
-
-class ChannelAxis(Enum):
-    """
-    Index of output channel axis:
-    NHWC - Channels index is last.
-    NCHW - Channels index is 1.
-    """
-    NHWC = -1
-    NCHW = 1
+from model_compression_toolkit.common.graph.node import Node
 
 
 class FrameworkInfo(object):
@@ -45,8 +32,7 @@ class FrameworkInfo(object):
                  kernel_channels_mapping: DefaultDict,
                  activation_min_max_mapping: Dict[str, tuple],
                  layer_min_max_mapping: Dict[Any, tuple],
-                 kernel_ops_attributes_mapping: DefaultDict,
-                 output_channel_index: ChannelAxis):
+                 kernel_ops_attributes_mapping: DefaultDict):
         """
         A class to wrap all information about a specific framework the library needs to quantize a model.
         Specifically, FrameworkInfo holds lists of layers by how they should be quantized, and multiple mappings such as
@@ -66,7 +52,6 @@ class FrameworkInfo(object):
             activation_min_max_mapping (Dict[str, tuple]): Dictionary from an activation function to its min/max output values.
             layer_min_max_mapping (Dict[Any, tuple]): Dictionary from a layer to its min/max output values.
             kernel_ops_attributes_mapping (DefaultDict): Dictionary from a framework operator to a list of its weights attirbutes to quantize.
-            output_channel_index (ChannelAxis): Index of output channels of the model's layers (for computing statistics per-channel).
 
         Examples:
             When quantizing a Keras model, if we want to quantize the kernels of Conv2D layers only, we can
@@ -113,8 +98,6 @@ class FrameworkInfo(object):
         self.activation_min_max_mapping = activation_min_max_mapping
         self.layer_min_max_mapping = layer_min_max_mapping
         self.kernel_ops_attributes_mapping = kernel_ops_attributes_mapping
-        self.output_channel_index = output_channel_index
-
 
     def get_kernel_op_attributes(self, layer_class: Any) -> List[str]:
         """
@@ -141,20 +124,7 @@ class FrameworkInfo(object):
 
         return layer in self.layer_min_max_mapping
 
-    def activation_has_min_max(self, activation_name: str) -> bool:
-        """
-        Check if an activation layer has a min/max mapping.
-
-        Args:
-            activation_name: String of the activation function to check for its min/max values.
-
-        Returns:
-            Whether an activation layer has a min/max known values or not.
-        """
-
-        return activation_name in self.activation_min_max_mapping
-
-    def in_kernel_ops(self, n: BaseNode) -> bool:
+    def in_kernel_ops(self, n: Node) -> bool:
         """
         Check whether a node is in the kernel_ops group or not.
 
@@ -167,7 +137,7 @@ class FrameworkInfo(object):
 
         return n.layer_class in self.kernel_ops
 
-    def in_activation_ops(self, n: BaseNode) -> bool:
+    def in_activation_ops(self, n: Node) -> bool:
         """
         Check whether a node is in the activation group or not.
 
@@ -177,11 +147,10 @@ class FrameworkInfo(object):
         Returns:
             Whether the node is in the activation group or not.
         """
-        if isinstance(n, FunctionalNode):
-            return n.functional_op in self.activation_ops
+
         return n.layer_class in self.activation_ops
 
-    def in_no_quantization_ops(self, n: BaseNode) -> bool:
+    def in_no_quantization_ops(self, n: Node) -> bool:
         """
         Check whether a node is in the no quantization group or not.
 
@@ -191,6 +160,5 @@ class FrameworkInfo(object):
         Returns:
             Whether the node is in the no quantization group or not.
         """
-        if isinstance(n, FunctionalNode):
-            return n.functional_op in self.no_quantization_ops
+
         return n.layer_class in self.no_quantization_ops

model_compression_toolkit/common/graph/__init__.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 # ==============================================================================
 
-from model_compression_toolkit.common.graph.base_node import BaseNode
+from model_compression_toolkit.common.graph.node import Node