Skip to content

Commit 5e3668d

Browse files
xaduprexadupre
authored
Supports subgraph in the light API (#48)
* Supports subgraph in the light API * fix opset * doc * disable * disable check_model on Windows * add check_model * issue * more consistent with CI * add missing import * fix misspelling * add missing import * disable one test on windows * disable more tests * more disabling * disable more tests on windows * rename * disable the right tests * fix type discrepancies on windows
1 parent 9de394e commit 5e3668d

19 files changed

+248
-52
lines changed

‎CHANGELOGS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Change Logs
44
0.1.3
55
+++++
66

7+
* :pr:`48`: support for subgraph in light API
78
* :pr:`47`: extends export onnx to code to support inner API
89
* :pr:`46`: adds an export to convert an onnx graph into light API code
910
* :pr:`45`: fixes light API for operators with two outputs

‎_doc/api/light_api.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ translate
1919
Classes for the Light API
2020
=========================
2121

22+
ProtoType
23+
+++++++++
24+
25+
.. autoclass:: onnx_array_api.light_api.model.ProtoType
26+
:members:
27+
2228
OnnxGraph
2329
+++++++++
2430

‎_unittests/ut_array_api/test_onnx_numpy.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import sys
21
import unittest
32
import numpy as np
43
from onnx import TensorProto
@@ -91,19 +90,15 @@ def test_arange_int00a(self):
9190
mat = xp.arange(a, b)
9291
matnp = mat.numpy()
9392
self.assertEqual(matnp.shape, (0,))
94-
expected = np.arange(0, 0)
95-
if sys.platform == "win32":
96-
expected = expected.astype(np.int64)
93+
expected = np.arange(0, 0).astype(np.int64)
9794
self.assertEqualArray(matnp, expected)
9895

9996
@ignore_warnings(DeprecationWarning)
10097
def test_arange_int00(self):
10198
mat = xp.arange(0, 0)
10299
matnp = mat.numpy()
103100
self.assertEqual(matnp.shape, (0,))
104-
expected = np.arange(0, 0)
105-
if sys.platform == "win32":
106-
expected = expected.astype(np.int64)
101+
expected = np.arange(0, 0).astype(np.int64)
107102
self.assertEqualArray(matnp, expected)
108103

109104
def test_ones_like_uint16(self):

‎_unittests/ut_light_api/test_light_api.py

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import unittest
2-
import sys
32
from typing import Callable, Optional
43
import numpy as np
5-
from onnx import ModelProto
4+
from onnx import GraphProto, ModelProto
65
from onnx.defs import (
76
get_all_schemas_with_history,
87
onnx_opset_version,
@@ -11,8 +10,8 @@
1110
SchemaError,
1211
)
1312
from onnx.reference import ReferenceEvaluator
14-
from onnx_array_api.ext_test_case import ExtTestCase
15-
from onnx_array_api.light_api import start, OnnxGraph, Var
13+
from onnx_array_api.ext_test_case import ExtTestCase, skipif_ci_windows
14+
from onnx_array_api.light_api import start, OnnxGraph, Var, g
1615
from onnx_array_api.light_api._op_var import OpsVar
1716
from onnx_array_api.light_api._op_vars import OpsVars
1817

@@ -145,7 +144,7 @@ def list_ops_missing(self, n_inputs):
145144
f"{new_missing}\n{text}"
146145
)
147146

148-
@unittest.skipIf(sys.platform == "win32", reason="unstable test on Windows")
147+
@skipif_ci_windows("Unstable on Windows.")
149148
def test_list_ops_missing(self):
150149
self.list_ops_missing(1)
151150
self.list_ops_missing(2)
@@ -442,7 +441,38 @@ def test_topk_reverse(self):
442441
self.assertEqualArray(np.array([[0, 1], [6, 7]], dtype=np.float32), got[0])
443442
self.assertEqualArray(np.array([[0, 1], [3, 2]], dtype=np.int64), got[1])
444443

444+
def test_if(self):
445+
gg = g().cst(np.array([0], dtype=np.int64)).rename("Z").vout()
446+
onx = gg.to_onnx()
447+
self.assertIsInstance(onx, GraphProto)
448+
self.assertEqual(len(onx.input), 0)
449+
self.assertEqual(len(onx.output), 1)
450+
self.assertEqual([o.name for o in onx.output], ["Z"])
451+
onx = (
452+
start(opset=19)
453+
.vin("X", np.float32)
454+
.ReduceSum()
455+
.rename("Xs")
456+
.cst(np.array([0], dtype=np.float32))
457+
.left_bring("Xs")
458+
.Greater()
459+
.If(
460+
then_branch=g().cst(np.array([1], dtype=np.int64)).rename("Z").vout(),
461+
else_branch=g().cst(np.array([0], dtype=np.int64)).rename("Z").vout(),
462+
)
463+
.rename("W")
464+
.vout()
465+
.to_onnx()
466+
)
467+
self.assertIsInstance(onx, ModelProto)
468+
ref = ReferenceEvaluator(onx)
469+
x = np.array([0, 1, 2, 3, 9, 8, 7, 6], dtype=np.float32)
470+
got = ref.run(None, {"X": x})
471+
self.assertEqualArray(np.array([1], dtype=np.int64), got[0])
472+
got = ref.run(None, {"X": -x})
473+
self.assertEqualArray(np.array([0], dtype=np.int64), got[0])
474+
445475

446476
if __name__ == "__main__":
447-
# TestLightApi().test_topk()
477+
TestLightApi().test_if()
448478
unittest.main(verbosity=2)

‎_unittests/ut_light_api/test_translate.py

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from onnx.defs import onnx_opset_version
66
from onnx.reference import ReferenceEvaluator
77
from onnx_array_api.ext_test_case import ExtTestCase
8-
from onnx_array_api.light_api import start, translate
8+
from onnx_array_api.light_api import start, translate, g
99
from onnx_array_api.light_api.emitter import EventType
1010

1111
OPSET_API = min(19, onnx_opset_version() - 1)
@@ -133,7 +133,59 @@ def test_topk_reverse(self):
133133
).strip("\n")
134134
self.assertEqual(expected, code)
135135

136+
def test_export_if(self):
137+
onx = (
138+
start(opset=19)
139+
.vin("X", np.float32)
140+
.ReduceSum()
141+
.rename("Xs")
142+
.cst(np.array([0], dtype=np.float32))
143+
.left_bring("Xs")
144+
.Greater()
145+
.If(
146+
then_branch=g().cst(np.array([1], dtype=np.int64)).rename("Z").vout(),
147+
else_branch=g().cst(np.array([0], dtype=np.int64)).rename("Z").vout(),
148+
)
149+
.rename("W")
150+
.vout()
151+
.to_onnx()
152+
)
153+
154+
self.assertIsInstance(onx, ModelProto)
155+
ref = ReferenceEvaluator(onx)
156+
x = np.array([[0, 1, 2, 3], [9, 8, 7, 6]], dtype=np.float32)
157+
k = np.array([2], dtype=np.int64)
158+
got = ref.run(None, {"X": x, "K": k})
159+
self.assertEqualArray(np.array([1], dtype=np.int64), got[0])
160+
161+
code = translate(onx)
162+
selse = "g().cst(np.array([0], dtype=np.int64)).rename('Z').bring('Z').vout(elem_type=TensorProto.FLOAT)"
163+
sthen = "g().cst(np.array([1], dtype=np.int64)).rename('Z').bring('Z').vout(elem_type=TensorProto.FLOAT)"
164+
expected = dedent(
165+
f"""
166+
(
167+
start(opset=19)
168+
.cst(np.array([0.0], dtype=np.float32))
169+
.rename('r')
170+
.vin('X', elem_type=TensorProto.FLOAT)
171+
.bring('X')
172+
.ReduceSum(keepdims=1, noop_with_empty_axes=0)
173+
.rename('Xs')
174+
.bring('Xs', 'r')
175+
.Greater()
176+
.rename('r1_0')
177+
.bring('r1_0')
178+
.If(else_branch={selse}, then_branch={sthen})
179+
.rename('W')
180+
.bring('W')
181+
.vout(elem_type=TensorProto.FLOAT)
182+
.to_onnx()
183+
)"""
184+
).strip("\n")
185+
self.maxDiff = None
186+
self.assertEqual(expected, code)
187+
136188

137189
if __name__ == "__main__":
138-
# TestLightApi().test_topk()
190+
TestTranslate().test_export_if()
139191
unittest.main(verbosity=2)

