TF support version detection update (#947)

Author: zehao-intel

README.md

@@ -100,9 +100,9 @@ Intel® Neural Compressor supports systems based on [Intel 64 architecture or co
 <tbody>
   <tr align="center">
     <th>Version</th>
-    <td class="tg-7zrl"><a href=https://github.com/tensorflow/tensorflow/tree/v2.8.0>2.8.0</a><br>
-    <a href=https://github.com/tensorflow/tensorflow/tree/v2.7.0>2.7.0</a><br>
-    <a href=https://github.com/tensorflow/tensorflow/tree/v2.6.2>2.6.2</a></td>
+    <td class="tg-7zrl"><a href=https://github.com/tensorflow/tensorflow/tree/v2.9.1>2.9.1</a><br>
+    <a href=https://github.com/tensorflow/tensorflow/tree/v2.8.2>2.8.2</a><br>
+    <a href=https://github.com/tensorflow/tensorflow/tree/v2.7.3>2.7.3</a><br>
     <td class="tg-7zrl"><a href=https://github.com/Intel-tensorflow/tensorflow/tree/v2.8.0>2.8.0</a><br>
     <a href=https://github.com/Intel-tensorflow/tensorflow/tree/v2.7.0>2.7.0</a><br>
     <a href=https://github.com/Intel-tensorflow/tensorflow/tree/v1.15.0up3>1.15.0UP3</a></td>
@@ -122,7 +122,8 @@ Intel® Neural Compressor supports systems based on [Intel 64 architecture or co
 </tbody>
 </table>
 
-> Note: Starting from official TensorFlow 2.6.0, oneDNN has been default in the binary. Please set the environment variable TF_ENABLE_ONEDNN_OPTS=1 before running the quantization process or deploying the quantized model with official TensorFlow.
+> Note: 1.Starting from official TensorFlow 2.6.0, oneDNN has been default in the binary. Please set the environment variable TF_ENABLE_ONEDNN_OPTS=1 to enable the oneDNN optimizations.  
+> 2.Starting from official TensorFlow 2.9.0, oneDNN optimizations are enabled by default on CPUs with neural-network-focused hardware features such as AVX512_VNNI, AVX512_BF16, AMX, etc. No need to set environment variable.
 
 ### Validated Models
 Intel® Neural Compressor validated 420+ [examples](./examples) with performance speedup geomean 2.2x and up to 4.2x on VNNI while minimizing the accuracy loss. 

neural_compressor/adaptor/tf_utils/graph_converter.py

@@ -21,6 +21,7 @@
 import logging
 import tempfile
 import tensorflow as tf
+
 from collections import OrderedDict, UserDict
 from tensorflow.core.framework import graph_pb2
 from tensorflow.python.framework import tensor_util
@@ -62,7 +63,7 @@
 from neural_compressor.adaptor.tf_utils.graph_rewriter.graph_util import GraphRewriterHelper as Helper
 
 
-TF_SUPPORTED_MAX_VERSION = '2.8.0'
+TF_SUPPORTED_MAX_VERSION = '2.9.1'
 TF_SUPPORTED_MIN_VERSION = '1.14.0'
 
 logger = logging.getLogger()
@@ -200,6 +201,9 @@ def _check_tf_version(self):
             if tf.version.VERSION >= '2.6.0' and os.getenv('TF_ENABLE_ONEDNN_OPTS') == '1':
                 is_supported_version = True
 
+            if tf.version.VERSION >= '2.9.0':
+                is_supported_version = True
+
         except Exception as e:
             raise ValueError(e)
         finally:
@@ -213,11 +217,12 @@ def _check_tf_version(self):
                                                                      TF_SUPPORTED_MAX_VERSION))
             if tf.version.VERSION == '2.5.0' and os.getenv('TF_ENABLE_MKL_NATIVE_FORMAT') != '0':
                 logger.fatal("Please set environment variable TF_ENABLE_MKL_NATIVE_FORMAT=0 "
-                             "when Tensorflow 2.5.0 installed.")
+                             "when TensorFlow 2.5.0 installed.")
 
