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

Jump to bottom

Adds an example about FunctionTransformer #1042

Merged
merged 13 commits into from
Nov 14, 2023
Merged

Adds an example about FunctionTransformer #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1af4eaf
Adds an example about FunctionTransformer
xadupre Nov 8, 2023
f3eb373
update to retain two original column
xadupre Nov 8, 2023
8346c82
add onnxscript
xadupre Nov 9, 2023
03cfcbf
fix ci
xadupre Nov 9, 2023
0596866
fix yml
xadupre Nov 9, 2023
62d81f9
update CI
xadupre Nov 9, 2023
22f363e
ci
xadupre Nov 9, 2023
689ebd0
ci
xadupre Nov 9, 2023
fc8f087
fix pandas version
xadupre Nov 13, 2023
29cef89
fix syntax
xadupre Nov 13, 2023
0584468
rename
xadupre Nov 13, 2023
0d539f5
remove old build
xadupre Nov 13, 2023
e6741b3
doc
xadupre Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions .azure-pipelines/linux-CI-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,7 @@ jobs:
displayName: 'install scikit-learn'

- script: |
if [ '$(onnx.version)' == 'git' ]
then
git clone https://github.com/onnx/onnx.git --recursive
export ONNX_ML=1
cd onnx
python setup.py install
cd ..
else
pip install onnx$(onnx.version)
fi
pip install onnx$(onnx.version)
displayName: 'install onnx'

- script: |
Expand Down
109 changes: 30 additions & 79 deletions .azure-pipelines/linux-conda-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ jobs:
strategy:
matrix:

Py311-Onnx150-Rt161-Skl131:
Py311-Onnx150-Rt161-Skl132:
do.bench: '0'
python.version: '3.11'
numpy.version: '>=1.21.1'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.15.0' # -i https://test.pypi.org/simple/ onnx==1.15.0rc2'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.16.1'
sklearn.version: '>=1.3.1'
sklearn.version: '>=1.3.2'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '1'
Expand All @@ -35,7 +36,8 @@ jobs:
onnx.version: 'onnx==1.14.1'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.16.0'
sklearn.version: '>=1.3.1'
sklearn.version: '==1.3.1'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '1'
Expand All @@ -49,6 +51,7 @@ jobs:
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.15.1'
sklearn.version: '==1.3.0'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Expand All @@ -62,6 +65,7 @@ jobs:
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.14.0'
sklearn.version: '==1.2.2'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Expand All @@ -75,6 +79,7 @@ jobs:
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.14.0'
sklearn.version: '==1.2.1'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Expand All @@ -88,6 +93,7 @@ jobs:
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.13.1'
sklearn.version: '==1.2.0'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Expand All @@ -101,6 +107,7 @@ jobs:
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.13.1'
sklearn.version: '==1.2.0'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Expand All @@ -113,102 +120,72 @@ jobs:
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.12.1'
sklearn.version: '==1.1.3'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx120-Rt1111-Skl11:
do.bench: '0'
python.version: '3.9'
numpy.version: '>=1.21.0'
numpy.version: '>=1.21.0,<1.23.0'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.12.0'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.11.1'
sklearn.version: '==1.1.3'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx1110-Rt1111-Skl11:
do.bench: '0'
python.version: '3.9'
numpy.version: '>=1.21.0'
numpy.version: '>=1.21.0,<1.23.0'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.11.0'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.11.1'
sklearn.version: '==1.1.3'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx1110-Rt1111-Skl10:
do.bench: '0'
python.version: '3.9'
numpy.version: '>=1.22.3'
numpy.version: '>=1.21.0,<1.23.0'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.11.0'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.11.1'
sklearn.version: '==1.0.2'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx1110-Rt1100-Skl10:
do.bench: '0'
python.version: '3.9'
numpy.version: '>=1.21.0'
numpy.version: '>=1.21.0,<1.23.0'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.11.0'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.10.0'
sklearn.version: '==1.0.2'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx1101-Rt190-Skl10:
do.bench: '0'
python.version: '3.9'
numpy.version: '>=1.21.0'
numpy.version: '>=1.21.0,<1.23.0'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.10.1'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.9.0'
sklearn.version: '==1.0.2'
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx1101-Rt190-Skl0242:
do.bench: '0'
python.version: '3.9'
numpy.version: '<1.21.0'
scipy.version: ''
onnx.version: 'onnx==1.10.1'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.9.0'
sklearn.version: '==0.24.2'
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx190-Rt180-Skl0242:
do.bench: '0'
python.version: '3.9'
numpy.version: '<1.21.0'
scipy.version: ''
onnx.version: 'onnx==1.9.0'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime>=1.8.1'
sklearn.version: '==0.24.2'
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Py39-Onnx190-Rt180-Skl0232:
do.bench: '0'
python.version: '3.9'
numpy.version: '<1.21.0'
scipy.version: ''
onnx.version: 'onnx==1.9.0'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime>=1.8.1'
sklearn.version: '==0.23.2'
pandas.version: ''
lgbm.version: ''
onnxcc.version: '>=1.8.1'
run.example: '0'
Expand Down Expand Up @@ -255,37 +232,8 @@ jobs:
displayName: 'install scikit-learn'

