diff --git a/ci_build/azure_pipelines/pretrained_model_test.yml b/ci_build/azure_pipelines/pretrained_model_test.yml index 3cd8cb4ce..dc6214df3 100644 --- a/ci_build/azure_pipelines/pretrained_model_test.yml +++ b/ci_build/azure_pipelines/pretrained_model_test.yml @@ -15,7 +15,7 @@ jobs: - template: 'templates/job_generator.yml' parameters: - # 2.7, tf + # 2.8, tf python_versions: ['3.7'] tf_versions: ['1.15.5','2.8.0'] job: @@ -24,7 +24,7 @@ jobs: - template: 'templates/job_generator.yml' parameters: - # 2.8, tf + # 2.9, tf python_versions: ['3.9'] tf_versions: ['2.9.1'] job: @@ -33,7 +33,7 @@ jobs: - template: 'templates/job_generator.yml' parameters: - # 2.8, tf 3.10 + # 2.9, tf; 3.10, py python_versions: ['3.10'] tf_versions: ['2.9.0'] job: diff --git a/ci_build/azure_pipelines/templates/job_generator.yml b/ci_build/azure_pipelines/templates/job_generator.yml index 7859f5991..c0f23a30a 100644 --- a/ci_build/azure_pipelines/templates/job_generator.yml +++ b/ci_build/azure_pipelines/templates/job_generator.yml @@ -6,7 +6,7 @@ parameters: tf_versions: [''] onnx_versions: [''] onnx_opsets: ['16', '15', '14', '13', '12', '11', '10', '9'] - onnx_backends: {onnxruntime: ['1.11.0']} + onnx_backends: {onnxruntime: ['1.12.0']} job: {} run_setup: 'True' report_coverage: 'False' diff --git a/ci_build/azure_pipelines/templates/setup.yml b/ci_build/azure_pipelines/templates/setup.yml index 6bb950643..7784efce6 100644 --- a/ci_build/azure_pipelines/templates/setup.yml +++ b/ci_build/azure_pipelines/templates/setup.yml @@ -6,9 +6,11 @@ steps: pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers pip install $(CI_PIP_TF_NAME) $(CI_PIP_ONNX_NAME) - # protobuf release version 4.21.0 has some Python changes which is not compatible with tensorflow so far. + # Protobuf 3.20 results in linker errors on Windows in TF. + # Protobuf 4.0 is binary incompatible with what C++ TF uses. + # https://github.com/tensorflow/tensorflow/blob/c3337c73306b2b859d82fe130912f18e6a1c5c23/tensorflow/tools/pip_package/setup.py#L88 pip uninstall -y protobuf - pip install "protobuf<4.21.0" + pip install "protobuf<3.20.0" # TF < 2.7 reuires numpy <= 1.19, but onnxruntime >= 1.11 requires numpy >= 1.21 if [[ $CI_TF_VERSION < 2.7 ]] && [[ $CI_ONNX_BACKEND == "onnxruntime" ]] ; @@ -64,6 +66,10 @@ steps: if [[ $CI_TF_VERSION == 2.8* ]] ; then pip install "tensorflow-text>=2.8,<2.9" + fi + if [[ $CI_TF_VERSION == 2.9* ]] ; + then + pip install "tensorflow-text>=2.9,<2.10" else pip install tensorflow-text fi diff --git a/ci_build/azure_pipelines/unit_test.yml b/ci_build/azure_pipelines/unit_test.yml index 3b03a7d16..1996d9c55 100644 --- a/ci_build/azure_pipelines/unit_test.yml +++ b/ci_build/azure_pipelines/unit_test.yml @@ -106,7 +106,7 @@ stages: - template: 'templates/job_generator.yml' parameters: # tf 2.9 - python_versions: ['3.8'] + python_versions: ['3.10'] tf_versions: ['2.9.1'] onnx_opsets: [''] job: @@ -125,28 +125,6 @@ stages: - template: 'unit_test.yml' report_coverage: 'True' - - template: 'templates/job_generator.yml' - parameters: - # tf 1.13 - python_versions: ['3.7'] - tf_versions: ['1.13.1'] - onnx_opsets: ['9'] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' - - - template: 'templates/job_generator.yml' - parameters: - # tf 2.9 - python_versions: ['3.10'] - tf_versions: ['2.9.1'] - onnx_opsets: [''] - job: - steps: - - template: 'unit_test.yml' - report_coverage: 'True' - - template: 'templates/job_generator.yml' parameters: platforms: ['windows']