diff --git a/.azure-pipelines/linux-conda-CI.yml b/.azure-pipelines/linux-conda-CI.yml index 20f7028c..eff402ed 100644 --- a/.azure-pipelines/linux-conda-CI.yml +++ b/.azure-pipelines/linux-conda-CI.yml @@ -15,13 +15,23 @@ jobs: strategy: matrix: + Python311-1150-RT1163-xgb2-lgbm40: + python.version: '3.11' + ONNX_PATH: 'onnx==1.15.0' + ONNXRT_PATH: 'onnxruntime==1.16.3' + COREML_PATH: NONE + lightgbm.version: '>=4.0' + xgboost.version: '>=2' + numpy.version: '' + scipy.version: '' + Python311-1150-RT1160-xgb175-lgbm40: python.version: '3.11' ONNX_PATH: 'onnx==1.15.0' ONNXRT_PATH: 'onnxruntime==1.16.2' COREML_PATH: NONE lightgbm.version: '>=4.0' - xgboost.version: '>=1.7.5' + xgboost.version: '==1.7.5' numpy.version: '' scipy.version: '' @@ -31,7 +41,7 @@ jobs: ONNXRT_PATH: 'onnxruntime==1.16.2' COREML_PATH: NONE lightgbm.version: '>=4.0' - xgboost.version: '>=1.7.5' + xgboost.version: '==1.7.5' numpy.version: '' scipy.version: '' @@ -41,7 +51,7 @@ jobs: ONNXRT_PATH: 'onnxruntime==1.15.1' COREML_PATH: NONE lightgbm.version: '<4.0' - xgboost.version: '>=1.7.5' + xgboost.version: '==1.7.5' numpy.version: '' scipy.version: '' @@ -51,7 +61,7 @@ jobs: ONNXRT_PATH: 'onnxruntime==1.14.0' COREML_PATH: NONE lightgbm.version: '<4.0' - xgboost.version: '>=1.7.5' + xgboost.version: '==1.7.5' numpy.version: '' scipy.version: '' @@ -61,7 +71,7 @@ jobs: ONNXRT_PATH: 'onnxruntime==1.15.1' COREML_PATH: NONE lightgbm.version: '>=4.0' - xgboost.version: '>=1.7.5' + xgboost.version: '==1.7.5' numpy.version: '' scipy.version: '==1.8.0' diff --git a/.azure-pipelines/win32-conda-CI.yml b/.azure-pipelines/win32-conda-CI.yml index 09cc2e50..18017531 100644 --- a/.azure-pipelines/win32-conda-CI.yml +++ b/.azure-pipelines/win32-conda-CI.yml @@ -21,6 +21,7 @@ jobs: ONNXRT_PATH: 'onnxruntime==1.16.2' COREML_PATH: NONE numpy.version: '' + xgboost.version: '2.0.2' Python311-1141-RT1162: python.version: '3.11' @@ -28,6 +29,7 @@ jobs: ONNXRT_PATH: 'onnxruntime==1.16.2' COREML_PATH: NONE numpy.version: '' + xgboost.version: '1.7.5' Python310-1141-RT1151: python.version: '3.10' @@ -35,6 +37,7 @@ jobs: ONNXRT_PATH: 'onnxruntime==1.15.1' COREML_PATH: NONE numpy.version: '' + xgboost.version: '1.7.5' Python310-1141-RT1140: python.version: '3.10' @@ -42,6 +45,7 @@ jobs: ONNXRT_PATH: onnxruntime==1.14.0 COREML_PATH: NONE numpy.version: '' + xgboost.version: '1.7.5' Python39-1141-RT1140: python.version: '3.9' @@ -49,6 +53,7 @@ jobs: ONNXRT_PATH: onnxruntime==1.14.0 COREML_PATH: NONE numpy.version: '' + xgboost.version: '1.7.5' maxParallel: 3 @@ -74,6 +79,8 @@ jobs: - script: | call activate py$(python.version) python -m pip install --upgrade scikit-learn + python -m pip install --upgrade lightgbm + python -m pip install "xgboost=$(xgboost.version)" displayName: 'Install scikit-learn' - script: | diff --git a/CHANGELOGS.md b/CHANGELOGS.md index d0151fdf..514e7508 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -2,6 +2,8 @@ ## 1.12.0 +* Fix discrepancies with XGBRegressor and xgboost > 2 + [#670](https://github.com/onnx/onnxmltools/pull/670) * Support count:poisson for XGBRegressor [#666](https://github.com/onnx/onnxmltools/pull/666) * Supports XGBRFClassifier and XGBRFRegressor diff --git a/requirements-dev.txt b/requirements-dev.txt index 1345c554..2dc45777 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,5 +16,5 @@ ruff scikit-learn>=1.2.0 scipy wheel -xgboost==1.7.5 +xgboost onnxruntime