Skip to content

Commit c108a09

Browse files
xaduprejustinchuby
xadupre
and
justinchuby
authored
Remove import of split_complex_to_pairs (#1182)
* update changelogs Signed-off-by: xadupre <xadupre@microsoft.com> * Remove import of `split_complex_to_pairs` It seems to be unused. Signed-off-by: Justin Chu <justinchuby@users.noreply.github.com> * fix target opset Signed-off-by: xadupre <xadupre@microsoft.com> * ci Signed-off-by: xadupre <xadupre@microsoft.com> * fix opset Signed-off-by: xadupre <xadupre@microsoft.com> * fix import Signed-off-by: xadupre <xadupre@microsoft.com> * ci Signed-off-by: xadupre <xadupre@microsoft.com> --------- Signed-off-by: xadupre <xadupre@microsoft.com> Signed-off-by: Justin Chu <justinchuby@users.noreply.github.com> Co-authored-by: Justin Chu <justinchuby@users.noreply.github.com>
1 parent 1035fdf commit c108a09

File tree

6 files changed

+46
-21
lines changed

6 files changed

+46
-21
lines changed

‎.github/workflows/linux-ci.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,28 @@ jobs:
1414
numpy_version: '>=2.0'
1515
scipy_version: '>=1.7.0'
1616
onnx_version: 'onnx-weekly'
17-
onnxrt_version: 'onnxruntime>=1.20.1'
17+
onnxrt_version: 'onnxruntime>=1.22.0'
18+
python_version: '3.12'
19+
- sklearn_version: '==1.6.1'
20+
documentation: 1
21+
numpy_version: '>=2.0'
22+
scipy_version: '>=1.7.0'
23+
onnx_version: 'onnx>=1.18.0'
24+
onnxrt_version: 'onnxruntime>=1.21.1'
1825
python_version: '3.12'
1926
- sklearn_version: '==1.5.2'
2027
documentation: 0
2128
numpy_version: '>=1.21.1,<2.0'
2229
scipy_version: '>=1.7.0'
23-
onnx_version: 'onnx>=1.17.0'
24-
onnxrt_version: 'onnxruntime==1.19.2'
30+
onnx_version: 'onnx==1.17.0'
31+
onnxrt_version: 'onnxruntime==1.20.1'
2532
python_version: '3.11'
2633
- sklearn_version: '==1.5.2'
2734
documentation: 0
2835
numpy_version: '>=1.21.1,<2.0'
2936
scipy_version: '>=1.7.0'
3037
onnx_version: 'onnx==1.16.0'
31-
onnxrt_version: 'onnxruntime==1.19.0'
38+
onnxrt_version: 'onnxruntime==1.19.2'
3239
python_version: '3.12'
3340
- python_version: '3.12'
3441
documentation: 0

‎.github/workflows/windows-macos-ci.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ jobs:
99
os: [windows-latest, macos-latest]
1010
sklearn_version: ['==1.6.1', '==1.5.2', '==1.4.2', '==1.3.2', '==1.2.2', '==1.1.3']
1111
include:
12+
- sklearn_version: '==1.6.1'
13+
python_version: '3.12'
14+
numpy_version: '>=2.0'
15+
scipy_version: '>=1.7.0'
16+
onnx_version: 'onnx==1.18.0'
17+
onnxrt_version: 'onnxruntime==1.22.0'
1218
- sklearn_version: '==1.6.1'
1319
python_version: '3.12'
1420
numpy_version: '>=2.0'
1521
scipy_version: '>=1.7.0'
1622
onnx_version: 'onnx==1.17.0'
17-
onnxrt_version: 'onnxruntime==1.20.1'
23+
onnxrt_version: 'onnxruntime==1.21.1'
1824
- sklearn_version: '==1.5.2'
1925
python_version: '3.12'
2026
numpy_version: '>=1.21.1,<2.0'

‎docs/tests/test_documentation_examples.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,16 @@ def add_test_methods(cls):
8989
except ImportError:
9090
reason = "onnxruntime_extensions not available"
9191

92+
if not reason and name in {
93+
"plot_gexternal_lightgbm_reg.py",
94+
"plot_gexternal_lightgbm.py",
95+
"plot_pipeline_lightgbm.py",
96+
}:
97+
try:
98+
import onnxmltools # noqa: F401
99+
except ImportError as e:
100+
reason = str(e)
101+
92102
if reason:
93103

94104
@unittest.skip(reason)

‎skl2onnx/operator_converters/quantile_transformer.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ def create_interpolation(X_input, quantiles_init, references_init):
143143
OnnxMul(current_index, np.array(0, dtype=np.int64), op_version=opv),
144144
np.array([target_size // 2], dtype=np.int64),
145145
op_version=opv,
146-
)
146+
),
147+
op_version=opv,
147148
)
148149
step.add_to(scope, container)
149150

