Update the way to install onnxconverter-common for nightly job failur…

…e. (#2122) * Install onnxconverter-common in the beginning. * Set onnxconverter-common to latest version. Signed-off-by: Jay Zhang <[email protected]>
onnx · Feb 21, 2023 · 82ae7c4 · 82ae7c4
1 parent ff139a4
commit 82ae7c4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ __pycache__
 .eggs
 *.egg-info
 run.sh
+node_modules/*
 tests/tfhub/*/*.onnx
 tests/tfhub/*/*.tar.gz
 tests/tfhub/*/*.tflite

diff --git a/ci_build/azure_pipelines/keras2onnx_application_tests.yml b/ci_build/azure_pipelines/keras2onnx_application_tests.yml
@@ -105,9 +105,9 @@ jobs:
         INSTALL_NUMPY:
         NIGHTLY_BUILD_TEST: python run_all_v2.py
 
-      Python310-onnx1.12-tf2.9:
+      Python310-onnx1.13-tf2.9:
         python.version: '3.10'
-        ONNX_PATH: onnx==1.12.0
+        ONNX_PATH: onnx==1.13.0
         INSTALL_KERAS:
         UNINSTALL_KERAS:
         INSTALL_TENSORFLOW: pip install tensorflow==2.9.0

diff --git a/ci_build/azure_pipelines/templates/keras2onnx_application_tests.yml b/ci_build/azure_pipelines/templates/keras2onnx_application_tests.yml
@@ -18,6 +18,7 @@ steps:
   - script: |
       python -m pip install --upgrade pip
       conda config --set always_yes yes --set changeps1 no
+      pip install onnxconverter-common
       pip install $(ONNX_PATH)
       pip uninstall -y protobuf
       pip install "protobuf<4.21.0"
@@ -27,7 +28,6 @@ steps:
       pip install coloredlogs flatbuffers
       $(INSTALL_TENSORFLOW)
       $(INSTALL_KERAS)
-      pip install git+https://github.com/microsoft/onnxconverter-common
       $(INSTALL_ORT)
       pip install Pillow==8.2.0
       pip install opencv-python
@@ -87,6 +87,7 @@ steps:
       call activate py$(python.version)
       python -m pip install --upgrade pip numpy
       echo Test numpy installation... && python -c "import numpy"
+      pip install onnxconverter-common
       pip install %ONNX_PATH%
       pip uninstall -y protobuf
       pip install "protobuf<4.21.0"
@@ -96,7 +97,6 @@ steps:
       pip install coloredlogs flatbuffers
       %INSTALL_TENSORFLOW%
       %INSTALL_KERAS%
-      pip install git+https://github.com/microsoft/onnxconverter-common
       %INSTALL_ORT%
       pip install Pillow==8.2.0
       pip install opencv-python

diff --git a/ci_build/azure_pipelines/templates/keras2onnx_unit_test.yml b/ci_build/azure_pipelines/templates/keras2onnx_unit_test.yml
@@ -18,6 +18,7 @@ steps:
   - script: |
       python -m pip install --upgrade pip
       conda config --set always_yes yes --set changeps1 no
+      pip install onnxconverter-common
       pip install $(ONNX_PATH)
       pip uninstall -y protobuf
       pip install "protobuf<4.21.0"
@@ -30,7 +31,6 @@ steps:
       then
         pip install $(KERAS)
       fi
-      pip install git+https://github.com/microsoft/onnxconverter-common
       pip install -r requirements.txt
       pip install -r requirements-dev.txt
       pip install pytest pytest-cov pytest-runner
@@ -73,6 +73,7 @@ steps:
       call activate py$(python.version)
       python -m pip install --upgrade pip numpy
       echo Test numpy installation... && python -c "import numpy"
+      pip install onnxconverter-common
       pip install %ONNX_PATH%
       pip uninstall -y protobuf
       pip install "protobuf<4.21.0"
@@ -82,7 +83,6 @@ steps:
       pip install coloredlogs flatbuffers
       pip install %TENSORFLOW_PATH%
       IF NOT "%KERAS%"=="" (pip install %KERAS%)
-      pip install git+https://github.com/microsoft/onnxconverter-common
       pip install pytest pytest-cov pytest-runner
       %INSTALL_ORT%
       %INSTALL_NUMPY%

diff --git a/ci_build/azure_pipelines/unit_test.yml b/ci_build/azure_pipelines/unit_test.yml
@@ -153,4 +153,3 @@ stages:
         report_coverage: 'True'
 
   - template: 'templates/combine_test_coverage.yml'
-