tf-2.7 (#1762)

* tf-2.7

Signed-off-by: Guenther Schmuelling <[email protected]>

* no released tensorflow-text.2.7 yet, try 2.6

Signed-off-by: Guenther Schmuelling <[email protected]>

* give quant test some tolerance

Signed-off-by: Guenther Schmuelling <[email protected]>

* make ptol usage consistent

Signed-off-by: Guenther Schmuelling <[email protected]>

Author: guschmue

ci_build/azure_pipelines/pretrained_model_test.yml

@@ -3,8 +3,9 @@
 jobs:
 - template: 'templates/job_generator.yml'
   parameters:
-    python_versions: ['3.7']
-    tf_versions: ['2.4.1']
+    # 2.6, tflite/tfjs
+    python_versions: ['3.8']
+    tf_versions: ['2.6.2']
     skip_tflite_tests: 'False'
     skip_tfjs_tests: 'False'
     skip_tf_tests: 'True'
@@ -14,8 +15,18 @@ jobs:
 
 - template: 'templates/job_generator.yml'
   parameters:
+    # 2.6, tf
     python_versions: ['3.7']
     tf_versions: ['1.15.5','2.6.2']
     job:
       steps:
       - template: 'pretrained_model_test.yml'
+
+- template: 'templates/job_generator.yml'
+  parameters:
+    # 2.7, tf
+    python_versions: ['3.9']
+    tf_versions: ['2.7.0']
+    job:
+      steps:
+      - template: 'pretrained_model_test.yml'

ci_build/azure_pipelines/templates/setup.yml

@@ -45,6 +45,10 @@ steps:
       then
         pip install tensorflow-text>=2.6
       fi
+      if [[ $CI_TF_VERSION == 2.7* ]] ;
+      then
+        pip install tensorflow-text>=2.6
+      fi
     fi
 
     python setup.py install

ci_build/azure_pipelines/unit_test.yml

@@ -3,6 +3,43 @@
 stages:
   - stage:
     jobs:
+    - template: 'templates/job_generator.yml'
+      parameters:
+        # TFJS tf 2.7
+        python_versions: ['3.9']
+        tf_versions: ['2.7.0']
+        onnx_opsets: ['']
+        skip_tfjs_tests: 'False'
+        skip_tf_tests: 'True'
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
+
+    - template: 'templates/job_generator.yml'
+      parameters:
+        # TFLite tf 2.7
+        python_versions: ['3.8']
+        tf_versions: ['2.7.0']
+        onnx_opsets: ['']
+        skip_tflite_tests: 'False'
+        skip_tf_tests: 'True'
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
+
+    - template: 'templates/job_generator.yml'
+      parameters:
+        # tf 2.7
+        python_versions: ['3.8']
+        tf_versions: ['2.7.0']
+        onnx_opsets: ['']
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
+
     - template: 'templates/job_generator.yml'
       parameters:
         # TFJS tf 2.6

tests/run_pretrained_models.py

@@ -604,7 +604,7 @@ def run_tflite():
                         for tf_res, onnx_res in zip(tf_results, onnx_results):
                             good_cnt = np.count_nonzero(np.isclose(tf_res, onnx_res, rtol=self.rtol, atol=self.atol))
                             bad_cnt = tf_res.size - good_cnt
-                            if bad_cnt > self.ptol / 100 * tf_res.size:
+                            if bad_cnt > self.ptol * tf_res.size:
                                 # Prints a nice error message with stats
                                 np.testing.assert_allclose(tf_res, onnx_res, rtol=self.rtol, atol=self.atol)
                     logger.info("Results: OK")

tests/run_pretrained_models.yaml

@@ -209,6 +209,17 @@ googlenet_v4_slim:
     - InceptionV4/Logits/Predictions:0
   rtol: 0.1
 
+squeezenet:
+  disabled: true
+  url: https://storage.googleapis.com/download.tensorflow.org/models/tflite/model_zoo/upload_20180427/squeezenet_2018_04_27.tgz
+  model: squeezenet.pb
+  input_get: get_beach
+  inputs:
+    "Placeholder:0": [1, 224, 224, 3]
+  outputs:
+    - softmax_tensor:0
+    - ArgMax:0
+
 mobilenet_v3_large_float:
   tf_min_version: 1.14  # explicit_paddings for Conv2D
   url: https://storage.googleapis.com/mobilenet_v3/checkpoints/v3-large_224_1.0_float.tgz
@@ -493,7 +504,7 @@ deeplabv3_mnv2_ade20k_uint8_tflite_dequantize:
   model: "deeplabv3_mnv2_ade20k_uint8.tflite"
   model_type: tflite
   input_get: get_ade20k_uint8
-  ptol: 1.0
+  ptol: 0.1  # unreliable because of quantization
   dequantize: true
   inputs:
     "MobilenetV2/MobilenetV2/input": [1, 512, 512, 3]
@@ -510,7 +521,7 @@ deeplabv3_mnv2_ade20k_uint8_tflite:
   opset_constraints:
     "onnx":
       "min": 10
-  ptol: 1.5
+  ptol: 0.1
   dequantize: false
   inputs:
     "MobilenetV2/MobilenetV2/input": [1, 512, 512, 3]
@@ -524,7 +535,7 @@ deeplabv3_mnv2_ade20k_int8_tflite_dequantize:
   model: "deeplabv3_mnv2_ade20k_int8.tflite"
   model_type: tflite
   input_get: get_ade20k_uint8   # the input is uint8 despite the model name
-  ptol: 3.0
+  ptol: 0.1
   dequantize: true
   inputs:
     "MobilenetV2/MobilenetV2/input": [1, 512, 512, 3]
@@ -541,7 +552,7 @@ deeplabv3_mnv2_ade20k_int8_tflite:
   opset_constraints:
     "onnx":
       "min": 13
-  ptol: 1.9
+  ptol: 0.1
   dequantize: false
   inputs:
     "MobilenetV2/MobilenetV2/input": [1, 512, 512, 3]
@@ -568,6 +579,7 @@ mobilebert_tflite:
     - end_logits
     - start_logits
 
+    
 palm_detection_tflite:
   tf_min_version: 2.1
   disabled: false