From cdb46a3f0d8026bbf98ad313d11bf3b7665d0596 Mon Sep 17 00:00:00 2001 From: fatcat-z Date: Tue, 9 May 2023 19:49:01 +0800 Subject: [PATCH 1/6] Check protobuf version. Signed-off-by: fatcat-z --- .../azure_pipelines/pretrained_model_test.yml | 48 +++--- .../trimmed_keras2onnx_application_tests.yml | 70 ++++----- .../trimmed_keras2onnx_unit_test.yml | 52 +++---- ci_build/azure_pipelines/unit_test.yml | 138 +++++++++--------- 4 files changed, 154 insertions(+), 154 deletions(-) diff --git a/ci_build/azure_pipelines/pretrained_model_test.yml b/ci_build/azure_pipelines/pretrained_model_test.yml index 79da80da2..5ed2c8b6f 100644 --- a/ci_build/azure_pipelines/pretrained_model_test.yml +++ b/ci_build/azure_pipelines/pretrained_model_test.yml @@ -1,29 +1,29 @@ # Pre-trained model test jobs: -- template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.8'] - tf_versions: ['2.9.0'] - skip_tflite_tests: 'False' - skip_tfjs_tests: 'False' - skip_tf_tests: 'True' - job: - steps: - - template: 'pretrained_model_test.yml' +# - template: 'templates/job_generator.yml' +# parameters: +# python_versions: ['3.8'] +# tf_versions: ['2.9.0'] +# skip_tflite_tests: 'False' +# skip_tfjs_tests: 'False' +# skip_tf_tests: 'True' +# job: +# steps: +# - template: 'pretrained_model_test.yml' -- template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.7'] - tf_versions: ['1.15.5','2.2.0'] - job: - steps: - - template: 'pretrained_model_test.yml' +# - template: 'templates/job_generator.yml' +# parameters: +# python_versions: ['3.7'] +# tf_versions: ['1.15.5','2.2.0'] +# job: +# steps: +# - template: 'pretrained_model_test.yml' -- template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.9'] - tf_versions: ['2.10.0'] - job: - steps: - - template: 'pretrained_model_test.yml' +# - template: 'templates/job_generator.yml' +# parameters: +# python_versions: ['3.9'] +# tf_versions: ['2.10.0'] +# job: +# steps: +# - template: 'pretrained_model_test.yml' diff --git a/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml b/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml index a789f84fe..2fdaa9f1d 100644 --- a/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml +++ b/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml @@ -8,46 +8,46 @@ jobs: vmImage: 'ubuntu-latest' strategy: matrix: - Python37-tf-1.15: - python.version: '3.7' - ONNX_PATH: onnx==1.11.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.11.0 - INSTALL_KERAS_RESNET: pip install keras-resnet - INSTALL_TRANSFORMERS: - INSTALL_NUMPY: pip install numpy==1.19.0 - INSTALL_LEGACY: pip install h5py==2.9.0 - NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py" + # Python37-tf-1.15: + # python.version: '3.7' + # ONNX_PATH: onnx==1.11.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.11.0 + # INSTALL_KERAS_RESNET: pip install keras-resnet + # INSTALL_TRANSFORMERS: + # INSTALL_NUMPY: pip install numpy==1.19.0 + # INSTALL_LEGACY: pip install h5py==2.9.0 + # NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py" - Python38-tf-2.9: - python.version: '3.8' - ONNX_PATH: onnx==1.12.0 - INSTALL_KERAS: - UNINSTALL_KERAS: - INSTALL_TENSORFLOW: pip install tensorflow==2.9.1 - INSTALL_ORT: pip install onnxruntime==1.12.0 - INSTALL_KERAS_RESNET: pip install keras-resnet - INSTALL_TRANSFORMERS: pip install transformers==4.2.0 - INSTALL_NUMPY: - NIGHTLY_BUILD_TEST: python run_all_v2.py + # Python38-tf-2.9: + # python.version: '3.8' + # ONNX_PATH: onnx==1.12.0 + # INSTALL_KERAS: + # UNINSTALL_KERAS: + # INSTALL_TENSORFLOW: pip install tensorflow==2.9.1 + # INSTALL_ORT: pip install onnxruntime==1.12.0 + # INSTALL_KERAS_RESNET: pip install keras-resnet + # INSTALL_TRANSFORMERS: pip install transformers==4.2.0 + # INSTALL_NUMPY: + # NIGHTLY_BUILD_TEST: python run_all_v2.py - Python38-tf2-2.10: - python.version: '3.8' - ONNX_PATH: onnx==1.12.0 - INSTALL_KERAS: - UNINSTALL_KERAS: - INSTALL_TENSORFLOW: pip install tensorflow==2.10.0 - INSTALL_ORT: pip install onnxruntime==1.13.1 - INSTALL_KERAS_RESNET: pip install keras-resnet - INSTALL_TRANSFORMERS: pip install transformers==4.2.0 - INSTALL_NUMPY: - NIGHTLY_BUILD_TEST: python run_all_v2.py + # Python38-tf2-2.10: + # python.version: '3.8' + # ONNX_PATH: onnx==1.12.0 + # INSTALL_KERAS: + # UNINSTALL_KERAS: + # INSTALL_TENSORFLOW: pip install tensorflow==2.10.0 + # INSTALL_ORT: pip install onnxruntime==1.13.1 + # INSTALL_KERAS_RESNET: pip install keras-resnet + # INSTALL_TRANSFORMERS: pip install transformers==4.2.0 + # INSTALL_NUMPY: + # NIGHTLY_BUILD_TEST: python run_all_v2.py Python38-tf2-2.11: python.version: '3.9' - ONNX_PATH: onnx==1.13.1 + ONNX_PATH: onnx==1.14 INSTALL_KERAS: UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==2.11.0 diff --git a/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml b/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml index 6bd232cb0..57d4a552f 100644 --- a/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml +++ b/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml @@ -9,23 +9,23 @@ jobs: matrix: ############ TF Keras Unit Tests ############ - Python37-tf1.15: - python.version: '3.7' - ONNX_PATH: onnx==1.11.0 - TENSORFLOW_PATH: tensorflow==1.15.0 - INSTALL_ORT: pip install onnxruntime==1.11.0 - INSTALL_NUMPY: pip install numpy==1.19.0 + # Python37-tf1.15: + # python.version: '3.7' + # ONNX_PATH: onnx==1.11.0 + # TENSORFLOW_PATH: tensorflow==1.15.0 + # INSTALL_ORT: pip install onnxruntime==1.11.0 + # INSTALL_NUMPY: pip install numpy==1.19.0 - Python38-tf-2.9: - python.version: '3.8' - ONNX_PATH: onnx==1.12.0 - TENSORFLOW_PATH: tensorflow==2.9.0 - INSTALL_ORT: pip install onnxruntime==1.12.0 - INSTALL_NUMPY: + # Python38-tf-2.9: + # python.version: '3.8' + # ONNX_PATH: onnx==1.12.0 + # TENSORFLOW_PATH: tensorflow==2.9.0 + # INSTALL_ORT: pip install onnxruntime==1.12.0 + # INSTALL_NUMPY: Python310-tf-latest: python.version: '3.10' - ONNX_PATH: onnx==1.13.1 + ONNX_PATH: onnx==1.14 TENSORFLOW_PATH: tensorflow==2.11.0 INSTALL_ORT: pip install onnxruntime==1.13.1 INSTALL_NUMPY: @@ -50,23 +50,23 @@ jobs: strategy: matrix: ############ TF Keras Unit Tests ############ - Python37-tf-1.15: - python.version: '3.7' - ONNX_PATH: onnx==1.11.0 - TENSORFLOW_PATH: tensorflow==1.15.0 - INSTALL_ORT: pip install onnxruntime==1.11.0 - INSTALL_NUMPY: pip install numpy==1.19.0 + # Python37-tf-1.15: + # python.version: '3.7' + # ONNX_PATH: onnx==1.11.0 + # TENSORFLOW_PATH: tensorflow==1.15.0 + # INSTALL_ORT: pip install onnxruntime==1.11.0 + # INSTALL_NUMPY: pip install numpy==1.19.0 - Python38-tf-2.9: - python.version: '3.8' - ONNX_PATH: onnx==1.12.0 - TENSORFLOW_PATH: tensorflow==2.9.0 - INSTALL_ORT: pip install onnxruntime==1.13.1 - INSTALL_NUMPY: + # Python38-tf-2.9: + # python.version: '3.8' + # ONNX_PATH: onnx==1.12.0 + # TENSORFLOW_PATH: tensorflow==2.9.0 + # INSTALL_ORT: pip install onnxruntime==1.13.1 + # INSTALL_NUMPY: Python310-tf-latest: python.version: '3.10' - ONNX_PATH: onnx==1.13.1 + ONNX_PATH: onnx==1.14 TENSORFLOW_PATH: tensorflow==2.11.0 INSTALL_ORT: pip install onnxruntime==1.14.1 INSTALL_NUMPY: diff --git a/ci_build/azure_pipelines/unit_test.yml b/ci_build/azure_pipelines/unit_test.yml index 35777ab51..88ead08d5 100644 --- a/ci_build/azure_pipelines/unit_test.yml +++ b/ci_build/azure_pipelines/unit_test.yml @@ -41,15 +41,15 @@ stages: - template: 'unit_test.yml' report_coverage: 'True' - - template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.10'] - tf_versions: ['2.8.0'] - onnx_opsets: [''] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' + # - template: 'templates/job_generator.yml' + # parameters: + # python_versions: ['3.10'] + # tf_versions: ['2.8.0'] + # onnx_opsets: [''] + # job: + # steps: + # - template: 'unit_test.yml' + # report_coverage: 'True' # TODO: Enable these tests once https://github.com/onnx/tensorflow-onnx/issues/2118 is fixed. # - template: 'templates/job_generator.yml' @@ -64,17 +64,17 @@ stages: # - template: 'unit_test.yml' # report_coverage: 'True' - - template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.8'] - tf_versions: ['2.7.4'] - 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: + # python_versions: ['3.8'] + # tf_versions: ['2.7.4'] + # onnx_opsets: [''] + # skip_tflite_tests: 'False' + # skip_tf_tests: 'True' + # job: + # steps: + # - template: 'unit_test.yml' + # report_coverage: 'True' # TODO: Enable these tests once https://github.com/onnx/tensorflow-onnx/issues/2118 is fixed. # - template: 'templates/job_generator.yml' @@ -111,58 +111,58 @@ stages: - template: 'unit_test.yml' report_coverage: 'True' - - template: 'templates/job_generator.yml' - # tf 2.5, tf 1.15 - parameters: - python_versions: ['3.7'] - tf_versions: ['1.15.2','2.5.0'] - onnx_opsets: [''] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' + # - template: 'templates/job_generator.yml' + # # tf 2.5, tf 1.15 + # parameters: + # python_versions: ['3.7'] + # tf_versions: ['1.15.2','2.5.0'] + # onnx_opsets: [''] + # job: + # steps: + # - template: 'unit_test.yml' + # report_coverage: 'True' - - template: 'templates/job_generator.yml' - parameters: - platforms: ['windows'] - tf_versions: ['1.14.0'] - onnx_opsets: ['14'] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' + # - template: 'templates/job_generator.yml' + # parameters: + # platforms: ['windows'] + # tf_versions: ['1.14.0'] + # onnx_opsets: ['14'] + # job: + # steps: + # - template: 'unit_test.yml' + # report_coverage: 'True' - - template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.8'] - platforms: ['windows'] - tf_versions: ['2.8.1'] - onnx_opsets: ['15'] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' + # - template: 'templates/job_generator.yml' + # parameters: + # python_versions: ['3.8'] + # platforms: ['windows'] + # tf_versions: ['2.8.1'] + # onnx_opsets: ['15'] + # job: + # steps: + # - template: 'unit_test.yml' + # report_coverage: 'True' - - template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.10'] - platforms: ['windows'] - tf_versions: ['2.9.1'] - onnx_opsets: ['17'] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' + # - template: 'templates/job_generator.yml' + # parameters: + # python_versions: ['3.10'] + # platforms: ['windows'] + # tf_versions: ['2.9.1'] + # onnx_opsets: ['17'] + # job: + # steps: + # - template: 'unit_test.yml' + # report_coverage: 'True' - - template: 'templates/job_generator.yml' - parameters: - python_versions: ['3.10'] - platforms: ['windows'] - tf_versions: ['2.11.0'] - onnx_opsets: ['16'] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' + # - template: 'templates/job_generator.yml' + # parameters: + # python_versions: ['3.10'] + # platforms: ['windows'] + # tf_versions: ['2.11.0'] + # onnx_opsets: ['16'] + # job: + # steps: + # - template: 'unit_test.yml' + # report_coverage: 'True' - template: 'templates/combine_test_coverage.yml' From 545e45a7db78b43b3dd67c8d5bf9da8bcd71fe0e Mon Sep 17 00:00:00 2001 From: fatcat-z Date: Fri, 12 May 2023 15:28:02 +0800 Subject: [PATCH 2/6] Add the limitation for protobuf. Signed-off-by: fatcat-z --- .../azure_pipelines/pretrained_model_test.yml | 48 +++--- .../trimmed_keras2onnx_application_tests.yml | 68 ++++----- .../trimmed_keras2onnx_unit_test.yml | 48 +++--- ci_build/azure_pipelines/unit_test.yml | 138 +++++++++--------- setup.py | 2 +- 5 files changed, 152 insertions(+), 152 deletions(-) diff --git a/ci_build/azure_pipelines/pretrained_model_test.yml b/ci_build/azure_pipelines/pretrained_model_test.yml index 5ed2c8b6f..79da80da2 100644 --- a/ci_build/azure_pipelines/pretrained_model_test.yml +++ b/ci_build/azure_pipelines/pretrained_model_test.yml @@ -1,29 +1,29 @@ # Pre-trained model test jobs: -# - template: 'templates/job_generator.yml' -# parameters: -# python_versions: ['3.8'] -# tf_versions: ['2.9.0'] -# skip_tflite_tests: 'False' -# skip_tfjs_tests: 'False' -# skip_tf_tests: 'True' -# job: -# steps: -# - template: 'pretrained_model_test.yml' +- template: 'templates/job_generator.yml' + parameters: + python_versions: ['3.8'] + tf_versions: ['2.9.0'] + skip_tflite_tests: 'False' + skip_tfjs_tests: 'False' + skip_tf_tests: 'True' + job: + steps: + - template: 'pretrained_model_test.yml' -# - template: 'templates/job_generator.yml' -# parameters: -# python_versions: ['3.7'] -# tf_versions: ['1.15.5','2.2.0'] -# job: -# steps: -# - template: 'pretrained_model_test.yml' +- template: 'templates/job_generator.yml' + parameters: + python_versions: ['3.7'] + tf_versions: ['1.15.5','2.2.0'] + job: + steps: + - template: 'pretrained_model_test.yml' -# - template: 'templates/job_generator.yml' -# parameters: -# python_versions: ['3.9'] -# tf_versions: ['2.10.0'] -# job: -# steps: -# - template: 'pretrained_model_test.yml' +- template: 'templates/job_generator.yml' + parameters: + python_versions: ['3.9'] + tf_versions: ['2.10.0'] + job: + steps: + - template: 'pretrained_model_test.yml' diff --git a/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml b/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml index 2fdaa9f1d..183b2fcfe 100644 --- a/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml +++ b/ci_build/azure_pipelines/trimmed_keras2onnx_application_tests.yml @@ -8,42 +8,42 @@ jobs: vmImage: 'ubuntu-latest' strategy: matrix: - # Python37-tf-1.15: - # python.version: '3.7' - # ONNX_PATH: onnx==1.11.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.11.0 - # INSTALL_KERAS_RESNET: pip install keras-resnet - # INSTALL_TRANSFORMERS: - # INSTALL_NUMPY: pip install numpy==1.19.0 - # INSTALL_LEGACY: pip install h5py==2.9.0 - # NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py" + Python37-tf-1.15: + python.version: '3.7' + ONNX_PATH: onnx==1.11.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.11.0 + INSTALL_KERAS_RESNET: pip install keras-resnet + INSTALL_TRANSFORMERS: + INSTALL_NUMPY: pip install numpy==1.19.0 + INSTALL_LEGACY: pip install h5py==2.9.0 + NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py" - # Python38-tf-2.9: - # python.version: '3.8' - # ONNX_PATH: onnx==1.12.0 - # INSTALL_KERAS: - # UNINSTALL_KERAS: - # INSTALL_TENSORFLOW: pip install tensorflow==2.9.1 - # INSTALL_ORT: pip install onnxruntime==1.12.0 - # INSTALL_KERAS_RESNET: pip install keras-resnet - # INSTALL_TRANSFORMERS: pip install transformers==4.2.0 - # INSTALL_NUMPY: - # NIGHTLY_BUILD_TEST: python run_all_v2.py + Python38-tf-2.9: + python.version: '3.8' + ONNX_PATH: onnx==1.12.0 + INSTALL_KERAS: + UNINSTALL_KERAS: + INSTALL_TENSORFLOW: pip install tensorflow==2.9.1 + INSTALL_ORT: pip install onnxruntime==1.12.0 + INSTALL_KERAS_RESNET: pip install keras-resnet + INSTALL_TRANSFORMERS: pip install transformers==4.2.0 + INSTALL_NUMPY: + NIGHTLY_BUILD_TEST: python run_all_v2.py - # Python38-tf2-2.10: - # python.version: '3.8' - # ONNX_PATH: onnx==1.12.0 - # INSTALL_KERAS: - # UNINSTALL_KERAS: - # INSTALL_TENSORFLOW: pip install tensorflow==2.10.0 - # INSTALL_ORT: pip install onnxruntime==1.13.1 - # INSTALL_KERAS_RESNET: pip install keras-resnet - # INSTALL_TRANSFORMERS: pip install transformers==4.2.0 - # INSTALL_NUMPY: - # NIGHTLY_BUILD_TEST: python run_all_v2.py + Python38-tf2-2.10: + python.version: '3.8' + ONNX_PATH: onnx==1.12.0 + INSTALL_KERAS: + UNINSTALL_KERAS: + INSTALL_TENSORFLOW: pip install tensorflow==2.10.0 + INSTALL_ORT: pip install onnxruntime==1.13.1 + INSTALL_KERAS_RESNET: pip install keras-resnet + INSTALL_TRANSFORMERS: pip install transformers==4.2.0 + INSTALL_NUMPY: + NIGHTLY_BUILD_TEST: python run_all_v2.py Python38-tf2-2.11: python.version: '3.9' diff --git a/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml b/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml index 57d4a552f..36008fd49 100644 --- a/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml +++ b/ci_build/azure_pipelines/trimmed_keras2onnx_unit_test.yml @@ -9,19 +9,19 @@ jobs: matrix: ############ TF Keras Unit Tests ############ - # Python37-tf1.15: - # python.version: '3.7' - # ONNX_PATH: onnx==1.11.0 - # TENSORFLOW_PATH: tensorflow==1.15.0 - # INSTALL_ORT: pip install onnxruntime==1.11.0 - # INSTALL_NUMPY: pip install numpy==1.19.0 + Python37-tf1.15: + python.version: '3.7' + ONNX_PATH: onnx==1.11.0 + TENSORFLOW_PATH: tensorflow==1.15.0 + INSTALL_ORT: pip install onnxruntime==1.11.0 + INSTALL_NUMPY: pip install numpy==1.19.0 - # Python38-tf-2.9: - # python.version: '3.8' - # ONNX_PATH: onnx==1.12.0 - # TENSORFLOW_PATH: tensorflow==2.9.0 - # INSTALL_ORT: pip install onnxruntime==1.12.0 - # INSTALL_NUMPY: + Python38-tf-2.9: + python.version: '3.8' + ONNX_PATH: onnx==1.12.0 + TENSORFLOW_PATH: tensorflow==2.9.0 + INSTALL_ORT: pip install onnxruntime==1.12.0 + INSTALL_NUMPY: Python310-tf-latest: python.version: '3.10' @@ -50,19 +50,19 @@ jobs: strategy: matrix: ############ TF Keras Unit Tests ############ - # Python37-tf-1.15: - # python.version: '3.7' - # ONNX_PATH: onnx==1.11.0 - # TENSORFLOW_PATH: tensorflow==1.15.0 - # INSTALL_ORT: pip install onnxruntime==1.11.0 - # INSTALL_NUMPY: pip install numpy==1.19.0 + Python37-tf-1.15: + python.version: '3.7' + ONNX_PATH: onnx==1.11.0 + TENSORFLOW_PATH: tensorflow==1.15.0 + INSTALL_ORT: pip install onnxruntime==1.11.0 + INSTALL_NUMPY: pip install numpy==1.19.0 - # Python38-tf-2.9: - # python.version: '3.8' - # ONNX_PATH: onnx==1.12.0 - # TENSORFLOW_PATH: tensorflow==2.9.0 - # INSTALL_ORT: pip install onnxruntime==1.13.1 - # INSTALL_NUMPY: + Python38-tf-2.9: + python.version: '3.8' + ONNX_PATH: onnx==1.12.0 + TENSORFLOW_PATH: tensorflow==2.9.0 + INSTALL_ORT: pip install onnxruntime==1.13.1 + INSTALL_NUMPY: Python310-tf-latest: python.version: '3.10' diff --git a/ci_build/azure_pipelines/unit_test.yml b/ci_build/azure_pipelines/unit_test.yml index 88ead08d5..35777ab51 100644 --- a/ci_build/azure_pipelines/unit_test.yml +++ b/ci_build/azure_pipelines/unit_test.yml @@ -41,15 +41,15 @@ stages: - template: 'unit_test.yml' report_coverage: 'True' - # - template: 'templates/job_generator.yml' - # parameters: - # python_versions: ['3.10'] - # tf_versions: ['2.8.0'] - # onnx_opsets: [''] - # job: - # steps: - # - template: 'unit_test.yml' - # report_coverage: 'True' + - template: 'templates/job_generator.yml' + parameters: + python_versions: ['3.10'] + tf_versions: ['2.8.0'] + onnx_opsets: [''] + job: + steps: + - template: 'unit_test.yml' + report_coverage: 'True' # TODO: Enable these tests once https://github.com/onnx/tensorflow-onnx/issues/2118 is fixed. # - template: 'templates/job_generator.yml' @@ -64,17 +64,17 @@ stages: # - template: 'unit_test.yml' # report_coverage: 'True' - # - template: 'templates/job_generator.yml' - # parameters: - # python_versions: ['3.8'] - # tf_versions: ['2.7.4'] - # 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: + python_versions: ['3.8'] + tf_versions: ['2.7.4'] + onnx_opsets: [''] + skip_tflite_tests: 'False' + skip_tf_tests: 'True' + job: + steps: + - template: 'unit_test.yml' + report_coverage: 'True' # TODO: Enable these tests once https://github.com/onnx/tensorflow-onnx/issues/2118 is fixed. # - template: 'templates/job_generator.yml' @@ -111,58 +111,58 @@ stages: - template: 'unit_test.yml' report_coverage: 'True' - # - template: 'templates/job_generator.yml' - # # tf 2.5, tf 1.15 - # parameters: - # python_versions: ['3.7'] - # tf_versions: ['1.15.2','2.5.0'] - # onnx_opsets: [''] - # job: - # steps: - # - template: 'unit_test.yml' - # report_coverage: 'True' + - template: 'templates/job_generator.yml' + # tf 2.5, tf 1.15 + parameters: + python_versions: ['3.7'] + tf_versions: ['1.15.2','2.5.0'] + onnx_opsets: [''] + job: + steps: + - template: 'unit_test.yml' + report_coverage: 'True' - # - template: 'templates/job_generator.yml' - # parameters: - # platforms: ['windows'] - # tf_versions: ['1.14.0'] - # onnx_opsets: ['14'] - # job: - # steps: - # - template: 'unit_test.yml' - # report_coverage: 'True' + - template: 'templates/job_generator.yml' + parameters: + platforms: ['windows'] + tf_versions: ['1.14.0'] + onnx_opsets: ['14'] + job: + steps: + - template: 'unit_test.yml' + report_coverage: 'True' - # - template: 'templates/job_generator.yml' - # parameters: - # python_versions: ['3.8'] - # platforms: ['windows'] - # tf_versions: ['2.8.1'] - # onnx_opsets: ['15'] - # job: - # steps: - # - template: 'unit_test.yml' - # report_coverage: 'True' + - template: 'templates/job_generator.yml' + parameters: + python_versions: ['3.8'] + platforms: ['windows'] + tf_versions: ['2.8.1'] + onnx_opsets: ['15'] + job: + steps: + - template: 'unit_test.yml' + report_coverage: 'True' - # - template: 'templates/job_generator.yml' - # parameters: - # python_versions: ['3.10'] - # platforms: ['windows'] - # tf_versions: ['2.9.1'] - # onnx_opsets: ['17'] - # job: - # steps: - # - template: 'unit_test.yml' - # report_coverage: 'True' + - template: 'templates/job_generator.yml' + parameters: + python_versions: ['3.10'] + platforms: ['windows'] + tf_versions: ['2.9.1'] + onnx_opsets: ['17'] + job: + steps: + - template: 'unit_test.yml' + report_coverage: 'True' - # - template: 'templates/job_generator.yml' - # parameters: - # python_versions: ['3.10'] - # platforms: ['windows'] - # tf_versions: ['2.11.0'] - # onnx_opsets: ['16'] - # job: - # steps: - # - template: 'unit_test.yml' - # report_coverage: 'True' + - template: 'templates/job_generator.yml' + parameters: + python_versions: ['3.10'] + platforms: ['windows'] + tf_versions: ['2.11.0'] + onnx_opsets: ['16'] + job: + steps: + - template: 'unit_test.yml' + report_coverage: 'True' - template: 'templates/combine_test_coverage.yml' diff --git a/setup.py b/setup.py index 598f08c91..fcb31c3b3 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ def run(self): author='ONNX', author_email='onnx-technical-discuss@lists.lfaidata.foundation', url='https://github.com/onnx/tensorflow-onnx', - install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12'], + install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12', 'protobuf~=3.20.2'], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', From 97e798e5e011b160e0b68d03545c44abd6df73f3 Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Thu, 25 May 2023 18:42:15 +0800 Subject: [PATCH 3/6] Check the failure of latest protobuf. Signed-off-by: Jay Zhang --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fcb31c3b3..1b4c0e08e 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,8 @@ def run(self): author='ONNX', author_email='onnx-technical-discuss@lists.lfaidata.foundation', url='https://github.com/onnx/tensorflow-onnx', - install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12', 'protobuf~=3.20.2'], + # install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12', 'protobuf~=3.20.2'], + install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12', 'protobuf>4.22'], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', From d05872405897f8e0a1da630f8e9c9f158c4a87af Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 29 May 2023 13:24:59 +0800 Subject: [PATCH 4/6] Limite the protobuf version to 3.20.x. Signed-off-by: Jay Zhang --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 1b4c0e08e..fcb31c3b3 100644 --- a/setup.py +++ b/setup.py @@ -82,8 +82,7 @@ def run(self): author='ONNX', author_email='onnx-technical-discuss@lists.lfaidata.foundation', url='https://github.com/onnx/tensorflow-onnx', - # install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12', 'protobuf~=3.20.2'], - install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12', 'protobuf>4.22'], + install_requires=['numpy>=1.14.1', 'onnx>=1.4.1', 'requests', 'six', 'flatbuffers<3.0,>=1.12', 'protobuf~=3.20.2'], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', From 5dc0b4c0fcb619cdf79b1bb03aa0aa0fee6e699b Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Mon, 29 May 2023 19:44:26 +0800 Subject: [PATCH 5/6] Choose the correct opset version for tests. Signed-off-by: Jay Zhang --- tests/keras2onnx_applications/nightly_build/test_chatbot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/keras2onnx_applications/nightly_build/test_chatbot.py b/tests/keras2onnx_applications/nightly_build/test_chatbot.py index e7bf05e46..abac15857 100644 --- a/tests/keras2onnx_applications/nightly_build/test_chatbot.py +++ b/tests/keras2onnx_applications/nightly_build/test_chatbot.py @@ -9,7 +9,7 @@ from mock_keras2onnx.proto.tfcompat import is_tf2 from os.path import dirname, abspath sys.path.insert(0, os.path.join(dirname(abspath(__file__)), '../../keras2onnx_tests/')) -from test_utils import run_keras_and_ort, test_level_0 +from test_utils import run_keras_and_ort, test_level_0, get_max_opset_supported_for_test K = keras.backend Activation = keras.layers.Activation @@ -96,7 +96,7 @@ def test_chatbot(self): data1 = np.random.rand(2, 12).astype(np.float32) data2 = np.random.rand(2, 12).astype(np.float32) expected = keras_model.predict([data1, data2]) - onnx_model = mock_keras2onnx.convert_keras(keras_model, keras_model.name) + onnx_model = mock_keras2onnx.convert_keras(keras_model, keras_model.name, target_opset=get_max_opset_supported_for_test()) self.assertTrue( run_keras_and_ort(onnx_model.graph.name, onnx_model, keras_model, [data1, data2], expected, self.model_files)) From f8e613c375631222c2c11e2838ea6b5051f17cda Mon Sep 17 00:00:00 2001 From: Jay Zhang Date: Tue, 30 May 2023 00:08:47 +0800 Subject: [PATCH 6/6] Use correct opset for test. Signed-off-by: Jay Zhang --- tests/keras2onnx_unit_tests/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/keras2onnx_unit_tests/test_utils.py b/tests/keras2onnx_unit_tests/test_utils.py index e596b831d..82b5e1098 100644 --- a/tests/keras2onnx_unit_tests/test_utils.py +++ b/tests/keras2onnx_unit_tests/test_utils.py @@ -299,7 +299,7 @@ def run_image(model, model_files, img_path, model_name='onnx_conversion', rtol=1 except RuntimeError: msg = 'keras prediction throws an exception for model ' + model.name + ', skip comparison.' - onnx_model = mock_keras2onnx.convert_keras(model, model.name) + onnx_model = mock_keras2onnx.convert_keras(model, model.name, target_opset=get_max_opset_supported_for_test()) res = run_onnx_runtime(model_name, onnx_model, x, preds, model_files, rtol=rtol, atol=atol, compare_perf=compare_perf) return res, msg