mct-nightly 1.8.0.22042023.post414__py3-none-any.whl → 1.8.0.22052023.post408__py3-none-any.whl

model_compression_toolkit/qat/pytorch/quantizer/ste_rounding/symmetric_ste.py

@@ -18,12 +18,13 @@ import numpy as np
 import torch
 import torch.nn as nn
 
+from model_compression_toolkit.qat import TrainingMethod
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.qat.common import THRESHOLD_TENSOR
-from model_compression_toolkit import quantizers_infrastructure as qi, TrainingMethod
+from model_compression_toolkit import quantizers_infrastructure as qi, constants as C
 from model_compression_toolkit.qat.pytorch.quantizer.base_pytorch_qat_quantizer import BasePytorchQATTrainableQuantizer
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer
-from model_compression_toolkit.core.common import constants as C
+
 from model_compression_toolkit.core.pytorch.utils import to_torch_tensor
 from model_compression_toolkit.qat.pytorch.quantizer.quantizer_utils import ste_round, ste_clip, symmetric_quantizer
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.pytorch.quantizers import \

model_compression_toolkit/qat/pytorch/quantizer/ste_rounding/uniform_ste.py

@@ -17,11 +17,13 @@ import torch
 import torch.nn as nn
 from torch import Tensor
 
-from model_compression_toolkit.core.common.constants import RANGE_MAX, RANGE_MIN
+from model_compression_toolkit.constants import RANGE_MAX, RANGE_MIN
+from model_compression_toolkit.quantizers_infrastructure.constants import FQ_MIN, FQ_MAX
+
+from model_compression_toolkit.qat import TrainingMethod
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
-from model_compression_toolkit.qat.common.constants import FQ_MIN, FQ_MAX
-from model_compression_toolkit.core.common import constants as C
-from model_compression_toolkit import quantizers_infrastructure as qi, TrainingMethod
+from model_compression_toolkit import quantizers_infrastructure as qi, constants as C
+
 from model_compression_toolkit.qat.pytorch.quantizer.base_pytorch_qat_quantizer import BasePytorchQATTrainableQuantizer
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer
 from model_compression_toolkit.core.pytorch.utils import to_torch_tensor

model_compression_toolkit/quantizers_infrastructure/__init__.py

@@ -14,10 +14,10 @@
 # ==============================================================================
 
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import QuantizationTarget, BaseInferableQuantizer
-from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.trainable_quantizer_config import \
-    TrainableQuantizerWeightsConfig, TrainableQuantizerActivationConfig
+from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.trainable_quantizer_config import TrainableQuantizerWeightsConfig, TrainableQuantizerActivationConfig
 from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.keras.base_keras_quantizer import BaseKerasTrainableQuantizer
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.keras.load_model import keras_load_quantized_model
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.keras.quantize_wrapper import KerasQuantizationWrapper
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.pytorch.quantize_wrapper import PytorchQuantizationWrapper
+from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.keras.activation_quantization_holder import ActivationQuantizationHolder
 

model_compression_toolkit/{qat/common → quantizers_infrastructure}/constants.py

@@ -1,4 +1,4 @@
-# Copyright 2022 Sony Semiconductor Israel, Inc. All rights reserved.
+# Copyright 2023 Sony Semiconductor Israel, Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
+# Quantizers constants (for GPTQ, QAT, etc.)
 FQ_MIN = "min"
 FQ_MAX = "max"
 THRESHOLD_TENSOR = "ptq_threshold_tensor"

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/common/constants.py

@@ -15,7 +15,12 @@
 
 IS_WEIGHTS = "is_weights"
 IS_ACTIVATIONS = "is_activations"
+
+# In KerasQuantizationWrapper and PytorchQuantizationWrapper multiple quantizers are kept
 ACTIVATION_QUANTIZERS = "activation_quantizers"
