Skip to content

Supports subgraph in the light API #48

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

Merged
sdpython merged 18 commits into from
Nov 13, 2023
Merged

Supports subgraph in the light API #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e0233dc
Supports subgraph in the light API
xadupre Nov 12, 2023
dac2489
fix opset
xadupre Nov 12, 2023
d75473f
doc
xadupre Nov 12, 2023
42ce40b
disable
xadupre Nov 12, 2023
b3dd245
disable check_model on Windows
xadupre Nov 12, 2023
292d3cd
add check_model
xadupre Nov 12, 2023
2db8edb
issue
xadupre Nov 12, 2023
9291536
more consistent with CI
xadupre Nov 13, 2023
9fc696e
add missing import
xadupre Nov 13, 2023
aeab071
fix misspelling
xadupre Nov 13, 2023
8be137a
add missing import
xadupre Nov 13, 2023
8354ae2
disable one test on windows
xadupre Nov 13, 2023
b922647
disable more tests
xadupre Nov 13, 2023
d3da504
more disabling
xadupre Nov 13, 2023
d2262e3
disable more tests on windows
xadupre Nov 13, 2023
ad82c19
rename
xadupre Nov 13, 2023
3910302
disable the right tests
xadupre Nov 13, 2023
2cdaeae
fix type discrepancies on windows
xadupre Nov 13, 2023
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
Prev Previous commit
Next Next commit
disable the right tests
  • Loading branch information
@xadupre
xadupre committed Nov 13, 2023
commit 3910302b6f5a7bce63fbdf5ff6d42fbcd3771217
4 changes: 1 addition & 3 deletions _unittests/ut_npx/test_sklearn_array_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from onnx.defs import onnx_opset_version
from sklearn import config_context, __version__ as sklearn_version
from sklearn.discriminant_analysis import LinearDiscriminantAnalysis
from onnx_array_api.ext_test_case import ExtTestCase, ignore_warnings, skipif_ci_windows
from onnx_array_api.ext_test_case import ExtTestCase, ignore_warnings
from onnx_array_api.npx.npx_numpy_tensors import EagerNumpyTensor


Expand All @@ -17,7 +17,6 @@ class TestSklearnArrayAPI(ExtTestCase):
reason="reshape ArrayAPI not followed",
)
@ignore_warnings(DeprecationWarning)
@skipif_ci_windows("Unstable on Windows.")
def test_sklearn_array_api_linear_discriminant(self):
X = np.array(
[[-1, -1], [-2, -1], [-3, -2], [1, 1], [2, 1], [3, 2]], dtype=np.float64
Expand All @@ -40,7 +39,6 @@ def test_sklearn_array_api_linear_discriminant(self):
reason="reshape ArrayAPI not followed",
)
@ignore_warnings(DeprecationWarning)
@skipif_ci_windows("Unstable on Windows.")
def test_sklearn_array_api_linear_discriminant_float32(self):
X = np.array(
[[-1, -1], [-2, -1], [-3, -2], [1, 1], [2, 1], [3, 2]], dtype=np.float32
Expand Down
8 changes: 5 additions & 3 deletions _unittests/ut_ort/test_sklearn_array_api_ort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from onnx.defs import onnx_opset_version
from sklearn import config_context, __version__ as sklearn_version
from sklearn.discriminant_analysis import LinearDiscriminantAnalysis
from onnx_array_api.ext_test_case import ExtTestCase
from onnx_array_api.ext_test_case import ExtTestCase, skipif_ci_windows
from onnx_array_api.ort.ort_tensors import EagerOrtTensor, OrtTensor


Expand All @@ -16,7 +16,8 @@ class TestSklearnArrayAPIOrt(ExtTestCase):
Version(sklearn_version) <= Version("1.2.2"),
reason="reshape ArrayAPI not followed",
)
def test_sklearn_array_api_linear_discriminant(self):
@skipif_ci_windows("Unstable on Windows.")
def test_sklearn_array_api_linear_discriminant_ort(self):
X = np.array(
[[-1, -1], [-2, -1], [-3, -2], [1, 1], [2, 1], [3, 2]], dtype=np.float64
)
Expand All @@ -38,7 +39,8 @@ def test_sklearn_array_api_linear_discriminant(self):
Version(sklearn_version) <= Version("1.2.2"),
reason="reshape ArrayAPI not followed",
)
def test_sklearn_array_api_linear_discriminant_float32(self):
@skipif_ci_windows("Unstable on Windows.")
def test_sklearn_array_api_linear_discriminant_ort_float32(self):
X = np.array(
[[-1, -1], [-2, -1], [-3, -2], [1, 1], [2, 1], [3, 2]], dtype=np.float32
)
Expand Down