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.

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

Update to scikit-learn==1.3.0 #1002

Merged
merged 15 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 18 additions & 5 deletions .azure-pipelines/linux-conda-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ jobs:
strategy:
matrix:

Py311-Onnx140-Rt151-Skl130:
do.bench: '0'
python.version: '3.11' # onnxruntime cannot support python 3.11 yet
numpy.version: '>=1.21.1'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.14.0' # '-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.15.1' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
sklearn.version: '>=1.3.0'
lgbm.version: ''
onnxcc.version: '>=1.8.1' # git
run.example: '1'

Py310-Onnx140-Rt140-Skl122:
do.bench: '0'
python.version: '3.10' # onnxruntime cannot support python 3.11 yet
Expand All @@ -22,23 +35,23 @@ jobs:
onnx.version: 'onnx==1.14.0' # '-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.14.0' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
sklearn.version: '>=1.2.2'
sklearn.version: '==1.2.2'
lgbm.version: ''
onnxcc.version: '>=1.8.1' # git
run.example: '1'
run.example: '0'

Py310-Onnx130-Rt140-Skl122:
Py310-Onnx130-Rt140-Skl121:
do.bench: '0'
python.version: '3.10'
numpy.version: '>=1.21.2'
scipy.version: '>=1.7.0'
onnx.version: 'onnx==1.13.0' #'-i https://test.pypi.org/simple/ onnx==1.13.0rc1'
onnx.target_opset: ''
onnxrt.version: 'onnxruntime==1.14.0' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
sklearn.version: '>=1.2.1'
sklearn.version: '==1.2.1'
lgbm.version: ''
onnxcc.version: '>=1.8.1' # git
run.example: '1'
run.example: '0'

Py310-Onnx130-Rt131-Skl120:
do.bench: '0'
Expand Down
13 changes: 11 additions & 2 deletions .azure-pipelines/win32-conda-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ jobs:
vmImage: 'windows-latest'
strategy:
matrix:
Py310-Onnx140-Rt151-Skl130:
python.version: '3.11' # onnxruntime cannot support python 3.11 yet
onnx.version: 'onnx==1.14.0' # '-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
onnx.target_opset: ''
numpy.version: 'numpy>=1.22.3'
scipy.version: 'scipy'
onnxrt.version: 'onnxruntime==1.15.1' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
onnxcc.version: 'onnxconverter-common>=1.8.1' # git+https://github.com/microsoft/onnxconverter-common.git
sklearn.version: '>=1.3.0'
Py310-Onnx140-Rt140-Skl122:
python.version: '3.10' # onnxruntime cannot support python 3.11 yet
onnx.version: 'onnx==1.14.0' # '-i https://test.pypi.org/simple/ onnx==1.14.0rc3'
Expand All @@ -21,7 +30,7 @@ jobs:
scipy.version: 'scipy'
onnxrt.version: 'onnxruntime==1.14.0' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
onnxcc.version: 'onnxconverter-common>=1.8.1' # git+https://github.com/microsoft/onnxconverter-common.git
sklearn.version: '>=1.2.2'
sklearn.version: '==1.2.2'
Py310-Onnx130-Rt140-Skl121:
python.version: '3.10'
onnx.version: 'onnx==1.13.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
Expand All @@ -30,7 +39,7 @@ jobs:
scipy.version: 'scipy'
onnxrt.version: 'onnxruntime==1.14.0' # -i https://test.pypi.org/simple/ ort-nightly==1.11.0.dev20220311003
onnxcc.version: 'onnxconverter-common>=1.8.1' # git+https://github.com/microsoft/onnxconverter-common.git
sklearn.version: '>=1.2.2'
sklearn.version: '==1.2.2'
Py310-Onnx130-Rt131-Skl120:
python.version: '3.10'
onnx.version: 'onnx==1.13.0' #'-i https://test.pypi.org/simple/ onnx==1.12.0rc4'
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sklearn-onnx
Copyright (c) 2018-2022 Microsoft Corporation
Copyright (c) 2018-2023 Microsoft Corporation

