Skip to content

Commit 85341f4

Browse files
committed
add protubuf limit for tf 2.9.1
Signed-off-by: Deyu Huang <[email protected]>
1 parent 180b1d0 commit 85341f4

File tree

3 files changed

+12
-28
lines changed

3 files changed

+12
-28
lines changed

ci_build/azure_pipelines/pretrained_model_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- template: 'templates/job_generator.yml'
1717
parameters:
18-
# 2.7, tf
18+
# 2.8, tf
1919
python_versions: ['3.7']
2020
tf_versions: ['1.15.5','2.8.0']
2121
job:
@@ -24,7 +24,7 @@ jobs:
2424

2525
- template: 'templates/job_generator.yml'
2626
parameters:
27-
# 2.8, tf
27+
# 2.9, tf
2828
python_versions: ['3.9']
2929
tf_versions: ['2.9.1']
3030
job:
@@ -33,7 +33,7 @@ jobs:
3333

3434
- template: 'templates/job_generator.yml'
3535
parameters:
36-
# 2.8, tf 3.10
36+
# 2.9, tf; 3.10, py
3737
python_versions: ['3.10']
3838
tf_versions: ['2.9.0']
3939
job:

ci_build/azure_pipelines/templates/setup.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ steps:
66
pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized sympy coloredlogs flatbuffers
77
pip install $(CI_PIP_TF_NAME) $(CI_PIP_ONNX_NAME)
88
9-
# protobuf release version 4.21.0 has some Python changes which is not compatible with tensorflow so far.
9+
# Protobuf 3.20 results in linker errors on Windows in TF.
10+
# Protobuf 4.0 is binary incompatible with what C++ TF uses.
11+
# https://github.com/tensorflow/tensorflow/blob/c3337c73306b2b859d82fe130912f18e6a1c5c23/tensorflow/tools/pip_package/setup.py#L88
1012
pip uninstall -y protobuf
11-
pip install "protobuf<4.21.0"
13+
pip install "protobuf<3.20.0"
1214
1315
# TF < 2.7 reuires numpy <= 1.19, but onnxruntime >= 1.11 requires numpy >= 1.21
1416
if [[ $CI_TF_VERSION < 2.7 ]] && [[ $CI_ONNX_BACKEND == "onnxruntime" ]] ;
@@ -64,6 +66,10 @@ steps:
6466
if [[ $CI_TF_VERSION == 2.8* ]] ;
6567
then
6668
pip install "tensorflow-text>=2.8,<2.9"
69+
fi
70+
if [[ $CI_TF_VERSION == 2.9* ]] ;
71+
then
72+
pip install "tensorflow-text>=2.9,<2.10"
6773
else
6874
pip install tensorflow-text
6975
fi

ci_build/azure_pipelines/unit_test.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ stages:
106106
- template: 'templates/job_generator.yml'
107107
parameters:
108108
# tf 2.9
109-
python_versions: ['3.8']
109+
python_versions: ['3.10']
110110
tf_versions: ['2.9.1']
111111
onnx_opsets: ['']
112112
job:
@@ -125,28 +125,6 @@ stages:
125125
- template: 'unit_test.yml'
126126
report_coverage: 'True'
127127

128-
- template: 'templates/job_generator.yml'
129-
parameters:
130-
# tf 1.13
131-
python_versions: ['3.7']
132-
tf_versions: ['1.13.1']
133-
onnx_opsets: ['9']
134-
job:
135-
steps:
136-
- template: 'unit_test.yml'
137-
report_coverage: 'True'
138-
139-
- template: 'templates/job_generator.yml'
140-
parameters:
141-
# tf 2.9
142-
python_versions: ['3.10']
143-
tf_versions: ['2.9.1']
144-
onnx_opsets: ['']
145-
job:
146-
steps:
147-
- template: 'unit_test.yml'
148-
report_coverage: 'True'
149-
150128
- template: 'templates/job_generator.yml'
151129
parameters:
152130
platforms: ['windows']

0 commit comments

Comments
 (0)