diff --git a/.azure-pipelines/linux-CI-keras-applications-nightly.yml b/.azure-pipelines/linux-CI-keras-applications-nightly.yml index fe9b1ef6..248210b6 100644 --- a/.azure-pipelines/linux-CI-keras-applications-nightly.yml +++ b/.azure-pipelines/linux-CI-keras-applications-nightly.yml @@ -16,7 +16,7 @@ jobs: matrix: Python36-onnx1.2: python.version: '3.6' - ONNX_PATH: onnx==1.2.3 + ONNX_PATH: pip install onnx==1.2.3 INSTALL_KERAS: pip install keras==2.1.6 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.15.0 @@ -27,7 +27,7 @@ jobs: Python36-onnx1.5: python.version: '3.6' - ONNX_PATH: onnx==1.5.0 + ONNX_PATH: pip install onnx==1.5.0 INSTALL_KERAS: pip install keras==2.2.4 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.15.0 @@ -38,7 +38,7 @@ jobs: Python37: python.version: '3.7.3' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx INSTALL_KERAS: pip install keras==2.3.1 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.15.0 @@ -49,7 +49,7 @@ jobs: Python37-official-ort: python.version: '3.7.3' - ONNX_PATH: onnx==1.6.0 + ONNX_PATH: pip install onnx==1.6.0 INSTALL_KERAS: pip install keras==2.3.1 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.15.0 @@ -60,7 +60,7 @@ jobs: Python38-tf2: python.version: '3.8' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx INSTALL_KERAS: UNINSTALL_KERAS: pip uninstall keras -y INSTALL_TENSORFLOW: pip install tensorflow==2.2.0 @@ -84,7 +84,7 @@ jobs: - script: | python -m pip install --upgrade pip conda config --set always_yes yes --set changeps1 no - pip install $(ONNX_PATH) + $(ONNX_PATH) pip install h5py==2.9.0 $(INSTALL_TENSORFLOW) $(INSTALL_KERAS) diff --git a/.azure-pipelines/linux-conda-CI-tf-keras.yml b/.azure-pipelines/linux-conda-CI-tf-keras.yml index ff490945..6c6baaf8 100644 --- a/.azure-pipelines/linux-conda-CI-tf-keras.yml +++ b/.azure-pipelines/linux-conda-CI-tf-keras.yml @@ -16,31 +16,31 @@ jobs: # No python 2.x since tf2onnx does not support it Python36-onnx1.2: python.version: '3.6' - ONNX_PATH: onnx==1.2.3 + ONNX_PATH: pip install onnx==1.2.3 TENSORFLOW_PATH: tensorflow==1.11.0 INSTALL_ORT: pip install onnxruntime==1.1.1 Python36-onnx1.5: python.version: '3.6' - ONNX_PATH: onnx==1.5.0 + ONNX_PATH: pip install onnx==1.5.0 TENSORFLOW_PATH: tensorflow==1.15.0 INSTALL_ORT: pip install onnxruntime==1.1.1 Python37: python.version: '3.7' - ONNX_PATH: onnx==1.6.0 + ONNX_PATH: pip install onnx==1.6.0 TENSORFLOW_PATH: tensorflow-cpu==2.1.0 INSTALL_ORT: pip install onnxruntime==1.4.0 Python38: python.version: '3.8' - ONNX_PATH: onnx==1.7.0 + ONNX_PATH: pip install onnx==1.7.0 TENSORFLOW_PATH: tensorflow-cpu==2.2.0 INSTALL_ORT: Python38-tf2.3: python.version: '3.8' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx TENSORFLOW_PATH: tensorflow-cpu==2.3.0 INSTALL_ORT: pip install onnxruntime==1.7.0 @@ -59,7 +59,7 @@ jobs: - script: | python -m pip install --upgrade pip conda config --set always_yes yes --set changeps1 no - pip install $(ONNX_PATH) + $(ONNX_PATH) pip install h5py==2.9.0 pip install $(TENSORFLOW_PATH) pip install git+https://github.com/microsoft/onnxconverter-common diff --git a/.azure-pipelines/linux-conda-CI.yml b/.azure-pipelines/linux-conda-CI.yml index 3936920d..ce2bfd94 100644 --- a/.azure-pipelines/linux-conda-CI.yml +++ b/.azure-pipelines/linux-conda-CI.yml @@ -15,21 +15,21 @@ jobs: matrix: Python36-tf1110: python.version: '3.6' - ONNX_PATH: onnx==1.2.3 + ONNX_PATH: pip install onnx==1.2.3 KERAS: keras==2.1.6 TENSORFLOW_PATH: tensorflow==1.11.0 INSTALL_ORT: pip install onnxruntime==1.1.1 Python36-tf1150: python.version: '3.6' - ONNX_PATH: onnx==1.5.0 + ONNX_PATH: pip install onnx==1.5.0 KERAS: keras==2.2.5 TENSORFLOW_PATH: tensorflow==1.15.0 INSTALL_ORT: pip install onnxruntime==1.1.1 Python37-tf1150: python.version: '3.7' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx KERAS: keras==2.4.3 TENSORFLOW_PATH: tensorflow==1.15.0 INSTALL_ORT: pip install onnxruntime==1.6.0 @@ -37,7 +37,7 @@ jobs: # UT for keras 2.3 need tensorflow <= 2.0.0 Python37-tf200: python.version: '3.7' - ONNX_PATH: onnx==1.6.0 + ONNX_PATH: pip install onnx==1.6.0 KERAS: keras==2.3.1 TENSORFLOW_PATH: tensorflow==2.0.0 INSTALL_ORT: pip install onnxruntime==1.4.0 @@ -45,7 +45,7 @@ jobs: # ORT hasn't support Python 3.8 yet. Python38-tf220: python.version: '3.8' - ONNX_PATH: onnx==1.7.0 + ONNX_PATH: pip install onnx==1.7.0 KERAS: keras==2.4.3 TENSORFLOW_PATH: tensorflow==2.2.0 INSTALL_ORT: @@ -65,7 +65,7 @@ jobs: - script: | python -m pip install --upgrade pip conda config --set always_yes yes --set changeps1 no - pip install $(ONNX_PATH) + $(ONNX_PATH) pip install h5py==2.9.0 pip install $(TENSORFLOW_PATH) pip install $(KERAS) diff --git a/.azure-pipelines/win32-CI-keras-applications-nightly.yml b/.azure-pipelines/win32-CI-keras-applications-nightly.yml index 86fb27a4..fdc5dace 100644 --- a/.azure-pipelines/win32-CI-keras-applications-nightly.yml +++ b/.azure-pipelines/win32-CI-keras-applications-nightly.yml @@ -17,7 +17,7 @@ jobs: # No python 2.x since no available ONNX package for Windows Python36-onnx1.2: python.version: '3.6' - ONNX_PATH: onnx==1.2.3 + ONNX_PATH: pip install onnx==1.2.3 INSTALL_KERAS: pip install keras==2.1.6 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.14.0 @@ -28,7 +28,7 @@ jobs: Python36-onnx1.5: python.version: '3.6' - ONNX_PATH: onnx==1.5.0 + ONNX_PATH: pip install onnx==1.5.0 INSTALL_KERAS: pip install keras==2.2.4 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.14.0 @@ -39,7 +39,7 @@ jobs: Python37: python.version: '3.7' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx INSTALL_KERAS: pip install keras==2.3.1 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.14.0 @@ -50,7 +50,7 @@ jobs: Python37-official-ort: python.version: '3.7' - ONNX_PATH: onnx==1.6.0 + ONNX_PATH: pip install onnx==1.6.0 INSTALL_KERAS: pip install keras==2.3.1 UNINSTALL_KERAS: INSTALL_TENSORFLOW: pip install tensorflow==1.14.0 @@ -61,7 +61,7 @@ jobs: Python38-tf2: python.version: '3.8' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx INSTALL_KERAS: UNINSTALL_KERAS: pip uninstall keras -y INSTALL_TENSORFLOW: pip install tensorflow==2.2.0 @@ -88,7 +88,7 @@ jobs: call activate py$(python.version) python -m pip install --upgrade pip numpy echo Test numpy installation... && python -c "import numpy" - pip install %ONNX_PATH% + %ONNX_PATH% pip install h5py==2.9.0 %INSTALL_TENSORFLOW% %INSTALL_KERAS% diff --git a/.azure-pipelines/win32-conda-CI-tf-keras.yml b/.azure-pipelines/win32-conda-CI-tf-keras.yml index 834c2b1c..6e964b84 100644 --- a/.azure-pipelines/win32-conda-CI-tf-keras.yml +++ b/.azure-pipelines/win32-conda-CI-tf-keras.yml @@ -16,31 +16,31 @@ jobs: # No python 2.x since no available ONNX package for Windows Python36-onnx1.2: python.version: '3.6' - ONNX_PATH: onnx==1.2.3 + ONNX_PATH: pip install onnx==1.2.3 TENSORFLOW_PATH: tensorflow==1.11.0 INSTALL_ORT: pip install onnxruntime==1.1.1 Python36-onnx1.5: python.version: '3.6' - ONNX_PATH: onnx==1.5.0 + ONNX_PATH: pip install onnx==1.5.0 TENSORFLOW_PATH: tensorflow==1.14.0 INSTALL_ORT: pip install onnxruntime==1.1.1 Python37: python.version: '3.7' - ONNX_PATH: onnx==1.6.0 + ONNX_PATH: pip install onnx==1.6.0 TENSORFLOW_PATH: tensorflow-cpu==2.1.0 INSTALL_ORT: pip install onnxruntime==1.4.0 Python38: python.version: '3.8' - ONNX_PATH: onnx==1.7.0 + ONNX_PATH: pip install onnx==1.7.0 TENSORFLOW_PATH: tensorflow-cpu==2.2.0 INSTALL_ORT: Python38-tf2.3: python.version: '3.8' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx TENSORFLOW_PATH: tensorflow-cpu==2.3.0 INSTALL_ORT: pip install onnxruntime==1.7.0 @@ -62,7 +62,7 @@ jobs: call activate py$(python.version) python -m pip install --upgrade pip numpy echo Test numpy installation... && python -c "import numpy" - pip install %ONNX_PATH% + %ONNX_PATH% pip install h5py==2.9.0 pip install %TENSORFLOW_PATH% pip install git+https://github.com/microsoft/onnxconverter-common diff --git a/.azure-pipelines/win32-conda-CI.yml b/.azure-pipelines/win32-conda-CI.yml index ac2452fc..685bb720 100644 --- a/.azure-pipelines/win32-conda-CI.yml +++ b/.azure-pipelines/win32-conda-CI.yml @@ -16,14 +16,14 @@ jobs: # No python 2.x since no available ONNX package for Windows Python36-tf1110: python.version: '3.6' - ONNX_PATH: onnx==1.2.3 + ONNX_PATH: pip install onnx==1.2.3 KERAS: keras==2.1.6 TENSORFLOW_PATH: tensorflow==1.11.0 INSTALL_ORT: pip install onnxruntime==1.1.1 Python36-tf1140: python.version: '3.6' - ONNX_PATH: onnx==1.5.0 + ONNX_PATH: pip install onnx==1.5.0 KERAS: keras==2.2.5 TENSORFLOW_PATH: tensorflow==1.15.0 INSTALL_ORT: pip install onnxruntime==1.1.1 @@ -31,14 +31,14 @@ jobs: # UT for keras 2.3 need tensorflow <= 2.0.0 Python37-tf200: python.version: '3.7' - ONNX_PATH: onnx==1.7.0 + ONNX_PATH: pip install onnx==1.7.0 KERAS: keras==2.3.1 TENSORFLOW_PATH: tensorflow==2.0.0 INSTALL_ORT: pip install onnxruntime==1.4.0 Python38-tf220: python.version: '3.8' - ONNX_PATH: onnx==1.8.0 + ONNX_PATH: pip install -i https://test.pypi.org/simple/ onnx KERAS: keras==2.4.3 TENSORFLOW_PATH: tensorflow==2.2.0 INSTALL_ORT: @@ -61,7 +61,7 @@ jobs: call activate py$(python.version) python -m pip install --upgrade pip numpy echo Test numpy installation... && python -c "import numpy" - pip install %ONNX_PATH% + %ONNX_PATH% pip install h5py==2.9.0 pip install %TENSORFLOW_PATH% pip install %KERAS%