Merge branch 'master' into r1.9

Author: guschmue

.gitignore

@@ -13,3 +13,7 @@ __pycache__
 .eggs
 *.egg-info
 run.sh
+tests/tfhub/*/*.onnx
+tests/tfhub/*/*.tar.gz
+tests/tfhub/*/*.tflite
+tests/tfhub/*/**

README.md

@@ -1,12 +1,11 @@
 <!--- SPDX-License-Identifier: Apache-2.0 -->
 
-# tf2onnx - Convert TensorFlow, Keras and Tflite models to ONNX.
+# tf2onnx - Convert TensorFlow, Keras, Tensorflow.js and Tflite models to ONNX.
 
-tf2onnx converts TensorFlow (tf-1.x or tf-2.x), tf.keras and tflite models to ONNX via command 
+tf2onnx converts TensorFlow (tf-1.x or tf-2.x), keras, tensorflow.js and tflite models to ONNX via command 
 line or python api.
 
-__Note: after tf2onnx-1.8.3 we made a change that impacts the output names for the ONNX model.
-Instead of taking the output names from the tensorflow graph (ie. for keras models this is frequently Identity:0) we decided that it is better to use the structured output names of the model so the output names are now identical to the names in the keras or saved model.__
+__Note: tensorflow.js support was just added. While we tested it with many tfjs models from tfhub, it should be considered experimental.__
 
 TensorFlow has many more ops than ONNX and occasionally mapping a model to ONNX creates issues.
 