This product includes software developed at
The LF AI & Data Foundation (https://lfaidata.foundation/).
9 changes: 1 addition & 8 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# -- Project information -----------------------------------------------------

project = 'sklearn-onnx'
copyright = '2018-2022, Microsoft'
copyright = '2018-2023, Microsoft'
author = 'Microsoft'
version = skl2onnx.__version__
release = version
Expand Down Expand Up @@ -83,8 +83,6 @@
'matplotlib': ('https://matplotlib.org/', None),
'mlinsights': (
'http://www.xavierdupre.fr/app/mlinsights/helpsphinx/', None),
'mlprodict': (
'http://www.xavierdupre.fr/app/mlprodict/helpsphinx/', None),
'numpy': ('https://docs.scipy.org/doc/numpy/', None),
'pyquickhelper': (
'http://www.xavierdupre.fr/app/pyquickhelper/helpsphinx/', None),
Expand Down Expand Up @@ -123,8 +121,6 @@
'ImageNet': 'http://www.image-net.org/',
'LightGBM': 'https://lightgbm.readthedocs.io/en/latest/',
'lightgbm': 'https://lightgbm.readthedocs.io/en/latest/',
'mlprodict':
'http://www.xavierdupre.fr/app/mlprodict/helpsphinx/index.html',
'NMF':
'https://scikit-learn.org/stable/modules/generated/'
'sklearn.decomposition.NMF.html',
Expand All @@ -136,9 +132,6 @@
'ONNX ML operators':
'https://github.com/onnx/onnx/blob/master/docs/Operators-ml.md',
'onnxmltools': 'https://github.com/onnx/onnxmltools',
'OnnxPipeline':
'http://www.xavierdupre.fr/app/mlprodict/helpsphinx/mlprodict/'
'sklapi/onnx_pipeline.html?highlight=onnxpipeline',
'onnxruntime': 'https://microsoft.github.io/onnxruntime/',
'openmp': 'https://en.wikipedia.org/wiki/OpenMP',
'pyinstrument': 'https://github.com/joerick/pyinstrument',
Expand Down
4 changes: 1 addition & 3 deletions docs/index_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ involving operator not actually implemented in
tutorial_1_simple
tutorial_1-5_external
tutorial_2_new_converter
tutorial_3_new_operator
tutorial_4_advanced
tutorial_2-5_extlib

Expand All @@ -35,12 +34,11 @@ The tutorial was tested with following version:
import onnxruntime
import xgboost
import skl2onnx
import mlprodict
import pyquickhelper

mods = [numpy, scipy, sklearn, lightgbm, xgboost,
onnx, onnxmltools, onnxruntime,
skl2onnx, mlprodict, pyquickhelper]
skl2onnx, pyquickhelper]
mods = [(m.__name__, m.__version__) for m in mods]
mx = max(len(_[0]) for _ in mods) + 1
for name, vers in sorted(mods):
Expand Down
Binary file removed docs/notebooks/images/cdist.png
Binary file not shown.
Binary file removed docs/notebooks/images/codegm.png
Binary file not shown.
Binary file removed docs/notebooks/images/double.png
Binary file not shown.
Binary file removed docs/notebooks/images/folders1.png
Binary file not shown.
Binary file removed docs/notebooks/images/folders2.png
Binary file not shown.
Binary file removed docs/notebooks/images/gm.png
Binary file not shown.
Binary file removed docs/notebooks/images/kmeans.png
Binary file not shown.
Binary file removed docs/notebooks/images/linreg.png
Binary file not shown.
Binary file removed docs/notebooks/images/numpyapi.png
Binary file not shown.
Binary file removed docs/notebooks/images/onnxops.png
Binary file not shown.
Binary file removed docs/notebooks/images/op.png
Binary file not shown.
Binary file removed docs/notebooks/images/op2onx.png
Binary file not shown.
Binary file removed docs/notebooks/images/pipecolor.png
Binary file not shown.
Binary file removed docs/notebooks/images/pipecolor_arrow.png
Binary file not shown.
Binary file removed docs/notebooks/images/pipecolorball.png
Binary file not shown.
Binary file removed docs/notebooks/images/pipedoc.png
Binary file not shown.
Binary file removed docs/notebooks/images/pipeskl.png
Binary file not shown.
Binary file removed docs/notebooks/images/sqsc.png
Binary file not shown.
Binary file removed docs/notebooks/images/stepwise.png
Binary file not shown.
Binary file removed docs/notebooks/images/treesplit.png
Binary file not shown.
Loading