Skip to content

Commit 2952f41

Browse files
chore(deps): bump onnx-weekly from 1.14.0.dev20230227 to 1.14.0.dev20230306 (#501)
Bumps [onnx-weekly](https://github.com/onnx/onnx) from 1.14.0.dev20230227 to 1.14.0.dev20230306. <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/onnx/onnx/commits">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=onnx-weekly&package-manager=pip&previous-version=1.14.0.dev20230227&new-version=1.14.0.dev20230306)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Justin Chu <[email protected]>
1 parent 869c9ee commit 2952f41

File tree

4 files changed

+78
-26
lines changed

4 files changed

+78
-26
lines changed

onnxscript/tests/functions/onnxfns1A_test.py

Lines changed: 62 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import unittest
22

33
import onnx
4+
import pytest
45

5-
from onnxscript.tests.common import onnx_script_test_case
6+
from onnxscript.tests.common import onnx_script_test_case, version_utils
67
from onnxscript.tests.models import onnxfns1A
78

89

@@ -12,20 +13,35 @@ def setUpClass(cls):
1213
super().setUpClass()
1314
cls.rtol = 1e-05
1415

16+
@pytest.mark.xfail(
17+
version_utils.onnxruntime_older_than("1.15")
18+
and not version_utils.onnx_older_than("1.14"),
19+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
20+
)
1521
def test_onnxfns_relu(self):
1622
self.run_onnx_test(onnxfns1A.Relu)
1723

1824
@unittest.skipIf(
1925
not hasattr(onnx.FunctionProto, "attribute_proto"),
2026
reason="current onnx does not support default values",
2127
)
28+
@pytest.mark.xfail(
29+
version_utils.onnxruntime_older_than("1.15")
30+
and not version_utils.onnx_older_than("1.14"),
31+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
32+
)
2233
def test_onnxfns_selu(self):
2334
self.run_onnx_test(onnxfns1A.Selu)
2435

2536
@unittest.skipIf(
2637
not hasattr(onnx.FunctionProto, "attribute_proto"),
2738
reason="current onnx does not support default values",
2839
)
40+
@pytest.mark.xfail(
41+
version_utils.onnxruntime_older_than("1.15")
42+
and not version_utils.onnx_older_than("1.14"),
43+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
44+
)
2945
def test_onnxfns_elu(self):
3046
self.run_onnx_test(onnxfns1A.Elu)
3147

@@ -36,44 +52,84 @@ def test_onnxfns_elu05(self):
3652
not hasattr(onnx.FunctionProto, "attribute_proto"),
3753
reason="current onnx does not support default values",
3854
)
55+
@pytest.mark.xfail(
56+
version_utils.onnxruntime_older_than("1.15")
57+
and not version_utils.onnx_older_than("1.14"),
58+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
59+
)
3960
def test_onnxfns_thresholded_relu(self):
4061
self.run_onnx_test(onnxfns1A.ThresholdedRelu)
4162

4263
@unittest.skipIf(
4364
not hasattr(onnx.FunctionProto, "attribute_proto"),
4465
reason="current onnx does not support default values",
4566
)
67+
@pytest.mark.xfail(
68+
version_utils.onnxruntime_older_than("1.15")
69+
and not version_utils.onnx_older_than("1.14"),
70+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
71+
)
4672
def test_onnxfns_leaky_relu(self):
4773
self.run_onnx_test(onnxfns1A.LeakyRelu)
4874

75+
@pytest.mark.xfail(
76+
version_utils.onnxruntime_older_than("1.15")
77+
and not version_utils.onnx_older_than("1.14"),
78+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
79+
)
4980
def test_onnxfns_prelu(self):
5081
self.run_onnx_test(onnxfns1A.PRelu)
5182

5283
@unittest.skipIf(
5384
not hasattr(onnx.FunctionProto, "attribute_proto"),
5485
reason="current onnx does not support default values",
5586
)
87+
@pytest.mark.xfail(
88+
version_utils.onnxruntime_older_than("1.15")
89+
and not version_utils.onnx_older_than("1.14"),
90+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
91+
)
5692
def test_onnxfns_hard_sigmoid(self):
5793
self.run_onnx_test(onnxfns1A.HardSigmoid)
5894

5995
@unittest.skipIf(
6096
not hasattr(onnx.FunctionProto, "attribute_proto"),
6197
reason="current onnx does not support default values",
6298
)
99+
@pytest.mark.xfail(
100+
version_utils.onnxruntime_older_than("1.15")
101+
and not version_utils.onnx_older_than("1.14"),
102+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
103+
)
63104
def test_onnxfns_shrink(self):
64105
self.run_onnx_test(onnxfns1A.Shrink)
65106

107+
@pytest.mark.xfail(
108+
version_utils.onnxruntime_older_than("1.15")
109+
and not version_utils.onnx_older_than("1.14"),
110+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
111+
)
66112
def test_onnxfns_hard_softplus(self):
67113
self.run_onnx_test(onnxfns1A.Softplus)
68114

115+
@pytest.mark.xfail(
116+
version_utils.onnxruntime_older_than("1.15")
117+
and not version_utils.onnx_older_than("1.14"),
118+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
119+
)
69120
def test_onnxfns_hard_softsign(self):
70121
self.run_onnx_test(onnxfns1A.Softsign)
71122

72-
# TODO: Clip has optional input min and max.
73-
# need to find out how to pass default min and max
74-
# to the test case executor.
75-
# def test_onnxfns_hard_clip(self):
76-
# self.run_onnx_test(onnxfns1.Clip)
123+
@pytest.mark.xfail(
124+
reason="Clip has optional input min and max. Need to find out how to pass default min and max to the test case executor."
125+
)
126+
@pytest.mark.xfail(
127+
version_utils.onnxruntime_older_than("1.15")
128+
and not version_utils.onnx_older_than("1.14"),
129+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
130+
)
131+
def test_onnxfns_hard_clip(self):
132+
self.run_onnx_test(onnxfns1A.Clip)
77133

78134

79135
if __name__ == "__main__":

onnxscript/tests/functions/onnxfns2_test.py

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
import unittest
22

33
import onnxruntime
4-
from packaging.version import Version
4+
import pytest
55

6-
from onnxscript.tests.common import onnx_script_test_case
6+
from onnxscript.tests.common import onnx_script_test_case, version_utils
77
from onnxscript.tests.models import onnxfns2
88

99

10+
@pytest.mark.xfail(
11+
version_utils.onnxruntime_older_than("1.15") and not version_utils.onnx_older_than("1.14"),
12+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
13+
)
1014
class TestOnnxFns(onnx_script_test_case.OnnxScriptTestCase):
1115
@classmethod
1216
def setUpClass(cls):
1317
super().setUpClass()
1418
cls.rtol = 1e-05
1519

1620
@unittest.skipIf(
17-
Version(onnxruntime.__version__) < Version("1.12"),
21+
version_utils.onnxruntime_older_than("1.12"),
1822
reason="onnxruntime does not support that scenario.",
1923
)
2024
def test_onnxfns_reduce_sum_square(self):
@@ -30,10 +34,6 @@ def test_onnxfns_reduce_sum_square(self):
3034
],
3135
)
3236