- script: |
if [ '$(onnx.version)' == 'git' ]
then
pip install typing-extensions>=3.6.2.1
git clone https://github.com/onnx/onnx.git --recursive
export ONNX_ML=1
cd onnx
python setup.py install
cd ..
else
if [ '$(onnx.version)' == 'test' ]
then
pip install typing-extensions>=3.6.2.1
pip install -i https://test.pypi.org/simple/ onnx
else
pip install typing-extensions>=3.6.2.1
pip install $(onnx.version)
fi
fi
displayName: 'install onnx'

- script: |
pip show onnx
displayName: 'onnx version'

- script: |
pip install $(onnxrt.version)
displayName: 'install onnxruntime'

- script: |
pip show onnx
displayName: 'onnx version'
pip install $(onnx.version) $(onnxrt.version)
displayName: 'install onnxruntime, onnx'

- script: |
if [ '$(onnxcc.version)' == 'git' ]
Expand All @@ -296,10 +244,6 @@ jobs:
fi
displayName: 'install onnxconverter-common'

- script: |
pip show onnx
displayName: 'onnx version'

- script: |
pip install -r requirements.txt
pip install -r requirements-dev.txt
Expand All @@ -309,6 +253,10 @@ jobs:
pip show onnx
displayName: 'onnx version'

- script: |
pip install $(onnx.version) $(onnxrt.version) "numpy$(numpy.version)" scikit-learn$(sklearn.version) scipy$(scipy.version) "pandas$(pandas.version)"
displayName: install onnxruntime, onnx, numpy, scikit-learn, pandas again # to make sure the proper version is installed

- script: |
pip install -e .
displayName: 'install'
Expand All @@ -317,6 +265,8 @@ jobs:
echo "---------------"
pip show numpy
echo "---------------"
pip show pandas
echo "---------------"
pip show scipy
echo "---------------"
pip show pandas
Expand All @@ -340,6 +290,7 @@ jobs:
fi
cd tests
python -c "from numpy import __version__;print('numpy', __version__)"
python -c "from pandas import __version__;print('pandas', __version__)"
python -c "from scipy import __version__;print('scipy', __version__)"
python -c "from sklearn import __version__;print('sklearn', __version__)"
python -c "from onnxruntime import __version__;print('onnxruntime', __version__)"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ build/
*.bat

# test generated files
*.onnx
.pytest_cache
.cache
htmlcov
Expand Down
12 changes: 10 additions & 2 deletions CHANGELOGS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@

## 1.16.0

* Add an example on how to handle FunctionTransformer
[#1042](https://github.com/onnx/sklearn-onnx/pull/1042),
Versions of `scikit-learn < 1.0` are not tested any more.
* FeatureHasher, raise an error when the delimiter length is > 1,
[#1036](https://github.com/onnx/sklearn-onnx/pull/1036)
* skl2onnx works with onnx==1.15.0,
[#1034](https://github.com/onnx/sklearn-onnx/pull/1034)
* fix OneHotEncoder when categories indices to drop are not None
[#1028](https://github.com/onnx/sklearn-onnx/pull/1028)
* fix converter for AdaBoost estimators in scikit-learn==1.3.1
[#1027](https://github.com/onnx/sklearn-onnx/pull/1027)
* add function 'add_onnx_graph' to insert onnx graph coming from other converting
* add function 'add_onnx_graph' to insert onnx graph coming from other converting,
libraries within the converter mapped to a custom estimator
[#1023](https://github.com/onnx/sklearn-onnx/pull/1023)
[#1023](https://github.com/onnx/sklearn-onnx/pull/1023),
[#1024](https://github.com/onnx/sklearn-onnx/pull/1024)
* add option 'language' to converters of CountVectorizer, TfIdfVectorizer
[#1020](https://github.com/onnx/sklearn-onnx/pull/1020)