‎skl2onnx/proto/__init__.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
# onnx is too old.
1919
pass
2020

21-
try:
22-
from onnx.helper import _split_complex_to_pairs as split_complex_to_pairs
23-
except ImportError:
24-
from onnx.helper import split_complex_to_pairs
25-
2621

2722
def get_opset_number_from_onnx():
2823
"""

‎tests/test_sklearn_quantile_transformer.py‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from sklearn.preprocessing import QuantileTransformer
99
from skl2onnx import convert_sklearn
1010
from skl2onnx.common.data_types import FloatTensorType
11-
from test_utils import dump_data_and_model
11+
from test_utils import dump_data_and_model, TARGET_OPSET
1212

1313

1414
class TestSklearnQuantileTransformer(unittest.TestCase):
@@ -18,28 +18,32 @@ def test_quantile_transformer_simple(self):
1818
X[:, 1] = np.arange(X.shape[0]) * 2
1919
model = QuantileTransformer(n_quantiles=6).fit(X)
2020
model_onnx = convert_sklearn(
21-
model, "test", [("input", FloatTensorType([None, X.shape[1]]))]
21+
model,
22+
"test",
23+
[("input", FloatTensorType([None, X.shape[1]]))],
24+
target_opset=TARGET_OPSET,
2225
)
23-
self.assertTrue(model_onnx is not None)
2426
dump_data_and_model(
2527
X.astype(np.float32),
2628
model,
2729
model_onnx,
28-
basename="SklearnQuantileTransformer",
30+
basename="SklearnQuantileTransformerSimple",
2931
)
3032

3133
def test_quantile_transformer_int(self):
3234
X = np.random.randint(0, 5, (100, 20))
3335
model = QuantileTransformer(n_quantiles=6).fit(X)
3436
model_onnx = convert_sklearn(
35-
model, "test", [("input", FloatTensorType([None, X.shape[1]]))]
37+
model,
38+
"test",
39+
[("input", FloatTensorType([None, X.shape[1]]))],
40+
target_opset=TARGET_OPSET,
3641
)
37-
self.assertTrue(model_onnx is not None)
3842
dump_data_and_model(
3943
X.astype(np.float32),
4044
model,
4145
model_onnx,
42-
basename="SklearnQuantileTransformer",
46+
basename="SklearnQuantileTransformerInt",
4347
)
4448

4549
def test_quantile_transformer_nan(self):
@@ -49,14 +53,16 @@ def test_quantile_transformer_nan(self):
4953
X[1][1] = np.nan
5054
model = QuantileTransformer(n_quantiles=6).fit(X)
5155
model_onnx = convert_sklearn(
52-
model, "test", [("input", FloatTensorType([None, X.shape[1]]))]
56+
model,
57+
"test",
58+
[("input", FloatTensorType([None, X.shape[1]]))],
59+
target_opset=TARGET_OPSET,
5360
)
54-
self.assertTrue(model_onnx is not None)
5561
dump_data_and_model(
5662
X.astype(np.float32),
5763
model,
5864
model_onnx,
59-
basename="SklearnQuantileTransformer",
65+
basename="SklearnQuantileTransformerNan",
6066
)
6167

6268

0 commit comments

Comments
 (0)