Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use onnxmltools>=1.6.0,<=1.11.0 instead of onnxmltools>=1.6.0 #592

Merged
merged 4 commits into from
Jun 16, 2022
Merged

Use onnxmltools>=1.6.0,<=1.11.0 instead of onnxmltools>=1.6.0 #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3461aef
use `onnxmltools>=1.6.0,<=1.11.0`
mshr-h Jun 15, 2022
c01eb39
run `pip list`
mshr-h Jun 16, 2022
f165a3d
install scikit-learn>=0.21.3,<1.1.0 explicitly
mshr-h Jun 16, 2022
6ab11c2
Merge branch 'main' into fix-onnx-test-skipping
ksaur Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/pythonapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
run: |
pip install .[tests] -f https://download.pytorch.org/whl/torch_stable.html
pip install git+https://github.com/onnx/sklearn-onnx.git@9b551d8ecfd9f97ad8771909e34cfffea7b6e99d
pip install "scikit-learn>=0.21.3,<1.1.0"
- name: Run basic tests without extra
run: pytest
- name: Coverage on basic tests without extra
Expand All @@ -74,6 +75,8 @@ jobs:
run: |
pip install .[extra,onnx,sparkml]
pip install pandas
- name: pip list
run: pip list
- uses: actions/cache@v1
# TVM takes forever, we try to cache it.
if: ${{ matrix.os != 'windows-2019' }}
Expand Down Expand Up @@ -126,6 +129,8 @@ jobs:
working-directory: ../../../tvm/python
run: |
python setup.py install
- name: pip list
run: pip list
# We don't run pytest for Linux py3.7 since we do coverage for that case.
- name: Test with pytest
if: ${{ matrix.python-version != '3.7' || matrix.os != 'ubuntu-18.04' }}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
]
onnx_requires = [
"onnxruntime>=1.0.0",
"onnxmltools>=1.6.0",
"onnxmltools>=1.6.0,<=1.11.0",
"skl2onnx>=1.7.0",
]
extra_requires = [
Expand Down