Specify numpy version for tf2.x version. (#1898)

Signed-off-by: Jay Zhang <[email protected]>
onnx · Mar 30, 2022 · cd9f141 · cd9f141
1 parent 8e43a17
commit cd9f141
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/ci_build/azure_pipelines/keras2onnx_application_tests.yml b/ci_build/azure_pipelines/keras2onnx_application_tests.yml
@@ -20,7 +20,7 @@ jobs:
         NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
 
       Python37-onnx1.6:
-        python.version: '3.7.3'
+        python.version: '3.7'
         ONNX_PATH: onnx==1.6.0
         INSTALL_KERAS: pip install keras==2.3.1
         UNINSTALL_KERAS:
@@ -32,7 +32,7 @@ jobs:
         NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
 
       Python37-onnx1.9:
-        python.version: '3.7.3'
+        python.version: '3.7'
         ONNX_PATH: onnx==1.9.0
         INSTALL_KERAS: pip install keras==2.3.1
         UNINSTALL_KERAS:
@@ -44,7 +44,7 @@ jobs:
         NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py"
 
       Python37-tf2.x:
-        python.version: '3.7.3'
+        python.version: '3.7'
         ONNX_PATH: onnx==1.11.0
         INSTALL_KERAS:
         UNINSTALL_KERAS: pip uninstall keras -y
@@ -90,7 +90,7 @@ jobs:
         NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
 
       Python37-onnx1.9:
-        python.version: '3.7.3'
+        python.version: '3.7'
         ONNX_PATH: onnx==1.9.0
         INSTALL_KERAS: pip install keras==2.3.1
         UNINSTALL_KERAS:
@@ -111,7 +111,7 @@ jobs:
         INSTALL_KERAS_RESNET: pip install keras-resnet
         INSTALL_TRANSFORMERS: pip install transformers==3.4.0
         INSTALL_NUMPY: pip install numpy==1.19.0
-        NIGHTLY_BUILD_TEST: python run_all.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
+        NIGHTLY_BUILD_TEST: python run_all_v2.py --exclude "test_keras_applications_v2.py test_mask_rcnn.py"
 
   steps:
   - template: 'templates/keras2onnx_application_tests.yml'

diff --git a/ci_build/azure_pipelines/keras2onnx_unit_test.yml b/ci_build/azure_pipelines/keras2onnx_unit_test.yml
@@ -21,24 +21,28 @@ jobs:
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.1.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       Python38-tf2.2:
         python.version: '3.8'
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.2.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       Python38-tf2.3:
         python.version: '3.8'
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.3.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       Python38-tf2.5:
         python.version: '3.8'
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.5.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       ############ Pure Keras Unit Tests ############
       Keras-Py36-tf1.15.0:
@@ -71,6 +75,7 @@ jobs:
         KERAS: keras==2.4.3
         TENSORFLOW_PATH: tensorflow==2.2.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
   steps:
   - template: 'templates/keras2onnx_unit_test.yml'
@@ -94,24 +99,28 @@ jobs:
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.1.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       Python37-tf2.2:
         python.version: '3.7'
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.2.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       Python37-tf2.3:
         python.version: '3.7'
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.3.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       Python37-tf2.5:
         python.version: '3.7'
         ONNX_PATH: onnx==1.11.0
         TENSORFLOW_PATH: tensorflow-cpu==2.5.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
       ############ Pure Keras Unit Tests ############
       Keras-Py36-tf1.15.0:
@@ -135,6 +144,7 @@ jobs:
         KERAS: keras==2.4.3
         TENSORFLOW_PATH: tensorflow==2.2.0
         INSTALL_ORT: pip install onnxruntime==1.11.0
+        INSTALL_NUMPY: pip install numpy==1.19.0
 
   steps:
   - template: 'templates/keras2onnx_unit_test.yml'