33-
@unittest.skipIf(
34-
Version(onnxruntime.__version__) < Version("1.12"),
35-
reason="onnxruntime does not support that scenario.",
36-
)
3737
def test_onnxfns_reduce_l1(self):
3838
default_keepdims = 1
3939

@@ -47,10 +47,6 @@ def test_onnxfns_reduce_l1(self):
4747
],
4848
)
4949

50-
@unittest.skipIf(
51-
Version(onnxruntime.__version__) < Version("1.12"),
52-
reason="onnxruntime does not support that scenario.",
53-
)
5450
def test_onnxfns_reduce_l2(self):
5551
default_keepdims = 1
5652

@@ -65,7 +61,7 @@ def test_onnxfns_reduce_l2(self):
6561
)
6662

6763
@unittest.skipIf(
68-
Version(onnxruntime.__version__) < Version("1.12"),
64+
version_utils.onnxruntime_older_than("1.12"),
6965
reason="onnxruntime does not support that scenario.",
7066
)
7167
def test_onnxfns_reduce_log_sum(self):
@@ -79,7 +75,7 @@ def test_onnxfns_reduce_log_sum(self):
7975
)
8076

8177
@unittest.skipIf(
82-
Version(onnxruntime.__version__) < Version("1.12"),
78+
version_utils.onnxruntime_older_than("1.12"),
8379
reason="onnxruntime does not support that scenario.",
8480
)
8581
def test_onnxfns_reduce_log_sum_exp(self):
@@ -95,11 +91,6 @@ def test_onnxfns_reduce_log_sum_exp(self):
9591
],
9692
)
9793

98-
@unittest.skipIf(
99-
Version(onnxruntime.__version__) < Version("1.13"),
100-
reason="ORT does not correctly handle attribute-references "
101-
"of the form attr1=@attr2 where attr1 and attr2 are different.",
102-
)
10394
def test_onnxfns_hardmax(self):
10495
default_axis = -1
10596

onnxscript/tests/functions/onnxfns_test.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
import unittest
77

88
import onnx
9+
import pytest
910

10-
from onnxscript.tests.common import onnx_script_test_case
11+
from onnxscript.tests.common import onnx_script_test_case, version_utils
1112
from onnxscript.tests.models import onnxfns1
1213

1314

15+
@pytest.mark.xfail(
16+
version_utils.onnxruntime_older_than("1.15") and not version_utils.onnx_older_than("1.14"),
17+
reason="ORT <=1.14 does not support IR version 9 produced by ONNX 1.14",
18+
)
1419
class TestOnnxFns(onnx_script_test_case.OnnxScriptTestCase):
1520
@classmethod
1621
def setUpClass(cls):

requirements-onnx-weekly.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
onnx-weekly==1.14.0.dev20230227
1+
onnx-weekly==1.14.0.dev20230306

0 commit comments

Comments
 (0)