Skip to content

Commit ecab7a8

Browse files
xaduprexadupre
authored
support 2.9 on CI (#262)
* v57.1 * fix issues * support 2.9 on CI * changes * improve * urls * fix torch version * fix patches * fix * split files * disable some tests * revert changes * uninstall triton * disable test using matplotlib * improve ci * fix * spell
1 parent 1018374 commit ecab7a8

20 files changed

+283
-125
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ jobs:
1818
os: [ubuntu-latest]
1919
python: ['3.10', '3.11', '3.12', '3.13']
2020
transformers: ['4.48.3', '4.51.3', '4.52.4', '4.55.4', '4.56.2', '4.57.1', 'main']
21-
torch: ['2.8', 'main']
21+
torch: ['2.8', '2.9', 'main']
2222
exclude:
23-
- python: '3.10'
23+
- python: '3.10' # 3.10
2424
torch: 'main'
25+
- python: '3.10'
26+
torch: '2.9'
2527
- python: '3.10'
2628
transformers: 'main'
2729
- python: '3.10'
@@ -32,8 +34,10 @@ jobs:
3234
transformers: '4.56.2'
3335
- python: '3.10'
3436
transformers: '4.57.1'
35-
- python: '3.11'
37+
- python: '3.11' # 3.11
3638
torch: 'main'
39+
- python: '3.11'
40+
torch: '2.8'
3741
- python: '3.11'
3842
transformers: 'main'
3943
- python: '3.11'
@@ -42,8 +46,10 @@ jobs:
4246
transformers: '4.56.2'
4347
- python: '3.11'
4448
transformers: '4.57.1'
45-
- python: '3.13'
49+
- python: '3.13' # 3.13
4650
torch: '2.8'
51+
- python: '3.13'
52+
torch: '2.9'
4753
- python: '3.13'
4854
transformers: '4.48.3'
4955
- python: '3.13'
@@ -59,13 +65,13 @@ jobs:
5965
with:
6066
python-version: ${{ matrix.python }}
6167

62-
- name: Install pytorch
68+
- name: Install pytorch ${{ matrix.torch }}
6369
run: |
6470
if [[ "${{ matrix.torch }}" == "main" ]]; then
6571
python -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu
6672
else
67-
echo "install torch==${{ matrix.torch }}"
68-
pip install torch==${{ matrix.torch }}
73+
echo "install torch==${{ matrix.torch }} torchvision torchaudio"
74+
pip install torch==${{ matrix.torch }} torchvision torchaudio
6975
fi
7076
7177
- name: Install transformers ${{ matrix.transformers }}
@@ -95,6 +101,15 @@ jobs:
95101
python -m pip uninstall -y onnx
96102
python -m pip install onnx-weekly
97103
104+
- name: Install pytorch ${{ matrix.torch }} (2)
105+
run: |
106+
if [[ "${{ matrix.torch }}" == "main" ]]; then
107+
python -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu
108+
else
109+
echo "install torch==${{ matrix.torch }} torchvision torchaudio"
110+
pip install torch==${{ matrix.torch }} torchvision torchaudio
111+
fi
112+
98113
- name: Cache pip
99114
uses: actions/cache@v4
100115
with:

‎CHANGELOGS.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Change Logs
44
0.7.15
55
++++++
66

7+
* :pr:`261`: updates to support ``transformers>=5.0``
8+
79
0.7.14
810
++++++
911

‎_doc/conf.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ def linkcode_resolve(domain, info):
236236
"onnx.helper": "https://onnx.ai/onnx/api/helper.html",
237237
"ONNX": "https://onnx.ai/",
238238
"ONNX Operators": "https://onnx.ai/onnx/operators/",
239-
"onnxrt backend": "https://docs.pytorch.org/docs/stable/onnx_dynamo_onnxruntime_backend.html",
240239
"onnxruntime": "https://onnxruntime.ai/",
241240
"onnxruntime-training": "https://onnxruntime.ai/docs/get-started/training-on-device.html",
242241
"onnxruntime kernels": "https://onnxruntime.ai/docs/reference/operators/OperatorKernels.html",

‎_unittests/ut_tasks/test_tasks.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def test_falcon_mamba_dev(self):
297297
model(**inputs)
298298
model(**data["inputs2"])
299299
self.assertIn((data["size"], data["n_weights"]), [(274958336, 68739584)])
300-
if not has_transformers("4.57.99"):
300+
if not has_transformers("5.0.99"):
301301
raise unittest.SkipTest("The model has control flow.")
302302
with torch_export_patches(patch_transformers=True, verbose=10, stop_if_static=1):
303303
torch.export.export(

‎_unittests/ut_tasks/test_tasks_image_text_to_text.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_image_text_to_text_idefics(self):
2929
)
3030

3131
@hide_stdout()
32-
@requires_transformers("4.57.99")
32+
@requires_transformers("5.0.99")
3333
@requires_torch("2.7.99")
3434
def test_image_text_to_text_tiny_gemma3(self):
3535
"""
@@ -79,7 +79,7 @@ def test_image_text_to_text_gemma3_4b_it(self):
7979
)
8080

8181
@hide_stdout()
82-
@requires_transformers("4.57.99")
82+
@requires_transformers("5.0.99")
8383
@requires_torch("2.7.99")
8484
def test_image_text_to_text_zai_glm(self):
8585
"""

‎_unittests/ut_tasks/test_tasks_mask_generation.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,23 @@ def test_mask_generation(self):
2828
model, (), kwargs=inputs, dynamic_shapes=use_dyn_not_str(ds), strict=False
2929
)
3030

31+
@hide_stdout()
32+
@requires_transformers("4.53")
33+
@requires_torch("2.7.99")
34+
def test_mask_generation_with_torch_patches(self):
35+
mid = "fxmarty/sam-vit-tiny-random"
36+
data = get_untrained_model_with_inputs(mid, verbose=1, add_second_input=True)
37+
self.assertEqual(data["task"], "mask-generation")
38+
model, inputs, ds = data["model"], data["inputs"], data["dynamic_shapes"]
39+
model(**torch_deepcopy(inputs))
40+
model(**data["inputs2"])
41+
with torch_export_patches(
42+
patch_torch=True, patch_sympy=True, patch_transformers=True, verbose=1
43+
):
44+
torch.export.export(
45+
model, (), kwargs=inputs, dynamic_shapes=use_dyn_not_str(ds), strict=False
46+
)
47+
3148

3249
if __name__ == "__main__":
3350
unittest.main(verbosity=2)

‎_unittests/ut_torch_export_patches/test_patch_module.py‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,94 @@ def loop_body_1(z, iv, x, y):
618618
)
619619
"""
620620

621+
def test_broadcast_in_dim_1(self):
622+
class BadBroadcast(torch.nn.Module):
623+
def forward(self, x):
624+
shape = [x.shape[0], x.shape[1], 1]
625+
dims = [0, 1]
626+
return torch.ops.prims.broadcast_in_dim.default(x, shape, dims)
627+
628+
x = torch.rand((3, 4), dtype=torch.float32)
629+
expected = BadBroadcast()(x)
630+
DYN = torch.export.Dim.DYNAMIC
631+
ds = ({0: DYN, 1: DYN},)
632+
for strict in [False, True]:
633+
with self.subTest(strict=strict):
634+
ep = torch.export.export(
635+
BadBroadcast(), (x,), dynamic_shapes=ds, strict=strict
636+
)
637+
got = ep.module()(x)
638+
self.assertEqualArray(expected, got)
639+
with torch_export_patches(patch_torch=True):
640+
ep = torch.export.export(
641+
BadBroadcast(), (x,), dynamic_shapes=ds, strict=strict
642+
)
643+
got = ep.module()(x)
644+
self.assertEqualArray(expected, got)
645+
646+
def test_broadcast_in_dim_2(self):
647+
class BadBroadcast(torch.nn.Module):
648+
def forward(self, x):
649+
shape = [x.shape[0], 3, 1]
650+
dims = [0, 1]
651+
return torch.ops.prims.broadcast_in_dim.default(x, shape, dims)
652+
653+
x = torch.rand((3, 1), dtype=torch.float32)
654+
expected = BadBroadcast()(x)
655+
print(expected.shape, expected)
656+
DYN = torch.export.Dim.DYNAMIC
657+
ds = ({0: DYN, 1: DYN},)
658+
for strict in [False, True]:
659+
with self.subTest(strict=strict):
660+
with torch_export_patches(patch_torch=True):
661+
ep = torch.export.export(
662+
BadBroadcast(), (x,), dynamic_shapes=ds, strict=strict
663+
)
664+
got = ep.module()(x)
665+
self.assertEqualArray(expected, got)
666+
667+
def test_broadcast_in_dim_3(self):
668+
class BadBroadcast(torch.nn.Module):
669+
def forward(self, x):
670+
shape = [3, x.shape[1], 1]
671+
dims = [0, 1]
672+
return torch.ops.prims.broadcast_in_dim.default(x, shape, dims)
673+
674+
x = torch.rand((1, 3), dtype=torch.float32)
675+
expected = BadBroadcast()(x)
676+
print(expected.shape, expected)
677+
DYN = torch.export.Dim.DYNAMIC
678+
ds = ({0: DYN, 1: DYN},)
679+
for strict in [False, True]:
680+
with self.subTest(strict=strict):
681+
with torch_export_patches(patch_torch=True):
682+
ep = torch.export.export(
683+
BadBroadcast(), (x,), dynamic_shapes=ds, strict=strict
684+
)
685+
got = ep.module()(x)
686+
self.assertEqualArray(expected, got)
687+
688+
def test_broadcast_in_dim_5(self):
689+
class BadBroadcast(torch.nn.Module):
690+
def forward(self, x):
691+
shape = [1, x.shape[1], 1]
692+
dims = [0, 1]
693+
return torch.ops.prims.broadcast_in_dim.default(x, shape, dims)
694+
695+
x = torch.rand((1, 3), dtype=torch.float32)
696+
expected = BadBroadcast()(x)
697+
print(expected.shape, expected)
698+
DYN = torch.export.Dim.DYNAMIC
699+
ds = ({0: DYN, 1: DYN},)
700+
for strict in [False, True]:
701+
with self.subTest(strict=strict):
702+
with torch_export_patches(patch_torch=True):
703+
ep = torch.export.export(
704+
BadBroadcast(), (x,), dynamic_shapes=ds, strict=strict
705+
)
706+
got = ep.module()(x)
707+
self.assertEqualArray(expected, got)
708+
621709

622710
if __name__ == "__main__":
623711
unittest.main(verbosity=2)

‎_unittests/ut_torch_export_patches/test_patch_torch.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ def forward(self, x, ind1, ind2):
321321
got = ep.module()(*inputs)
322322
self.assertEqualArray(expected, got)
323323

324+
@requires_torch("2.11", "until we know more")
324325
def test_patched__broadcast_in_dim_meta(self):
325326
class Model(torch.nn.Module):
326327
def forward(self, x, ind1, ind2):
@@ -336,7 +337,7 @@ def forward(self, x, ind1, ind2):
336337

337338
with (
338339
torch.fx.experimental._config.patch(backed_size_oblivious=True),
339-
torch_export_patches(),
340+
torch_export_patches(patch_torch=True),
340341
):
341342
ep = torch.export.export(
342343
model,

‎_unittests/ut_torch_models/test_validate_whole_models.py‎ renamed to ‎_unittests/ut_torch_models/test_validate_whole_models1.py‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from onnx_diagnostic.tasks import supported_tasks
2323

2424

25-
class TestValidateWholeModels(ExtTestCase):
25+
class TestValidateWholeModels1(ExtTestCase):
2626
def test_a_get_inputs_for_task(self):
2727
fcts = supported_tasks()
2828
for task in self.subloop(sorted(fcts)):
@@ -107,13 +107,14 @@ def test_g_validate_model_onnx_dynamo_os_ort(self):
107107
verbose=10,
108108
exporter="onnx-dynamo",
109109
dump_folder="dump_test/validate_model_onnx_dynamo_os_ort",
110-
patch=True,
110+
patch=dict(patch_torch=False, patch_transformers=True, patch_sympy=True),
111111
stop_if_static=2 if pv.Version(torch.__version__) > pv.Version("2.6.1") else 0,
112112
optimization="os_ort",
113+
quiet_input_sets={"inputs", "inputs22"},
113114
)
114115
self.assertIsInstance(summary, dict)
115116
self.assertIsInstance(data, dict)
116-
self.assertLess(summary["disc_onnx_ort_run_abs"], 1e-4)
117+
self.assertLess(summary["disc_onnx_ort_run2_batch1_abs"], 1e-4)
117118
onnx_filename = data["onnx_filename"]
118119
self.assertExists(onnx_filename)
119120

@@ -259,30 +260,6 @@ def test_n_validate_phi35_mini_instruct(self):
259260
op_types = set(n.op_type for n in onx.graph.node)
260261
self.assertIn("If", op_types)
261262

262-
@requires_torch("2.9")
263-
@hide_stdout()
264-
@ignore_warnings(FutureWarning)
265-
@requires_transformers("4.55")
266-
def test_o_validate_phi35_4k_mini_instruct(self):
267-
mid = "microsoft/Phi-3-mini-4k-instruct"
268-
summary, data = validate_model(
269-
mid,
270-
do_run=True,
271-
verbose=10,
272-
exporter="custom",
273-
dump_folder="dump_test/validate_phi35_mini_instruct",
274-
inputs2=True,
275-
patch=True,
276-
rewrite=True,
277-
model_options={"rope_scaling": {"rope_type": "dynamic", "factor": 10.0}},
278-
)
279-
self.assertIsInstance(summary, dict)
280-
self.assertIsInstance(data, dict)
281-
onnx_filename = data["onnx_filename"]
282-
onx = onnx.load(onnx_filename)
283-
op_types = set(n.op_type for n in onx.graph.node)
284-
self.assertIn("If", op_types)
285-
286263

287264
if __name__ == "__main__":
288265
unittest.main(verbosity=2)

‎_unittests/ut_torch_models/test_validate_whole_models2.py‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import unittest
2+
import onnx
3+
import torch
4+
from onnx_diagnostic.ext_test_case import (
5+
ExtTestCase,
6+
hide_stdout,
7+
ignore_warnings,
8+
requires_torch,
9+
requires_transformers,
10+
)
11+
from onnx_diagnostic.torch_models.validate import validate_model
12+
13+
14+
class TestValidateWholeModels2(ExtTestCase):
15+
@requires_torch("2.9")
16+
@hide_stdout()
17+
@ignore_warnings(FutureWarning)
18+
@requires_transformers("4.55")
19+
@unittest.skipIf(torch.__version__.startswith("2.9.0"), "no left space space on device?")
20+
def test_o_validate_phi35_4k_mini_instruct(self):
21+
mid = "microsoft/Phi-3-mini-4k-instruct"
22+
summary, data = validate_model(
23+
mid,
24+
do_run=True,
25+
verbose=10,
26+
exporter="custom",
27+
dump_folder="dump_test/validate_phi35_mini_instruct",
28+
inputs2=True,
29+
patch=True,
30+
rewrite=True,
31+
model_options={"rope_scaling": {"rope_type": "dynamic", "factor": 10.0}},
32+
)
33+
self.assertIsInstance(summary, dict)
34+
self.assertIsInstance(data, dict)
35+
onnx_filename = data["onnx_filename"]
36+
onx = onnx.load(onnx_filename)
37+
op_types = set(n.op_type for n in onx.graph.node)
38+
self.assertIn("If", op_types)
39+
40+
41+
if __name__ == "__main__":
42+
unittest.main(verbosity=2)

0 commit comments

Comments
 (0)