+# In ActivationQuantizationHolder only one quantizer is used thus a new attribute name is needed
+ACTIVATION_HOLDER_QUANTIZER = "activation_holder_quantizer"
+
 WEIGHTS_QUANTIZERS = "weights_quantizer"
 WEIGHTS_QUANTIZATION_METHOD = 'weights_quantization_method'
 WEIGHTS_N_BITS = 'weights_n_bits'

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/common/get_quantizers.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 
-from model_compression_toolkit.core.common import Logger
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure import QuantizationTarget
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.constants import QUANTIZATION_TARGET, \

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/activation_quantization_holder.py

@@ -0,0 +1,147 @@
+# Copyright 2023 Sony Semiconductor Israel, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+
+from model_compression_toolkit.constants import FOUND_TF
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.quantizers_infrastructure import BaseInferableQuantizer, BaseKerasTrainableQuantizer
+from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.constants import \
+    ACTIVATION_HOLDER_QUANTIZER, TRAINING, STEPS
+
+if FOUND_TF:
+    import tensorflow as tf
+    from keras.utils import tf_inspect
+    from tensorflow_model_optimization.python.core.keras import utils
+
+    def _make_quantizer_fn(quantizer, x, training):
+        """Use currying to return True/False specialized fns to the cond."""
+
+        def quantizer_fn():
+            return quantizer(x, training)
+
+        return quantizer_fn
+
+    keras = tf.keras
+
+    class ActivationQuantizationHolder(keras.layers.Layer):
+        """
+        Keras layer to hold an activation quantizer and quantize during inference.
+        """
+        def __init__(self,
+                     activation_holder_quantizer: BaseInferableQuantizer,
+                     **kwargs):
+            """
+
+            Args:
+                activation_holder_quantizer: Quantizer to use during inference.
+                **kwargs: Key-word arguments for the base layer
+            """
+
+            super(ActivationQuantizationHolder, self).__init__(**kwargs)
+            self.activation_holder_quantizer = activation_holder_quantizer
+
+        def get_config(self):
+            """
+            Returns: Configuration of ActivationQuantizationHolder.
+
+            """
+            base_config = super(ActivationQuantizationHolder, self).get_config()
+            config = {
+                ACTIVATION_HOLDER_QUANTIZER: keras.utils.serialize_keras_object(self.activation_holder_quantizer)}
+
+            return dict(list(base_config.items()) + list(config.items()))
+
+        @classmethod
+        def from_config(cls, config):
+            """
+
+            Args:
+                config(dict): dictionary  of ActivationQuantizationHolder Configuration
+
+            Returns: A ActivationQuantizationHolder object
+
+            """
+            config = config.copy()
+            activation_holder_quantizer = keras.utils.deserialize_keras_object(config.pop(ACTIVATION_HOLDER_QUANTIZER),
+                                                                               module_objects=globals(),
+                                                                               custom_objects=None)
+
+            return cls(activation_holder_quantizer=activation_holder_quantizer,
+                       **config)
+
+        def build(self, input_shape):
+            """
+            ActivationQuantizationHolder build function.
+            Args:
+                input_shape: the layer input shape
+
+            Returns: None
+
+            """
+            super(ActivationQuantizationHolder, self).build(input_shape)
+
+            self.optimizer_step = self.add_weight(
+                STEPS,
+                initializer=tf.keras.initializers.Constant(-1),
+                dtype=tf.dtypes.int32,
+                trainable=False)
+
+            self.activation_holder_quantizer.initialize_quantization(None,
+                                                                     self.name + '/out_',
+                                                                     self)
+
+        def call(self,
+                 inputs: tf.Tensor,
+                 training=None) -> tf.Tensor:
+            """
+            Quantizes the input tensor using the activation quantizer the ActivationQuantizationHolder holds.
+
+            Args:
+                inputs: Input tensors to quantize use the activation quantizer the object holds
+                training: a boolean stating if layer is in training mode.
+
+            Returns: Output of the activation quantizer (quantized input tensor).
+
+            """
+            if training is None:
+                training = tf.keras.backend.learning_phase()
+
+            activation_quantizer_args_spec = tf_inspect.getfullargspec(self.activation_holder_quantizer.__call__).args
+            if TRAINING in activation_quantizer_args_spec:
+                return utils.smart_cond(
+                    training,
+                    _make_quantizer_fn(self.activation_holder_quantizer, inputs, True),
+                    _make_quantizer_fn(self.activation_holder_quantizer, inputs, False))
+
+            return self.activation_holder_quantizer(inputs)
+
+        def convert_to_inferable_quantizers(self):
+            """
+            Convert layer's quantizer to inferable quantizer.
+
+            Returns:
+                None
+            """
+            if isinstance(self.activation_holder_quantizer, BaseKerasTrainableQuantizer):
+                self.activation_holder_quantizer = self.activation_holder_quantizer.convert2inferable()
+
+
+
+
+else:
+    class ActivationQuantizationHolder:  # pragma: no cover
+        def __init__(self, *args, **kwargs):
+            Logger.error('Installing tensorflow and tensorflow_model_optimization is mandatory '
+                         'when using ActivationQuantizationHolder. '
+                         'Could not find Tensorflow package.')

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/load_model.py