@@ -18,8 +17,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.9 | 1.12-1.15, 2.1-2.5 | 8-14 | [![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.9 | 1.12-1.15, 2.1-2.5 | 8-14 | [![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.9 | 1.12-1.15, 2.1-2.6 | 8-14 | [![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.9 | 1.12-1.15, 2.1-2.6 | 8-14 | [![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
@@ -127,7 +126,8 @@ We recently added support for tflite. You convert ```tflite``` models via comman
 python -m tf2onnx.convert
     --saved-model SOURCE_SAVED_MODEL_PATH |
     --checkpoint SOURCE_CHECKPOINT_METAFILE_PATH |
-    --tflite SOURCE_TFLITE_PATH |
+    --tflite TFLITE_MODEL_PATH |
+    --tfjs TFJS_MODEL_PATH | 
     --input | --graphdef SOURCE_GRAPHDEF_PB
     --output TARGET_ONNX_MODEL
     [--inputs GRAPH_INPUTS]
@@ -157,14 +157,18 @@ TensorFlow model as saved_model. We expect the path to the saved_model directory
 
 TensorFlow model as checkpoint. We expect the path to the .meta file.
 
-#### --tflite
-
-Convert a tflite model by providing a path to the .tflite file. Inputs/outputs do not need to be specified.
-
 #### --input or --graphdef
 
 TensorFlow model as graphdef file.
 
+#### --tfjs
+
+Convert a tensorflow.js model by providing a path to the .tfjs file. Inputs/outputs do not need to be specified.
+
+#### --tflite
+
+Convert a tflite model by providing a path to the .tflite file. Inputs/outputs do not need to be specified.
+
 #### --output
 
 The target onnx file path.
@@ -260,7 +264,6 @@ optional arguments:
   --opset OPSET      target opset to use
   --perf csv-file    capture performance numbers for tensorflow and onnx runtime
   --debug            dump generated graph with shape info
-  --fold_const when set, TensorFlow fold_constants transformation will be applied before conversion. This will benefit features including Transpose optimization (e.g. Transpose operations introduced during tf-graph-to-onnx-graph conversion will be removed), and RNN unit conversion (for example LSTM).
 ```
 ```run_pretrained_models.py``` will run the TensorFlow model, captures the TensorFlow output and runs the same test against the specified ONNX backend after converting the model.
 

ci_build/azure_pipelines/keras2onnx_application_tests.yml

@@ -0,0 +1,102 @@
+# Nightly keras2onnx application tests
+
+jobs:
+
+- job: 'Linux'
+  timeoutInMinutes: 180
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  strategy:
+    matrix:
+      Python36-onnx1.5:
+        python.version: '3.6'
+        ONNX_PATH: onnx==1.5.0
+        INSTALL_KERAS: pip install keras==2.2.4
+        UNINSTALL_KERAS:
+        INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
+        INSTALL_ORT: pip install onnxruntime==1.8.0
+        INSTALL_KERAS_RESNET: pip install keras-resnet
+        INSTALL_TRANSFORMERS:
+        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
+
+      Python37-onnx1.6:
+        python.version: '3.7.3'
+        ONNX_PATH: onnx==1.6.0
+        INSTALL_KERAS: pip install keras==2.3.1
+        UNINSTALL_KERAS:
+        INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
+        INSTALL_ORT: pip install onnxruntime==1.8.0
+        INSTALL_KERAS_RESNET: pip install keras-resnet
+        INSTALL_TRANSFORMERS:
+        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
+
+      Python37-onnx1.9:
+        python.version: '3.7.3'
+        ONNX_PATH: onnx==1.9.0
+        INSTALL_KERAS: pip install keras==2.3.1
+        UNINSTALL_KERAS:
+        INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
+        INSTALL_ORT: pip install onnxruntime==1.8.0
+        INSTALL_KERAS_RESNET: pip install keras-resnet
+        INSTALL_TRANSFORMERS:
+        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
+
+      Python38-tf2:
+        python.version: '3.8'
+        ONNX_PATH: onnx==1.9.0
+        INSTALL_KERAS:
+        UNINSTALL_KERAS: pip uninstall keras -y
+        INSTALL_TENSORFLOW: pip install tensorflow==2.2.0
+        INSTALL_ORT: pip install onnxruntime==1.8.0
+        INSTALL_KERAS_RESNET: pip install keras-resnet
+        INSTALL_TRANSFORMERS: pip install transformers==3.4.0
+        NIGHTLY_BUILD_TEST: python run_all_v2.py
+
+  steps:
+  - template: 'templates/keras2onnx_application_tests.yml'
+    parameters:
+      platform: 'linux'
+
+- job: 'Win'
+  timeoutInMinutes: 180
+  pool:
+    vmImage: 'vs2017-win2016'
+  strategy:
+    matrix:
+      Python36-onnx1.5:
+        python.version: '3.6'
+        ONNX_PATH: onnx==1.5.0
+        INSTALL_KERAS: pip install keras==2.2.4
+        UNINSTALL_KERAS:
+        INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
+        INSTALL_ORT: pip install onnxruntime==1.8.0
+        INSTALL_KERAS_RESNET: pip install keras-resnet
+        INSTALL_TRANSFORMERS:
+        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
+
+      Python37-onnx1.6:
+        python.version: '3.7'
+        ONNX_PATH: onnx==1.6.0
+        INSTALL_KERAS: pip install keras==2.3.1
+        UNINSTALL_KERAS:
+        INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
+        INSTALL_ORT: pip install onnxruntime==1.8.0
+        INSTALL_KERAS_RESNET: pip install keras-resnet
+        INSTALL_TRANSFORMERS:
+        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
+
+      Python37-onnx1.9:
+        python.version: '3.7'
+        ONNX_PATH: onnx==1.9.0
+        INSTALL_KERAS: pip install keras==2.3.1
+        UNINSTALL_KERAS:
+        INSTALL_TENSORFLOW: pip install tensorflow==1.15.0
+        INSTALL_ORT: pip install onnxruntime==1.8.0
+        INSTALL_KERAS_RESNET: pip install keras-resnet
+        INSTALL_TRANSFORMERS:
+        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
+
+  steps:
+  - template: 'templates/keras2onnx_application_tests.yml'
+    parameters:
+      platform: 'windows'

ci_build/azure_pipelines/keras2onnx_unit_test.yml

@@ -1,4 +1,4 @@
-# Tests copied from keras2onnx
+# Nightly keras2onnx unit tests
 
 jobs:
 
@@ -70,49 +70,9 @@ jobs:
         INSTALL_ORT: pip install onnxruntime==1.8.0
 
   steps:
-  - script: sudo install -d -m 0777 /home/vsts/.conda/envs
-    displayName: Fix Conda permissions
-
-  - task: CondaEnvironment@1
-    inputs:
-      createCustomEnvironment: true
-      environmentName: 'py$(python.version)'
-      packageSpecs: 'python=$(python.version)'
-
-  - script: |
-      python -m pip install --upgrade pip
-      conda config --set always_yes yes --set changeps1 no
-      pip install $(ONNX_PATH)
-      pip install h5py==2.9.0
-      pip install numpy==1.19
-      pip install $(TENSORFLOW_PATH)
-      if [[ ! -z $KERAS ]];
-      then
-        pip install $(KERAS)
-      fi
-      pip install git+https://github.com/microsoft/onnxconverter-common
-      pip install -r requirements.txt
-      pip install -r requirements-dev.txt
-      pip install pytest pytest-cov pytest-runner
-      $(INSTALL_ORT)
-    displayName: 'Install dependencies'
-
-  - script: |
-      pip install -e .
-      python -c "import onnxruntime"
-      python -c "import onnxconverter_common"
-      if [[ ! -z $KERAS ]];
-      then
-        export TF_KERAS=0
-      fi
-      pytest keras2onnx_tests --doctest-modules --junitxml=junit/test-results.xml
-    displayName: 'pytest'
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '**/test-results.xml'
-      testRunTitle: 'Python $(python.version)'
-    condition: succeededOrFailed()
+  - template: 'templates/keras2onnx_unit_test.yml'
+    parameters:
+      platform: 'linux'
 
 - job: 'Win'
   pool:
@@ -179,43 +139,6 @@ jobs:
         INSTALL_ORT: pip install onnxruntime==1.8.0
 
   steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '$(python.version)'
-      architecture: 'x64'
-
-  - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
-    displayName: Add conda to PATH
-
-  - script: conda create --yes --quiet --name py$(python.version) -c conda-forge python=$(python.version) numpy protobuf
-    displayName: Create Anaconda environment
-
-  - script: |
-      call activate py$(python.version)
-      python -m pip install --upgrade pip numpy==1.19
-      echo Test numpy installation... && python -c "import numpy"
-      pip install %ONNX_PATH%
-      pip uninstall -y protobuf
-      pip install protobuf
-      pip install h5py==2.9.0
-      pip install %TENSORFLOW_PATH%
-      IF NOT "%KERAS%"=="" (pip install %KERAS%)
-      pip install git+https://github.com/microsoft/onnxconverter-common
-      pip install pytest pytest-cov pytest-runner
-      %INSTALL_ORT%
-    displayName: 'Install dependencies'
-
-  - script: |
-      call activate py$(python.version)
-      pip install -e .
-      echo Test onnxruntime installation... && python -c "import onnxruntime"
-      python -c "import onnxconverter_common"
-      IF NOT "%KERAS%"=="" (set TF_KERAS=0)
-      pytest keras2onnx_tests --doctest-modules --junitxml=junit/test-results.xml
-    displayName: 'pytest'
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: '**/test-results.xml'
-      testRunTitle: 'Python $(python.version)'
-    condition: succeededOrFailed()
+  - template: 'templates/keras2onnx_unit_test.yml'
+    parameters:
+      platform: 'windows'

ci_build/azure_pipelines/onnxruntime_nightly_test.yml

@@ -3,6 +3,19 @@
 stages:
   - stage:
     jobs:
+    - template: 'templates/job_generator.yml'
+      parameters:
+        python_versions: ['3.7']
+        tf_versions: ['2.5.0', '2.3.0']
+        onnx_opsets: ['']
+        onnx_backends: {onnxruntime: ['nightly']}
+        skip_tflite_tests: 'False'
+        skip_tf_tests: 'True'
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
+
     - template: 'templates/job_generator.yml'
       parameters:
         platforms: ['linux', 'windows']
@@ -38,6 +51,18 @@ stages:
           steps:
           - template: 'unit_test.yml'
         report_coverage: 'True'
+
+    - template: 'templates/job_generator.yml'
+      parameters:
+        platforms: ['linux']
+        python_versions: ['3.7']
+        tf_versions: ['2.4.1']
+        onnx_opsets: ['']
+        onnx_backends: {onnxruntime: ['nightly']}
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
 
     - template: 'templates/job_generator.yml'
       parameters:
@@ -51,6 +76,18 @@ stages:
           - template: 'unit_test.yml'
         report_coverage: 'True'
 
+    - template: 'templates/job_generator.yml'
+      parameters:
+        platforms: ['linux']
+        python_versions: ['3.9']
+        tf_versions: ['2.6.0']
+        onnx_opsets: ['']
+        onnx_backends: {onnxruntime: ['nightly']}
+        job:
+          steps:
+          - template: 'unit_test.yml'
+        report_coverage: 'True'
+
     - template: 'templates/job_generator.yml'
       parameters:
         platforms: ['windows']

ci_build/azure_pipelines/pretrained_model_test-matrix.yml

@@ -36,3 +36,20 @@ jobs:
     job:
       steps:
       - template: 'pretrained_model_test.yml'
+
+- template: 'templates/job_generator.yml'
+  parameters:
+    platforms: ['linux', 'windows']
+    python_versions: ['3.9']
+    tf_versions: ['2.6.0']
+    job:
+      steps:
+      - template: 'pretrained_model_test.yml'
+
+schedules:
+- cron: "0 10 * * *"
+  displayName: pre-trained model test, full matrix
+  branches:
+    include:
+    - master
+  always: true

ci_build/azure_pipelines/pretrained_model_test.yml

@@ -6,6 +6,7 @@ jobs:
     python_versions: ['3.7']
     tf_versions: ['2.4.1']
     skip_tflite_tests: 'False'
+    skip_tfjs_tests: 'False'
     skip_tf_tests: 'True'
     job:
       steps:
@@ -14,7 +15,7 @@ jobs:
 - template: 'templates/job_generator.yml'
   parameters:
     python_versions: ['3.7']
-    tf_versions: ['1.15.5','2.4.1']
+    tf_versions: ['1.15.5','2.6.0']
     job:
       steps:
       - template: 'pretrained_model_test.yml'