Migrate TF Static Quant to 3.x API (#1586)

Signed-off-by: zehao-intel <zehao.huang@intel.com>

neural_compressor/tensorflow/algorithms/__init__.py

@@ -14,4 +14,4 @@
 
 
 from neural_compressor.tensorflow.algorithms.smoother import SmoothQuant
-from neural_compressor.tensorflow.algorithms.static_quant import KerasAdaptor
+from neural_compressor.tensorflow.algorithms.static_quant import KerasAdaptor, TensorFlowAdaptor

neural_compressor/tensorflow/algorithms/static_quant/__init__.py

@@ -13,3 +13,4 @@
 # limitations under the License.
 
 from neural_compressor.tensorflow.algorithms.static_quant.keras import KerasAdaptor
+from neural_compressor.tensorflow.algorithms.static_quant.tensorflow import TensorFlowAdaptor

neural_compressor/tensorflow/algorithms/static_quant/keras.py

@@ -28,19 +28,23 @@
 import yaml
 
 from neural_compressor.common import logger
+from neural_compressor.tensorflow.keras.layers import (
+    DeQuantize,
+    FakeQuant,
+    QAvgPool2D,
+    QConv2D,
+    QDense,
+    QDepthwiseConv2D,
+    QMaxPool2D,
+    QSeparableConv2D,
+    Quantize,
+)
 from neural_compressor.tensorflow.quantization.config import StaticQuantConfig
 from neural_compressor.tensorflow.utils import deep_get, dump_elapsed_time
 
 
 def _add_supported_quantized_objects(custom_objects):
     """Map all the quantized objects."""
-    from .keras_utils.conv2d import QConv2D
-    from .keras_utils.dense import QDense
-    from .keras_utils.depthwise_conv2d import QDepthwiseConv2D
-    from .keras_utils.pool2d import QAvgPool2D, QMaxPool2D
-    from .keras_utils.quantizer import DeQuantize, FakeQuant, Quantize
-    from .keras_utils.separable_conv2d import QSeparableConv2D
-
     custom_objects["Quantize"] = Quantize
     custom_objects["DeQuantize"] = DeQuantize
     custom_objects["FakeQuant"] = FakeQuant