@@ -12,17 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from model_compression_toolkit.core.common import Logger
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.get_all_subclasses import get_all_subclasses
 
 if FOUND_TF:
     import tensorflow as tf
     from model_compression_toolkit import quantizers_infrastructure as qi
     from model_compression_toolkit.quantizers_infrastructure import BaseKerasTrainableQuantizer
-    from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.keras.quantizers.base_keras_inferable_quantizer \
-        import \
-        BaseKerasInferableQuantizer
+    from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.keras.quantizers.base_keras_inferable_quantizer import BaseKerasInferableQuantizer
     keras = tf.keras
 
     def keras_load_quantized_model(filepath, custom_objects=None, compile=True, options=None):
@@ -57,6 +55,8 @@ if FOUND_TF:
 
         # Add non-quantizers custom objects
         qi_custom_objects.update({qi.KerasQuantizationWrapper.__name__: qi.KerasQuantizationWrapper})
+        qi_custom_objects.update({qi.ActivationQuantizationHolder.__name__: qi.ActivationQuantizationHolder})
+
         if custom_objects is not None:
             qi_custom_objects.update(custom_objects)
         return tf.keras.models.load_model(filepath,

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantize_wrapper.py

@@ -14,8 +14,8 @@
 # ==============================================================================
 from typing import Dict, List, Any, Tuple
 from model_compression_toolkit import quantizers_infrastructure as qi
-from model_compression_toolkit.core.common.constants import FOUND_TF
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.constants import FOUND_TF
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.quantizers_infrastructure import BaseInferableQuantizer
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.constants import WEIGHTS_QUANTIZERS, ACTIVATION_QUANTIZERS, LAYER, STEPS, TRAINING
 

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/activation_inferable_quantizers/activation_lut_pot_inferable_quantizer.py

@@ -17,8 +17,8 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.logger import Logger
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.constants import FOUND_TF
 
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure import QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/activation_inferable_quantizers/activation_pot_inferable_quantizer.py

@@ -16,8 +16,8 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.logger import Logger
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.constants import FOUND_TF
 
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure import QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/activation_inferable_quantizers/activation_symmetric_inferable_quantizer.py

@@ -16,7 +16,7 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.constants import FOUND_TF
 
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/activation_inferable_quantizers/activation_uniform_inferable_quantizer.py

@@ -16,8 +16,8 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.logger import Logger
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.logger import Logger
+from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure import QuantizationTarget
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/base_keras_inferable_quantizer.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 from abc import abstractmethod
 
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.quantizers_infrastructure import BaseInferableQuantizer
 
 if FOUND_TF:

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/weights_inferable_quantizers/weights_lut_pot_inferable_quantizer.py

@@ -16,7 +16,7 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \
     QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/weights_inferable_quantizers/weights_lut_symmetric_inferable_quantizer.py

@@ -17,7 +17,7 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \
     QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/weights_inferable_quantizers/weights_pot_inferable_quantizer.py

@@ -16,7 +16,7 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, QuantizationTarget
 

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/weights_inferable_quantizers/weights_symmetric_inferable_quantizer.py

@@ -16,7 +16,7 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.constants import FOUND_TF
 
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/quantizers/weights_inferable_quantizers/weights_uniform_inferable_quantizer.py

@@ -16,7 +16,7 @@ from typing import List
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TF
+from model_compression_toolkit.constants import FOUND_TF
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, QuantizationTarget
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.quant_utils import \

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/keras/validation_functions.py

@@ -16,7 +16,7 @@ from typing import Any
 
 import numpy as np
 
-from model_compression_toolkit.core.common import Logger
+from model_compression_toolkit.logger import Logger
 
 
 def validate_uniform_min_max_ranges(min_range: Any, max_range: Any) -> None:

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantize_wrapper.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 # ==============================================================================f
 from typing import List, Union, Any, Dict, Tuple
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.constants import FOUND_TORCH
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.quantizers_infrastructure import BaseInferableQuantizer
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.constants import LAYER, TRAINING
 import inspect

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/activation_inferable_quantizers/activation_lut_pot_inferable_quantizer.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer \
     import mark_quantizer, QuantizationTarget
@@ -85,7 +85,6 @@ if FOUND_TORCH:
             Returns:
                 quantized tensor.
             """
-            inputs.requires_grad = False
             return lut_quantizer(inputs, cluster_centers=self.cluster_centers, signed=self.signed,
                                  threshold=self.threshold, multiplier_n_bits=self.multiplier_n_bits, eps=self.eps)
 

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/activation_inferable_quantizers/activation_pot_inferable_quantizer.py

@@ -15,7 +15,7 @@
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \
     QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/activation_inferable_quantizers/activation_symmetric_inferable_quantizer.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \
     QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/activation_inferable_quantizers/activation_uniform_inferable_quantizer.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \
     QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/base_lut_symmetric_inferable_quantizer.py

@@ -15,7 +15,7 @@
 import numpy as np
 import warnings
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer \
     import mark_quantizer

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/base_pytorch_inferable_quantizer.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 from abc import abstractmethod
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.quantizers_infrastructure import BaseInferableQuantizer
 
 if FOUND_TORCH:

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/base_symmetric_inferable_quantizer.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer
 

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/base_uniform_inferable_quantizer.py

@@ -14,7 +14,7 @@
 # ==============================================================================
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer
 

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/weights_inferable_quantizers/weights_lut_pot_inferable_quantizer.py

@@ -15,7 +15,7 @@
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer \
     import mark_quantizer, QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/weights_inferable_quantizers/weights_lut_symmetric_inferable_quantizer.py

@@ -15,7 +15,7 @@
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer \
     import mark_quantizer, \

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/weights_inferable_quantizers/weights_pot_inferable_quantizer.py

@@ -15,7 +15,7 @@
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \
     QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/weights_inferable_quantizers/weights_symmetric_inferable_quantizer.py

@@ -15,7 +15,7 @@
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
+from model_compression_toolkit.constants import FOUND_TORCH
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import mark_quantizer, \
     QuantizationTarget

model_compression_toolkit/quantizers_infrastructure/inferable_infrastructure/pytorch/quantizers/weights_inferable_quantizers/weights_uniform_inferable_quantizer.py

@@ -15,8 +15,8 @@
 
 import numpy as np
 
-from model_compression_toolkit.core.common.constants import FOUND_TORCH
-from model_compression_toolkit.core.common.logger import Logger
+from model_compression_toolkit.constants import FOUND_TORCH
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.target_platform_capabilities.target_platform import QuantizationMethod
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import QuantizationTarget, \
     mark_quantizer

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/common/base_trainable_quantizer.py

@@ -18,7 +18,7 @@ from typing import Union, List, Any
 from inspect import signature
 
 from model_compression_toolkit.core import common
-from model_compression_toolkit.core.common import Logger
+from model_compression_toolkit.logger import Logger
 
 from model_compression_toolkit.quantizers_infrastructure.inferable_infrastructure.common.base_inferable_quantizer import BaseInferableQuantizer, \
     QuantizationTarget
@@ -55,9 +55,9 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
         for i, (k, v) in enumerate(self.get_sig().parameters.items()):
             if i == 0:
                 if v.annotation not in [TrainableQuantizerWeightsConfig, TrainableQuantizerActivationConfig]:
-                    common.Logger.error(f"First parameter must be either TrainableQuantizerWeightsConfig or TrainableQuantizerActivationConfig")  # pragma: no cover
+                    Logger.error(f"First parameter must be either TrainableQuantizerWeightsConfig or TrainableQuantizerActivationConfig")  # pragma: no cover
             elif v.default is v.empty:
-                common.Logger.error(f"Parameter {k} doesn't have a default value")  # pragma: no cover
+                Logger.error(f"Parameter {k} doesn't have a default value")  # pragma: no cover
 
         super(BaseTrainableQuantizer, self).__init__()
         self.quantization_config = quantization_config
@@ -73,15 +73,15 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
         if static_quantization_target == QuantizationTarget.Weights:
             self.validate_weights()
             if self.quantization_config.weights_quantization_method not in static_quantization_method:
-                common.Logger.error(
+                Logger.error(
                     f'Quantization method mismatch expected: {static_quantization_method} and got  {self.quantization_config.weights_quantization_method}')
         elif static_quantization_target == QuantizationTarget.Activation:
             self.validate_activation()
             if self.quantization_config.activation_quantization_method not in static_quantization_method:
-                common.Logger.error(
+                Logger.error(
                     f'Quantization method mismatch expected: {static_quantization_method} and got  {self.quantization_config.activation_quantization_method}')
         else:
-            common.Logger.error(
+            Logger.error(
                 f'Unknown Quantization Part:{static_quantization_target}')  # pragma: no cover
 
         self.quantizer_parameters = {}
@@ -145,7 +145,7 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
 
         """
         if self.activation_quantization() or not self.weights_quantization():
-            common.Logger.error(f'Expect weight quantization got activation')
+            Logger.error(f'Expect weight quantization got activation')
 
     def validate_activation(self) -> None:
         """
@@ -153,7 +153,7 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
 
         """
         if not self.activation_quantization() or self.weights_quantization():
-            common.Logger.error(f'Expect activation quantization got weight')
+            Logger.error(f'Expect activation quantization got weight')
 
     def convert2inferable(self) -> BaseInferableQuantizer:
         """
@@ -183,7 +183,7 @@ class BaseTrainableQuantizer(BaseInferableQuantizer):
         if name in self.quantizer_parameters:
             return self.quantizer_parameters[name][VAR]
         else:
-            common.Logger.error(f'Variable {name} is not exist in quantizers parameters!') # pragma: no cover
+            Logger.error(f'Variable {name} is not exist in quantizers parameters!') # pragma: no cover
 
 
     @abstractmethod

model_compression_toolkit/quantizers_infrastructure/trainable_infrastructure/common/get_quantizer_config.py

@@ -13,7 +13,8 @@
 # limitations under the License.
 # ==============================================================================
 from typing import List
-from model_compression_toolkit.core.common import BaseNode, Logger
+from model_compression_toolkit.core.common import BaseNode
+from model_compression_toolkit.logger import Logger
 from model_compression_toolkit.quantizers_infrastructure.trainable_infrastructure.common.trainable_quantizer_config import \
     TrainableQuantizerWeightsConfig, TrainableQuantizerActivationConfig, TrainableQuantizerCandidateConfig