-            if tf.version.VERSION >= '2.6.0' and os.getenv('TF_ENABLE_ONEDNN_OPTS') != '1':
+            if tf.version.VERSION >= '2.6.0' and tf.version.VERSION < '2.9.0' \
+                    and os.getenv('TF_ENABLE_ONEDNN_OPTS') != '1':
                 logger.fatal("Please set environment variable TF_ENABLE_ONEDNN_OPTS=1 "
-                             "when Tensorflow >= 2.6.0 installed.")
+                             "when TensorFlow >= 2.6.0 and < 2.9.0 installed.")
 
             if not is_supported_version:
                 raise ValueError(

neural_compressor/adaptor/tf_utils/graph_converter_without_calib.py

@@ -20,6 +20,7 @@
 import os
 import logging
 import tensorflow as tf
+
 from tensorflow.python.platform import gfile
 from neural_compressor.conf.dotdict import deep_get
 from neural_compressor.experimental.common import Model
@@ -45,7 +46,7 @@
 from .graph_rewriter.int8.rnn_convert import QuantizedRNNConverter
 
 
-TF_SUPPORTED_MAX_VERSION = '2.6.2'
+TF_SUPPORTED_MAX_VERSION = '2.9.1'
 TF_SUPPORTED_MIN_VERSION = '1.14.0'
 
 logger = logging.getLogger()
@@ -102,9 +103,13 @@ def _check_tf_version(self):
                 from tensorflow.python._pywrap_util_port import IsMklEnabled
             if IsMklEnabled() and (TF_SUPPORTED_MIN_VERSION <= tf.version.VERSION):
                 is_supported_version = True
+                
+            if tf.version.VERSION >= '2.6.0' and os.getenv('TF_ENABLE_ONEDNN_OPTS') == '1':
+                is_supported_version = True
 
-            if tf.version.VERSION.find('2.6.') != -1 and os.getenv('TF_ENABLE_ONEDNN_OPTS') == '1':
+            if tf.version.VERSION >= '2.9.0':
                 is_supported_version = True
+
         except Exception as e:
             raise ValueError(e)
         finally:# pragma: no cover
@@ -117,12 +122,13 @@ def _check_tf_version(self):
                                                                      TF_SUPPORTED_MIN_VERSION,
                                                                      TF_SUPPORTED_MAX_VERSION))
             if tf.version.VERSION == '2.5.0' and os.getenv('TF_ENABLE_MKL_NATIVE_FORMAT') != '0':
-                logger.warning("Please set environment variable TF_ENABLE_MKL_NATIVE_FORMAT=0 "
-                               "when Tensorflow 2.5.0 installed.")
+                logger.fatal("Please set environment variable TF_ENABLE_MKL_NATIVE_FORMAT=0 "
+                             "when TensorFlow 2.5.0 installed.")
 
-            if tf.version.VERSION.find('2.6.') != -1 and os.getenv('TF_ENABLE_ONEDNN_OPTS') != '1':
-                logger.warning("Please set environment variable TF_ENABLE_ONEDNN_OPTS=1 "
-                               "when Tensorflow 2.6.x installed.")
+            if tf.version.VERSION >= '2.6.0' and tf.version.VERSION < '2.9.0' \
+                    and os.getenv('TF_ENABLE_ONEDNN_OPTS') != '1':
+                logger.fatal("Please set environment variable TF_ENABLE_ONEDNN_OPTS=1 "
+                             "when TensorFlow >= 2.6.0 and < 2.9.0 installed.")
 
             if not is_supported_version:
                 raise ValueError(

neural_compressor/adaptor/tf_utils/graph_rewriter/generic/dummy_biasadd.py

@@ -37,10 +37,10 @@ def do_transformation(self):
         valid_ops = ('BiasAdd', 'Add', 'AddV2', 'AddN')
         target_nodes = g.query_fusion_pattern_nodes([['MatMul', 'Conv2D'],])
         for i in target_nodes:
-            # only apply this pass for tensorflow release 2.8.0 and lower version for
+            # only apply this pass for tensorflow release 2.9.1 and lower version for
             # old quantization API.
             # use conv+dummy_biasadd+relu because TF do not support conv+relu now. 
-            if tf.version.VERSION >= '2.9.0': 
+            if tf.version.VERSION > '2.9.1': 
                 continue
             if i[0] in self.outputs:
                 continue