upgrade requirements-dev.txt (#718)

* upgrade requirements-dev.txt

Signed-off-by: xadupre <[email protected]>

* fix broken dpendencies

Signed-off-by: xadupre <[email protected]>

* remove onnxcvonerter-common

Signed-off-by: xadupre <[email protected]>

* add missing function

Signed-off-by: xadupre <[email protected]>

* disable ut

Signed-off-by: xadupre <[email protected]>

* import

Signed-off-by: xadupre <[email protected]>

* pyspark

Signed-off-by: xadupre <[email protected]>

* more functions

Signed-off-by: xadupre <[email protected]>

* fix import

Signed-off-by: xadupre <[email protected]>

* missing import

Signed-off-by: xadupre <[email protected]>

* windows

Signed-off-by: xadupre <[email protected]>

---------

Signed-off-by: xadupre <[email protected]>

Author: xadupre

.github/workflows/ci.yml

@@ -8,9 +8,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python_version: ['3.12', '3.11', '3.10', '3.9']
+        python_version: ['3.13', '3.12', '3.11', '3.10', '3.9']
         include:
-          - python_version: '3.12'
+          - python_version: '3.13'
             documentation: 1
             numpy_version: '>=2'
             scipy_version: '>=1.7.0'
@@ -132,10 +132,6 @@ jobs:
           pip install h2o
           pytest --maxfail=10 --durations=10 tests/h2o
 
-      - name: Run tests pysparkml
-        if: matrix.os == 'ubuntu-latest' && matrix.python_version != '3.12'
-        run: pytest --maxfail=10 --durations=10 tests/sparkml
-
       - name: Run tests hummingbirdml
         if: matrix.os != 'macos-latest'
         run: |
@@ -146,6 +142,10 @@ jobs:
       - name: Run tests baseline
         run: pytest --maxfail=10 --durations=10 tests/baseline
 
+      - name: Run tests pysparkml
+        if: matrix.os == 'ubuntu-latest' && matrix.python_version != '3.12'
+        run: pytest --maxfail=10 --durations=10 tests/sparkml
+
       - name: build
         run: pip wheel .
 

CHANGELOGS.md

@@ -2,9 +2,11 @@
 
 ## 1.13.0 (development)
 
+* Removes dependency on onnxconveter-common
+  [#718](https://github.com/onnx/onnxmltools/pull/718)
 * Handle issue with binary classifier setting output to [N,1] vs [N,2],
   [#681](https://github.com/onnx/onnxmltools/pull/681)
-* Add missing dependency onnxconverter_common, fix multi regression with xgboost,
+* Fix multi regression with xgboost,
   [#679](https://github.com/onnx/onnxmltools/pull/679),
   fixes issues [No module named 'onnxconverter_common'](https://github.com/onnx/onnxmltools/issues/673),
   [onnx converted : xgboostRegressor multioutput model predicts 1 dimension instead of original 210 dimensions.](https://github.com/onnx/onnxmltools/issues/676)

README.md

@@ -32,7 +32,6 @@ pip install onnxmltools
 or install from source:
 
 ```bash
-pip install git+https://github.com/microsoft/onnxconverter-common
 pip install git+https://github.com/onnx/onnxmltools
 ```
 

docs/examples/plot_convert_h2o.py

@@ -29,7 +29,7 @@
 import onnxruntime as rt
 import h2o
 from h2o.estimators.gbm import H2OGradientBoostingEstimator
-from onnxconverter_common.data_types import FloatTensorType
+from onnxmltools.convert.common.data_types.data_types import FloatTensorType
 import onnxmltools
 from onnxmltools.convert import convert_h2o
 

docs/examples/plot_convert_keras.py

@@ -33,7 +33,7 @@
 import onnxruntime as rt
 
 import onnxmltools
-from onnxconverter_common.data_types import FloatTensorType
+from onnxmltools.convert.common.data_types.data_types import FloatTensorType
 from onnxmltools.convert import convert_keras
 
 

docs/examples/plot_convert_libsvm.py

@@ -31,7 +31,7 @@
 import onnxruntime as rt
 
 import onnxmltools
-from onnxconverter_common.data_types import FloatTensorType
+from onnxmltools.convert.common.data_types.data_types import FloatTensorType
 from onnxmltools.convert import convert_libsvm
 
 iris = load_iris()

docs/examples/plot_convert_lightgbm.py

@@ -30,7 +30,7 @@
 from lightgbm import LGBMClassifier, Dataset, train as train_lgbm
 import onnxruntime as rt
 import onnxmltools
-from onnxconverter_common.data_types import FloatTensorType
+from onnxmltools.convert.common.data_types.data_types import FloatTensorType
 from onnxmltools.convert import convert_lightgbm
 
 iris = load_iris()

docs/examples/plot_convert_sklearn.py

@@ -44,7 +44,7 @@
 
 import skl2onnx
 import onnxmltools
-from onnxconverter_common.data_types import FloatTensorType
+from onnxmltools.convert.common.data_types.data_types import FloatTensorType
 from onnxmltools.convert import convert_sklearn
 
 iris = load_iris()

docs/examples/plot_convert_sparkml.py

@@ -34,7 +34,7 @@
 from pyspark.sql import SparkSession
 from pyspark.ml.feature import VectorAssembler, StringIndexer
 import onnxmltools
-from onnxconverter_common.data_types import FloatTensorType
+from onnxmltools.convert.common.data_types.data_types import FloatTensorType
 from onnxmltools.convert import convert_sparkml
 
 

docs/examples/plot_convert_xgboost.py

@@ -31,7 +31,7 @@
 import onnxruntime as rt
 
 import onnxmltools
-from onnxconverter_common.data_types import FloatTensorType
+from onnxmltools.convert.common.data_types.data_types import FloatTensorType
 from onnxmltools.convert import convert_xgboost
 
 iris = load_iris()