Address PR comments

Author: jignparm

tf2onnx/tfonnx.py

@@ -65,15 +65,11 @@ def rewrite_constant_fold(g, ops):
             if set(op.output) & set(g.outputs): continue
             try:
                 inputs = []
-                skip = False
                 for node in op.inputs:
                     if not node.is_const():
-                        skip = True
                         break
                     inputs.append(node.get_tensor_value(as_list=False))
 
-                if skip: continue
-
                 logger.debug("op name %s, %s, %s", op.name, len(op.input), len(inputs))
                 if inputs and len(op.input) == len(inputs):
                     logger.info("folding node type=%s, name=%s" % (op.type, op.name))
@@ -453,14 +449,14 @@ def compat_handler(ctx, node, **kwargs):
 
     # pre-processing graph rewrites
     # bi-directional re-writer should be placed after single directional re-writer
-    rewriters = [rewrite_quantize_and_dequantize, rewrite_transpose, rewrite_flatten, rewrite_gemm,
-                 rewrite_random_uniform, rewrite_random_uniform_fold_const,
+    rewriters = [rewrite_constant_fold, rewrite_quantize_and_dequantize, rewrite_transpose, rewrite_flatten,
+                 rewrite_gemm, rewrite_random_uniform, rewrite_random_uniform_fold_const,
                  rewrite_random_normal, rewrite_dropout, rewrite_eye,
                  rewrite_leakyrelu, rewrite_thresholded_relu, rewrite_conv2d_with_pad,
                  rewrite_single_direction_lstm, rewrite_bi_direction_lstm,
                  rewrite_single_direction_gru, rewrite_bi_direction_gru,
                  rewrite_custom_rnn_cell, rewrite_generic_loop, rewrite_cond,
-                 rewrite_biasadd_with_conv2d, rewrite_constant_fold
+                 rewrite_biasadd_with_conv2d,
                  ]
 
     if custom_rewriter is not None: