TensorFlow utility refine (intel#1047)

chensuyue · Jul 11, 2022 · 909f22e · 909f22e
1 parent 5032f34
commit 909f22e
Show file tree

Hide file tree

Showing 74 changed files with 206 additions and 117 deletions.
diff --git a/neural_compressor/adaptor/tensorflow.py b/neural_compressor/adaptor/tensorflow.py
@@ -252,7 +252,7 @@ def evaluate(self, model, dataloader, postprocess=None,
             logger.info("Rank {!s} dataloaders' data distribution balance check for evaluation have been finnished." \
                 .format(hvd.allgather_object(hvd.rank())))
         if tensorboard:
-            from .tf_utils.graph_rewriter.graph_util import GraphAnalyzer
+            from .tf_utils.graph_util import GraphAnalyzer
             from tensorflow.python.framework import tensor_util
 
             output_postfix = "_fp32.output"
@@ -732,7 +732,7 @@ def _query_quantizable_ops(self, matched_nodes):
     def filter_unquantizable_concat(self, matched_nodes):
         target_concat_nodes = [i[0] for i in matched_nodes if i[-1][0] == 'ConcatV2']
         from neural_compressor.adaptor.tf_utils.util import GraphAnalyzer
-        from .tf_utils.graph_rewriter.graph_util import GraphRewriterHelper
+        from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper
 
         g = GraphAnalyzer()
         g.graph = self.pre_optimized_model.graph_def
@@ -821,7 +821,7 @@ def check_match(patterns, input_pattern):
         return capability
 
     def set_tensor(self, model, tensor_dict):
-        from .tf_utils.graph_rewriter.graph_util import GraphAnalyzer
+        from .tf_utils.graph_util import GraphAnalyzer
         g = GraphAnalyzer()
         g.graph = model.graph_def
         graph_info = g.parse_graph()
@@ -845,7 +845,7 @@ def _get_fp32_op_name(model, tensor_name):
 
             return is_weight, is_biasadd, current_node_name, last_node_name
 
-        from neural_compressor.adaptor.tf_utils.graph_rewriter.graph_util import GraphRewriterHelper as Helper
+        from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
         from tensorflow.python.framework import dtypes
         from tensorflow.python.framework import tensor_util
         from tensorflow.core.framework import attr_value_pb2
@@ -908,7 +908,7 @@ def _get_fp32_op_name(model, tensor_name):
                         tensor_content.transpose(2,3,1,0), dtypes.float32)
                 min_filter_node = graph_info[current_node.input[5]].node
                 per_channel = True if min_filter_node.attr['value'].tensor.tensor_shape else False
-                from .tf_utils.quantize_graph.quantize_graph_common import QuantizeGraphHelper
+                from .tf_utils.quantize_graph_common import QuantizeGraphHelper
                 original_fp32_op = current_node.op.split("With")[0].split("Quantized")[-1]
                 if original_fp32_op.find("Depthwise") != -1:
                     original_fp32_op = "DepthwiseConv2dNative"
@@ -1001,7 +1001,7 @@ def quantize_input(self, model):
         quantize_node_outputs = [node for node in graph_def.node
                                  if quantize_node.name in node.input]
 
-        from .tf_utils.graph_rewriter.graph_util import GraphRewriterHelper
+        from .tf_utils.graph_util import GraphRewriterHelper
         if quantize_node_input.op == 'Pad':
             pad_node_input = node_name_mapping[quantize_node_input.input[0]]
             assert pad_node_input.op == 'Placeholder', \

diff --git a/neural_compressor/adaptor/tf_utils/graph_converter.py b/neural_compressor/adaptor/tf_utils/graph_converter.py
@@ -40,10 +40,10 @@
 from .util import iterator_sess_run,version1_gt_version2,version1_eq_version2,version1_lt_version2
 from .util import version1_gte_version2,version1_lte_version2
 from .quantize_graph.quantize_graph_for_intel_cpu import QuantizeGraphForIntel
-from .quantize_graph.quantize_graph_common import QuantizeGraphHelper
+from .quantize_graph_common import QuantizeGraphHelper
 from .quantize_graph.quantize_graph_conv import FuseNodeStartWithConv2d
 
-from .graph_rewriter.graph_util import GraphAnalyzer
+from .graph_util import GraphAnalyzer
 from .graph_rewriter.generic.remove_training_nodes import RemoveTrainingNodesOptimizer
 from .graph_rewriter.generic.strip_unused_nodes import StripUnusedNodesOptimizer
 from .graph_rewriter.generic.fold_batch_norm import FoldBatchNormNodesOptimizer
@@ -62,7 +62,7 @@
 from .graph_rewriter.int8.rnn_convert import QuantizedRNNConverter
 from .graph_rewriter.itex.itex_convert import GenerateITEXModel
 from neural_compressor.adaptor.tf_utils.graph_rewriter.generic.insert_print_node import InsertPrintMinMaxNode
-from neural_compressor.adaptor.tf_utils.graph_rewriter.graph_util import GraphRewriterHelper as Helper
+from .graph_util import GraphRewriterHelper as Helper
 
 
 TF_SUPPORTED_MAX_VERSION = '2.9.1'

diff --git a/neural_compressor/adaptor/tf_utils/graph_converter_without_calib.py b/neural_compressor/adaptor/tf_utils/graph_converter_without_calib.py
@@ -27,9 +27,9 @@
 from .transform_graph.rerange_quantized_concat import RerangeQuantizedConcat
 from .transform_graph.bias_correction import BiasCorrection
 from .quantize_graph.quantize_graph_for_intel_cpu import QuantizeGraphForIntel
-from .quantize_graph.quantize_graph_common import QuantizeGraphHelper
+from .quantize_graph_common import QuantizeGraphHelper
 
-from .graph_rewriter.graph_util import GraphAnalyzer
+from .graph_util import GraphAnalyzer
 from .graph_rewriter.generic.remove_training_nodes import RemoveTrainingNodesOptimizer
 from .graph_rewriter.generic.strip_unused_nodes import StripUnusedNodesOptimizer
 from .graph_rewriter.generic.fold_batch_norm import FoldBatchNormNodesOptimizer

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/bf16/bf16_convert.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/bf16/bf16_convert.py
@@ -29,8 +29,8 @@
 from tensorflow.python.framework.kernels import get_registered_kernels_for_op
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from ..generic.graph_cse_optimizer import GraphCseOptimizer
 
 DT_FLOAT32  = attr_value_pb2.AttrValue(type=dtypes.float32.as_datatype_enum)

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/convert_add_to_biasadd.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/convert_add_to_biasadd.py
@@ -20,8 +20,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from tensorflow.python.framework import tensor_util
 
 class ConvertAddToBiasAddOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/convert_leakyrelu.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/convert_leakyrelu.py
@@ -20,8 +20,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 
 class ConvertLeakyReluOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/convert_nan_to_random.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/convert_nan_to_random.py
@@ -17,7 +17,7 @@
 
 import numpy as np
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_util
 from tensorflow.core.framework import attr_value_pb2

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/dummy_biasadd.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/dummy_biasadd.py
@@ -20,8 +20,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from neural_compressor.adaptor.tf_utils.util import version1_gt_version2
 
 

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/expanddims_optimizer.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/expanddims_optimizer.py
@@ -18,8 +18,8 @@
 
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from neural_compressor.utils.utility import dump_elapsed_time
 from tensorflow.python.framework import dtypes
 import numpy as np

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fetch_weight_from_reshape.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fetch_weight_from_reshape.py
@@ -18,8 +18,8 @@
 
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from neural_compressor.utils.utility import dump_elapsed_time
 from tensorflow.python.framework import dtypes
 import numpy as np
@@ -80,4 +80,4 @@ def do_transformation(self):
                 cur_graph.remove_node(shape_node.name)
                 cur_graph.remove_node(pack_node.name)
 
-        return cur_graph.dump_graph()
+        return cur_graph.dump_graph()
diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fold_batch_norm.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fold_batch_norm.py
@@ -24,8 +24,8 @@
 
 from neural_compressor.utils.utility import dump_elapsed_time
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 class FoldBatchNormNodesOptimizer(GraphRewriterBase):
     INPUT_ORDER = {

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fold_constant.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fold_constant.py
@@ -22,7 +22,7 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer, GraphRewriterHelper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer, GraphRewriterHelper
 
 
 class GraphFoldConstantOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_biasadd_add.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_biasadd_add.py
@@ -17,8 +17,8 @@
 
 import tensorflow as tf
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_util
 

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_column_wise_mul.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_column_wise_mul.py
@@ -22,8 +22,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 class FuseColumnWiseMulOptimizer(GraphRewriterBase):
     """Fuse Mul op into Conv2D/DepthwiseConv2dNative/MatMul

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_conv_with_math.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_conv_with_math.py
@@ -21,8 +21,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 
 class FuseConvWithMathOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_gelu.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_gelu.py
@@ -17,8 +17,8 @@
 
 import tensorflow as tf
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from tensorflow.python.framework import dtypes
 
 

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_pad_with_conv.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_pad_with_conv.py
@@ -19,8 +19,8 @@
 from tensorflow.python.framework import tensor_util
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from neural_compressor.adaptor.tf_utils.util import version1_gt_version2
 
 class FusePadWithConv2DOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_pad_with_fp32_conv.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_pad_with_fp32_conv.py
@@ -19,8 +19,8 @@
 from tensorflow.python.framework import tensor_util
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 from neural_compressor.adaptor.tf_utils.util import version1_gt_version2
 
 class FusePadWithFP32Conv2DOptimizer(GraphRewriterBase):
@@ -84,4 +84,4 @@ def do_transformation(self):
                 Helper.set_attr_string(conv_node, 'padding', b'EXPLICIT')
                 Helper.set_attr_int_list(conv_node, "explicit_paddings", padding_tensor)
 
-        return cur_graph.dump_graph()
+        return cur_graph.dump_graph()
diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_reshape_transpose.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/fuse_reshape_transpose.py
@@ -21,8 +21,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 
 class FuseTransposeReshapeOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/graph_cse_optimizer.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/graph_cse_optimizer.py
@@ -20,8 +20,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 
 class GraphCseOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/insert_print_node.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/insert_print_node.py
@@ -20,8 +20,8 @@
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import tensor_util as tu
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 
 class InsertPrintMinMaxNode(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/move_squeeze_after_relu.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/move_squeeze_after_relu.py
@@ -18,7 +18,7 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
 
 
 class MoveSqueezeAfterReluOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/pre_optimize.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/pre_optimize.py
@@ -17,7 +17,7 @@
 
 
 import logging
-from neural_compressor.adaptor.tf_utils.graph_rewriter.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
 from neural_compressor.utils.utility import dump_elapsed_time
 from .fuse_column_wise_mul import FuseColumnWiseMulOptimizer
 from .remove_training_nodes import RemoveTrainingNodesOptimizer

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/remove_training_nodes.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/remove_training_nodes.py
@@ -18,7 +18,7 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
 
 
 class RemoveTrainingNodesOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/rename_batch_norm.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/rename_batch_norm.py
@@ -24,8 +24,8 @@
 
 from neural_compressor.utils.utility import dump_elapsed_time
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 class RenameBatchNormOptimizer(GraphRewriterBase):
     @dump_elapsed_time("Pass RenameBatchNormOptimizer")

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/split_shared_input.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/split_shared_input.py
@@ -20,8 +20,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 
 class SplitSharedInputOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/switch_optimizer.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/switch_optimizer.py
@@ -18,7 +18,7 @@
 
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
 from neural_compressor.utils.utility import dump_elapsed_time
 from tensorflow.python.framework import tensor_util
 

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/update_enter.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/generic/update_enter.py
@@ -18,7 +18,7 @@
 
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
 from neural_compressor.utils.utility import dump_elapsed_time
 
 

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/int8/freeze_fake_quant.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/int8/freeze_fake_quant.py
@@ -19,8 +19,8 @@
 from neural_compressor.utils.utility import dump_elapsed_time
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper
 from tensorflow.python.framework import dtypes
 
 class FreezeFakeQuantOpOptimizer(GraphRewriterBase):

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/int8/freeze_value.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/int8/freeze_value.py
@@ -22,8 +22,8 @@
 from tensorflow.python.framework import dtypes
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 import numpy as np
 import re

diff --git a/neural_compressor/adaptor/tf_utils/graph_rewriter/int8/freeze_value_without_calib.py b/neural_compressor/adaptor/tf_utils/graph_rewriter/int8/freeze_value_without_calib.py
@@ -22,8 +22,8 @@
 from tensorflow.python.framework import dtypes
 
 from ..graph_base import GraphRewriterBase
-from ..graph_util import GraphAnalyzer
-from ..graph_util import GraphRewriterHelper as Helper
+from neural_compressor.adaptor.tf_utils.graph_util import GraphAnalyzer
+from neural_compressor.adaptor.tf_utils.graph_util import GraphRewriterHelper as Helper
 
 class FreezeValueWithoutCalibTransformer(GraphRewriterBase):
     def __init__(self, model, max_min_data, postfix, th=0.95, device='gpu'):