Merge branch 'master' into r1.8

Author: guschmue

README.md

@@ -18,8 +18,8 @@ The common issues we run into we try to document here [Troubleshooting Guide](Tr
 
 | Build Type | OS | Python | Tensorflow | Onnx opset | Status |
 | ---        | ---    | ---    | ---        | ---        | ---    |
-| Unit Test - Basic | Linux, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.6, 3.7, 3.8 | 1.12-1.15, 2.1-2.4 | 7-13 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=master) |
-| Unit Test - Full | Linux, MacOS, Windows | 3.6, 3.7, 3.8 | 1.12-1.15, 2.1-2.4 | 7-13 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=master) | |
+| Unit Test - Basic | Linux, MacOS<sup>\*</sup>, Windows<sup>\*</sup> | 3.6, 3.7, 3.8 | 1.12-1.15, 2.1-2.5 | 7-13 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=16&branchName=master) |
+| Unit Test - Full | Linux, MacOS, Windows | 3.6, 3.7, 3.8 | 1.12-1.15, 2.1-2.5 | 7-13 | [![Build Status](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_apis/build/status/unit_test-matrix?branchName=master)](https://dev.azure.com/tensorflow-onnx/tensorflow-onnx/_build/latest?definitionId=18&branchName=master) | |
 <br/>
 
 ## Supported Versions

ci_build/azure_pipelines/onnxruntime_nightly_test.yml

@@ -39,6 +39,18 @@ stages:
           - template: 'unit_test.yml'
         report_coverage: 'True'
 
+    - template: 'templates/job_generator.yml'
+      parameters:
+        platforms: ['linux', 'windows']
+        python_versions: [3.8']
+        tf_versions: ['2.5.0rc1']
+        onnx_opsets: ['']
+        onnx_backends: {onnxruntime: ['nightly']}
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
+  
   - template: 'templates/combine_test_coverage.yml'
 
 schedules:

ci_build/azure_pipelines/pretrained_model_test-matrix.yml

@@ -27,4 +27,12 @@ jobs:
     job:
       steps:
       - template: 'pretrained_model_test.yml'
-    
+
+- template: 'templates/job_generator.yml'
+  parameters:
+    platforms: ['linux', 'windows']
+    python_versions: ['3.8']
+    tf_versions: ['2.5.0rc1']
+    job:
+      steps:
+      - template: 'pretrained_model_test.yml'

ci_build/azure_pipelines/templates/job_generator.yml

@@ -6,7 +6,7 @@ parameters:
   tf_versions: ['']
   onnx_versions: ['']
   onnx_opsets: ['13', '12', '11', '10', '9', '8', '7']
-  onnx_backends: {onnxruntime: ['1.6.0']}
+  onnx_backends: {onnxruntime: ['1.7.0']}
   job: {}
   run_setup: 'True'
   report_coverage: 'False'

ci_build/azure_pipelines/templates/setup.yml

@@ -25,6 +25,15 @@ steps:
       pip install --index-url https://test.pypi.org/simple/ ort-nightly
     fi
 
+    if [[ $CI_PLATFORM == "windows" ]] ;
+    then
+      pip install -i https://test.pypi.org/simple/ onnxruntime-customops==0.0.1
+      if [[ $CI_TF_VERSION == 2.* ]] ;
+      then
+        pip install tensorflow-text
+      fi
+    fi
+
     python setup.py install
     pip freeze --all
   displayName: 'Setup Environment'

ci_build/azure_pipelines/unit_test-matrix.yml

@@ -7,7 +7,7 @@ stages:
       parameters:
         platforms: ['linux', 'windows']
         python_versions: ['3.6']
-        tf_versions: ['1.13.1', '1.12.3']
+        tf_versions: ['1.12.3']
         onnx_opsets: ['']
         job:
           steps:
@@ -35,5 +35,16 @@ stages:
           steps:
           - template: 'unit_test.yml'
         report_coverage: 'True'
+
+    - template: 'templates/job_generator.yml'
+      parameters:
+        platforms: ['linux', 'windows']
+        python_versions: ['3.8']
+        tf_versions: ['2.5.0rc1']
+        onnx_opsets: ['']
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
 
   - template: 'templates/combine_test_coverage.yml'

ci_build/azure_pipelines/unit_test.yml

@@ -6,7 +6,7 @@ stages:
     - template: 'templates/job_generator.yml'
       parameters:
         python_versions: ['3.8']
-        tf_versions: ['2.4.0']
+        tf_versions: ['2.5.0rc1']
         onnx_opsets: ['']
         skip_tflite_tests: 'False'
         skip_tf_tests: 'True'
@@ -30,7 +30,7 @@ stages:
     - template: 'templates/job_generator.yml'
       parameters:
         python_versions: ['3.8']
-        tf_versions: ['2.4.0']
+        tf_versions: ['2.5.0rc1']
         onnx_opsets: ['']
         job:
           steps:
@@ -40,7 +40,7 @@ stages:
     - template: 'templates/job_generator.yml'
       parameters:
         python_versions: ['3.7']
-        tf_versions: ['1.14.0','1.15.2','2.2.0','2.3.0']
+        tf_versions: ['1.14.0','1.15.2','2.3.0','2.4.1']
         onnx_opsets: ['']
         job:
           steps:
@@ -67,5 +67,16 @@ stages:
           - template: 'unit_test.yml'
         report_coverage: 'True'
 
+    - template: 'templates/job_generator.yml'
+      parameters:
+        python_versions: ['3.7']
+        platforms: ['windows']
+        tf_versions: ['2.4.1']
+        onnx_opsets: ['']
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
+
   - template: 'templates/combine_test_coverage.yml'
 

examples/getting_started.py

@@ -0,0 +1,64 @@
+# SPDX-License-Identifier: Apache-2.0
+
+"""
+This example shows how to convert tf functions and keras models using the Python API.
+It also demonstrates converting saved_models from the command line.
+"""
+
+import tensorflow as tf
+import tf2onnx
+import numpy as np
+import onnxruntime as ort
+import os
+
+##################### tf function #####################
+
+@tf.function
+def f(a, b):
+    return a + b
+
+input_signature = [tf.TensorSpec([2, 3], tf.float32), tf.TensorSpec([2, 3], tf.float32)]
+onnx_model, _ = tf2onnx.convert.from_function(f, input_signature, opset=13)
+
+a_val = np.ones([2, 3], np.float32)
+b_val = np.zeros([2, 3], np.float32)
+
+print("Tensorflow result")
+print(f(a_val, b_val).numpy())
+
+print("ORT result")
+sess = ort.InferenceSession(onnx_model.SerializeToString())
+res = sess.run(None, {'a': a_val, 'b': b_val})
+print(res[0])
+
+
+##################### Keras Model #####################
+
+model = tf.keras.Sequential()
+model.add(tf.keras.layers.Dense(4, activation="relu"))
+
+input_signature = [tf.TensorSpec([3, 3], tf.float32, name='x')]
+onnx_model, _ = tf2onnx.convert.from_keras(model, input_signature, opset=13)
+
+x_val = np.ones((3, 3), np.float32)
+
+print("Keras result")
+print(model(x_val).numpy())
+
+print("ORT result")
+sess = ort.InferenceSession(onnx_model.SerializeToString())
+res = sess.run(None, {'x': x_val})
+print(res[0])
+
+
+##################### Saved Model #####################
+
+model.save("savedmodel")
+os.system("python -m tf2onnx.convert --saved-model savedmodel --output model.onnx --opset 13")
+
+print("ORT result")
+sess = ort.InferenceSession("model.onnx")
+res = sess.run(None, {'dense_input:0': x_val})
+print(res[0])
+
+print("Conversion succeeded")

setup.py

@@ -81,5 +81,22 @@ def run(self):
     author='[email protected]',
     author_email='[email protected]',
     url='https://github.com/onnx/tensorflow-onnx',
-    install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers']
+    install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers~=1.12'],
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Education',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: Apache2 License',
+        'Topic :: Scientific/Engineering',
+        'Topic :: Scientific/Engineering :: Mathematics',
+        'Topic :: Scientific/Engineering :: Artificial Intelligence',
+        'Topic :: Software Development',
+        'Topic :: Software Development :: Libraries',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9']
 )