‎_unittests/ut_light_api/test_translate_classic.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_check_code(self):
3535
outputs.append(make_tensor_value_info("Y", TensorProto.FLOAT, shape=[]))
3636
graph = make_graph(
3737
nodes,
38-
"noname",
38+
"onename",
3939
inputs,
4040
outputs,
4141
initializers,
@@ -77,7 +77,7 @@ def test_exp(self):
7777
outputs.append(make_tensor_value_info('Y', TensorProto.FLOAT, shape=[]))
7878
graph = make_graph(
7979
nodes,
80-
'noname',
80+
'light_api',
8181
inputs,
8282
outputs,
8383
initializers,
@@ -161,7 +161,7 @@ def test_transpose(self):
161161
outputs.append(make_tensor_value_info('Y', TensorProto.FLOAT, shape=[]))
162162
graph = make_graph(
163163
nodes,
164-
'noname',
164+
'light_api',
165165
inputs,
166166
outputs,
167167
initializers,
@@ -223,7 +223,7 @@ def test_topk_reverse(self):
223223
outputs.append(make_tensor_value_info('Indices', TensorProto.FLOAT, shape=[]))
224224
graph = make_graph(
225225
nodes,
226-
'noname',
226+
'light_api',
227227
inputs,
228228
outputs,
229229
initializers,

‎_unittests/ut_npx/test_npx.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from onnx.reference import ReferenceEvaluator
2121
from onnx.shape_inference import infer_shapes
2222

23-
from onnx_array_api.ext_test_case import ExtTestCase, ignore_warnings
23+
from onnx_array_api.ext_test_case import ExtTestCase, ignore_warnings, skipif_ci_windows
2424
from onnx_array_api.reference import ExtendedReferenceEvaluator
2525
from onnx_array_api.npx import ElemType, eager_onnx, jit_onnx
2626
from onnx_array_api.npx.npx_core_api import (
@@ -1355,6 +1355,7 @@ def test_clip_none(self):
13551355
got = ref.run(None, {"A": x})
13561356
self.assertEqualArray(y, got[0])
13571357

1358+
@skipif_ci_windows("Unstable on Windows.")
13581359
def test_arange_inline(self):
13591360
# arange(5)
13601361
f = arange_inline(Input("A"))
@@ -1391,6 +1392,7 @@ def test_arange_inline(self):
13911392
got = ref.run(None, {"A": x1, "B": x2, "C": x3})
13921393
self.assertEqualArray(y, got[0])
13931394

1395+
@skipif_ci_windows("Unstable on Windows.")
13941396
def test_arange_inline_dtype(self):
13951397
# arange(1, 5, 2), dtype
13961398
f = arange_inline(Input("A"), Input("B"), Input("C"), dtype=np.float64)

‎_unittests/ut_ort/test_ort_tensor.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from onnx.defs import onnx_opset_version
77
from onnx.reference import ReferenceEvaluator
88
from onnxruntime import InferenceSession
9-
from onnx_array_api.ext_test_case import ExtTestCase
9+
from onnx_array_api.ext_test_case import ExtTestCase, skipif_ci_windows
1010
from onnx_array_api.npx import eager_onnx, jit_onnx
1111
from onnx_array_api.npx.npx_functions import absolute as absolute_inline
1212
from onnx_array_api.npx.npx_functions import cdist as cdist_inline
@@ -20,6 +20,7 @@
2020

2121

2222
class TestOrtTensor(ExtTestCase):
23+
@skipif_ci_windows("Unstable on Windows")
2324
def test_eager_numpy_type_ort(self):
2425
def impl(A):
2526
self.assertIsInstance(A, EagerOrtTensor)
@@ -45,6 +46,7 @@ def impl(A):
4546
self.assertEqualArray(z, res.numpy())
4647
self.assertEqual(res.numpy().dtype, np.float64)
4748

49+
@skipif_ci_windows("Unstable on Windows")
4850
def test_eager_numpy_type_ort_op(self):
4951
def impl(A):
5052
self.assertIsInstance(A, EagerOrtTensor)
@@ -68,6 +70,7 @@ def impl(A):
6870
self.assertEqualArray(z, res.numpy())
6971
self.assertEqual(res.numpy().dtype, np.float64)
7072

73+
@skipif_ci_windows("Unstable on Windows")
7174
def test_eager_ort(self):
7275
def impl(A):
7376
print("A")
@@ -141,6 +144,7 @@ def impl(A):
141144
self.assertEqual(tuple(res.shape()), z.shape)
142145
self.assertStartsWith("A\nB\nC\n", text)
143146

147+
@skipif_ci_windows("Unstable on Windows")
144148
def test_cdist_com_microsoft(self):
145149
from scipy.spatial.distance import cdist as scipy_cdist
146150

@@ -193,7 +197,7 @@ def impl(xa, xb):
193197
if len(pieces) > 2:
194198
raise AssertionError(f"Function is not using argument:\n{onx}")
195199

196-
def test_astype(self):
200+
def test_astype_w2(self):
197201
f = absolute_inline(copy_inline(Input("A")).astype(DType(TensorProto.FLOAT)))
198202
onx = f.to_onnx(constraints={"A": Float64[None]})
199203
x = np.array([[-5, 6]], dtype=np.float64)
@@ -204,7 +208,7 @@ def test_astype(self):
204208
got = ref.run(None, {"A": x})
205209
self.assertEqualArray(z, got[0])
206210

207-
def test_astype0(self):
211+
def test_astype0_w2(self):
208212
f = absolute_inline(copy_inline(Input("A")).astype(DType(TensorProto.FLOAT)))
209213
onx = f.to_onnx(constraints={"A": Float64[None]})
210214
x = np.array(-5, dtype=np.float64)
@@ -215,6 +219,7 @@ def test_astype0(self):
215219
got = ref.run(None, {"A": x})
216220
self.assertEqualArray(z, got[0])
217221

222+
@skipif_ci_windows("Unstable on Windows")
218223
def test_eager_ort_cast(self):
219224
def impl(A):
220225
return A.astype(DType("FLOAT"))

‎_unittests/ut_ort/test_sklearn_array_api_ort.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from onnx.defs import onnx_opset_version
55
from sklearn import config_context, __version__ as sklearn_version
66
from sklearn.discriminant_analysis import LinearDiscriminantAnalysis
7-
from onnx_array_api.ext_test_case import ExtTestCase
7+
from onnx_array_api.ext_test_case import ExtTestCase, skipif_ci_windows
88
from onnx_array_api.ort.ort_tensors import EagerOrtTensor, OrtTensor
99

1010

@@ -16,7 +16,8 @@ class TestSklearnArrayAPIOrt(ExtTestCase):
1616
Version(sklearn_version) <= Version("1.2.2"),
1717
reason="reshape ArrayAPI not followed",
1818
)
19-
def test_sklearn_array_api_linear_discriminant(self):
19+
@skipif_ci_windows("Unstable on Windows.")
20+
def test_sklearn_array_api_linear_discriminant_ort(self):
2021
X = np.array(
2122
[[-1, -1], [-2, -1], [-3, -2], [1, 1], [2, 1], [3, 2]], dtype=np.float64
2223
)
@@ -38,7 +39,8 @@ def test_sklearn_array_api_linear_discriminant(self):
3839
Version(sklearn_version) <= Version("1.2.2"),
3940
reason="reshape ArrayAPI not followed",
4041
)
41-
def test_sklearn_array_api_linear_discriminant_float32(self):
42+
@skipif_ci_windows("Unstable on Windows.")
43+
def test_sklearn_array_api_linear_discriminant_ort_float32(self):
4244
X = np.array(
4345
[[-1, -1], [-2, -1], [-3, -2], [1, 1], [2, 1], [3, 2]], dtype=np.float32
4446
)

‎_unittests/ut_validation/test_docs.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import unittest
2-
import sys
32
import numpy as np
43
from onnx.reference import ReferenceEvaluator
5-
from onnx_array_api.ext_test_case import ExtTestCase
4+
from onnx_array_api.ext_test_case import ExtTestCase, skipif_ci_windows
65
from onnx_array_api.validation.docs import make_euclidean, make_euclidean_skl2onnx
76

87

@@ -27,7 +26,7 @@ def test_make_euclidean_skl2onnx(self):
2726
got = ref.run(None, {"X": X, "Y": Y})[0]
2827
self.assertEqualArray(expected, got)
2928

30-
@unittest.skipIf(sys.platform == "win32", reason="unstable on Windows")
29+
@skipif_ci_windows("Unstable on Windows.")
3130
def test_make_euclidean_np(self):
3231
from onnx_array_api.npx import jit_onnx
3332

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy