Update requirements.txt (#363)

* Update requirements.txt

* Fix CI build script.

* Update the README doc

Author: Wenbing Li

.azure-pipelines/linux-CI-nightly.yml

@@ -36,11 +36,11 @@ jobs:
       conda install -c conda-forge numpy
       conda install -c conda-forge cmake
       pip install $(ONNX_PATH)
-      pip install -r requirements.txt
       git clone https://github.com/microsoft/onnxconverter-common
       cd onnxconverter-common
       pip install -e .
       cd ..
+      pip install -r requirements.txt
       pip install -r requirements-dev.txt
       pip install $(ORT_PATH)
       pip install pytest

.azure-pipelines/linux-conda-CI.yml

@@ -50,11 +50,11 @@ jobs:
       conda install -c conda-forge numpy
       conda install -c conda-forge cmake
       pip install $(ONNX_PATH)
-      pip install -r requirements.txt
       git clone https://github.com/microsoft/onnxconverter-common
       cd onnxconverter-common
       pip install -e .
       cd ..
+      pip install -r requirements.txt
       pip install -r requirements-dev.txt
       test '$(python.version)' != '2.7' && pip install $(ONNXRT_PATH)
       pip install pytest

.azure-pipelines/win32-CI-nightly.yml

@@ -37,12 +37,12 @@ jobs:
       python -m pip install --upgrade pip numpy
       echo Test numpy installation... && python -c "import numpy"
       pip install %COREML_PATH% %ONNX_PATH%
-      pip install -r requirements.txt
       git clone https://github.com/microsoft/onnxconverter-common
       cd onnxconverter-common
       pip install -e .
       cd ..
       echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
+      pip install -r requirements.txt
       pip install -r requirements-dev.txt
       pip install %ONNXRT_PATH%
       echo Test onnxruntime installation... && python -c "import onnxruntime"

.azure-pipelines/win32-conda-CI.yml

@@ -56,12 +56,12 @@ jobs:
       python -m pip install --upgrade pip numpy
       echo Test numpy installation... && python -c "import numpy"
       pip install %COREML_PATH% %ONNX_PATH%
-      pip install -r requirements.txt
       git clone https://github.com/microsoft/onnxconverter-common
       cd onnxconverter-common
       pip install -e .
       cd ..
       echo Test onnxconverter-common installation... && python -c "import onnxconverter_common"
+      pip install -r requirements.txt
       pip install -r requirements-dev.txt
       pip install %ONNXRT_PATH%
       echo Test onnxruntime installation... && python -c "import onnxruntime"

README.md

@@ -24,6 +24,7 @@ pip install onnxmltools
 ```
 or install from source:
 ```
+pip install git+https://github.com/microsoft/onnxconverter-common
 pip install git+https://github.com/onnx/onnxmltools
 ```
 If you choose to install `onnxmltools` from its source code, you must set the environment variable `ONNX_ML=1` before installing the `onnx` package. 

requirements.txt

@@ -1,7 +1,7 @@
 keras2onnx
 numpy
 onnx
-onnxconverter-common>=1.5.0
+onnxconverter-common>=1.6.1
 protobuf
 six
 skl2onnx