Skip to content

Commit 0909a30

Browse files
committed
add change in unit_test
Signed-off-by: Deyu Huang <[email protected]>
1 parent ba467ed commit 0909a30

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

ci_build/azure_pipelines/templates/keras2onnx_application_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
conda config --set always_yes yes --set changeps1 no
2121
pip install $(ONNX_PATH)
2222
pip uninstall -y protobuf
23-
pip install protobuf==3.20.1
23+
pip install "protobuf<4.21.0"
2424
pip install h5py==2.9.0
2525
pip install parameterized
2626
$(INSTALL_TENSORFLOW)
@@ -83,7 +83,7 @@ steps:
8383
echo Test numpy installation... && python -c "import numpy"
8484
pip install %ONNX_PATH%
8585
pip uninstall -y protobuf
86-
pip install protobuf==3.20.1
86+
pip install "protobuf<4.21.0"
8787
pip install h5py==2.9.0
8888
pip install parameterized
8989
%INSTALL_TENSORFLOW%

ci_build/azure_pipelines/templates/keras2onnx_unit_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
conda config --set always_yes yes --set changeps1 no
2121
pip install $(ONNX_PATH)
2222
pip uninstall -y protobuf
23-
pip install protobuf==3.20.1
23+
pip install "protobuf<4.21.0"
2424
pip install h5py==2.9.0
2525
pip install parameterized
2626
pip install $(TENSORFLOW_PATH)
@@ -73,7 +73,7 @@ steps:
7373
echo Test numpy installation... && python -c "import numpy"
7474
pip install %ONNX_PATH%
7575
pip uninstall -y protobuf
76-
pip install protobuf==3.20.1
76+
pip install "protobuf<4.21.0"
7777
pip install h5py==2.9.0
7878
pip install parameterized
7979
pip install %TENSORFLOW_PATH%

ci_build/azure_pipelines/templates/setup.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ steps:
66
pip install pytest pytest-cov pytest-runner coverage graphviz requests pyyaml pillow pandas parameterized
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.
10+
pip uninstall -y protobuf
11+
pip install "protobuf<4.21.0"
12+
913
# TF < 2.7 reuires numpy <= 1.19, but onnxruntime >= 1.11 requires numpy >= 1.21
1014
if [[ $CI_TF_VERSION < 2.7 ]] && [[ $CI_ONNX_BACKEND == "onnxruntime" ]] ;
1115
then

0 commit comments

Comments
 (0)