Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Adds a mode to compare models without execution#76

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
sdpython merged 14 commits intomainfromcmd
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
6eb6adf
update requirements
xadupreFeb 2, 2024
4f0a994
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 2, 2024
c7bb055
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 2, 2024
a3d4ccf
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 6, 2024
7ed1385
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 6, 2024
bab2a6b
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 7, 2024
014404b
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 7, 2024
00e2a1c
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 14, 2024
d1aff97
Merge branch 'main' of https://github.com/sdpython/onnx-array-api
xadupreFeb 15, 2024
271c29d
Add a mode to compare model without execution
xadupreFeb 21, 2024
918e0dd
changelogs
xadupreFeb 21, 2024
3b10ea8
improve initializer
xadupreFeb 21, 2024
463bc86
fix display
xadupreFeb 21, 2024
b627f81
fix side
xadupreFeb 21, 2024
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
1 change: 1 addition & 0 deletionsCHANGELOGS.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ Change Logs
0.2.0
+++++

* :pr:`76`: add a mode to compare models without execution
* :pr:`75`: add QuickGelu to ExtendedReferenceEvaluator
* :pr:`71`: adds tools to compare two onnx graphs
* :pr:`61`: adds function to plot onnx model as graphs
Expand Down
78 changes: 71 additions & 7 deletions_unittests/ut_reference/test_evaluator_yield.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import unittest
import numpy as np
from onnx import TensorProto
from onnx.checker import check_model
from onnx.helper import (
make_function,
make_graph,
Expand All@@ -9,6 +10,7 @@
make_opsetid,
make_tensor_value_info,
)
from onnx.numpy_helper import from_array
from onnx.parser import parse_model
from onnx_array_api.ext_test_case import ExtTestCase
from onnx_array_api.reference import (
Expand DownExpand Up@@ -422,13 +424,13 @@ def test_distance_sequence_str(self):
text = dc.to_str(s1, s2, align)
self.assertIn("OUTPUT", text)
expected = """
001=|INPUTfloat322x2ABCDA|INPUTfloat322x2ABCDA
002=|INPUTfloat322x2ABCDB|INPUTfloat322x2ABCDB
003~|INPUTfloat322x3ABCDX|INPUTfloat322x2ABCDX
004-|RESULTfloat322x2CEIOExpH|
005=|RESULTfloat322x2CEIOLinearRegrY1|RESULTfloat322x2CEIOLinearRegrY1
006~|RESULTfloat322x2CEIOAbsY|RESULTfloat322x3CEIPAbsZ
007~|OUTPUTfloat322x2CEIOY|OUTPUTfloat322x2CEIPY
001=|INPUTfloat322:2x2ABCDA|INPUTfloat322:2x2ABCDA
002=|INPUTfloat322:2x2ABCDB|INPUTfloat322:2x2ABCDB
003~|INPUTfloat322:2x3ABCDX|INPUTfloat322:2x2ABCDX
004-|RESULTfloat322:2x2CEIOExpH|
005=|RESULTfloat322:2x2CEIOLinearRegressioY1|RESULTfloat322:2x2CEIOLinearRegressioY1
006~|RESULTfloat322:2x2CEIOAbsY|RESULTfloat322:2x3CEIPAbsZ
007~|OUTPUTfloat322:2x2CEIOY|OUTPUTfloat322:2x2CEIPY
""".replace(
" ", ""
).strip(
Expand DownExpand Up@@ -460,6 +462,68 @@ def test_compare_execution(self):
self.assertIn("CAAA Constant", text)
self.assertEqual(len(align), 5)

def test_no_execution(self):
model = make_model(
make_graph(
[
make_node("Unsqueeze", ["X", "zero"], ["xu1"]),
make_node("Unsqueeze", ["xu1", "un"], ["xu2"]),
make_node("Reshape", ["xu2", "shape1"], ["xm1"]),
make_node("Reshape", ["Y", "shape2"], ["xm2c"]),
make_node("Cast", ["xm2c"], ["xm2"], to=1),
make_node("MatMul", ["xm1", "xm2"], ["xm"]),
make_node("Reshape", ["xm", "shape3"], ["Z"]),
],
"dummy",
[
make_tensor_value_info("X", TensorProto.FLOAT, [32, 128]),
make_tensor_value_info("Y", TensorProto.FLOAT, [3, 5, 128, 64]),
],
[make_tensor_value_info("Z", TensorProto.FLOAT, [3, 5, 32, "N"])],
[
from_array(np.array([0], dtype=np.int64), name="zero"),
from_array(np.array([1], dtype=np.int64), name="un"),
from_array(np.array([1, 32, 128], dtype=np.int64), name="shape1"),
from_array(np.array([15, 128, 64], dtype=np.int64), name="shape2"),
from_array(np.array([3, 5, 32, 64], dtype=np.int64), name="shape3"),
],
)
)
check_model(model)
res1, res2, align, dc = compare_onnx_execution(model, model, mode="nodes")
text = dc.to_str(res1, res2, align)
self.assertIn("012 = | NODE", text)

model2 = make_model(
make_graph(
[
make_node("Unsqueeze", ["X", "zero"], ["xu1"]),
make_node("Unsqueeze", ["xu1", "un"], ["xu2"]),
make_node("Reshape", ["xu2", "shape1"], ["xm1"]),
make_node("Reshape", ["Y", "shape2"], ["xm2c"]),
make_node("MatMul", ["xm1", "xm2c"], ["xm"]),
make_node("Reshape", ["xm", "shape3"], ["Z"]),
],
"dummy",
[
make_tensor_value_info("X", TensorProto.FLOAT, [32, 128]),
make_tensor_value_info("Y", TensorProto.FLOAT, [3, 5, 128, 64]),
],
[make_tensor_value_info("Z", TensorProto.FLOAT, [3, 5, 32, "N"])],
[
from_array(np.array([0], dtype=np.int64), name="zero"),
from_array(np.array([1], dtype=np.int64), name="un"),
from_array(np.array([1, 32, 128], dtype=np.int64), name="shape1"),
from_array(np.array([15, 128, 64], dtype=np.int64), name="shape2"),
from_array(np.array([3, 5, 32, 64], dtype=np.int64), name="shape3"),
],
)
)
check_model(model2)
res1, res2, align, dc = compare_onnx_execution(model, model2, mode="nodes")
text = dc.to_str(res1, res2, align)
self.assertIn("012 = | NODE", text)


if __name__ == "__main__":
unittest.main(verbosity=2)
17 changes: 13 additions & 4 deletionsonnx_array_api/_command_lines_parser.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ def get_main_parser() -> ArgumentParser:
Selects a command.

'translate' exports an onnx graph into a piece of code replicating it,
'compares' compares the execution of two onnx models
'compare' compares the execution of two onnx models
"""
),
)
Expand DownExpand Up@@ -90,6 +90,13 @@ def get_parser_compare() -> ArgumentParser:
required=True,
help="second onnx model",
)
parser.add_argument(
"-m",
"--mode",
choices=["execute", "nodes"],
default="execute",
help="compare the execution ('execute') or the nodes only ('nodes')",
)
parser.add_argument(
"-v",
"--verbose",
Expand All@@ -112,8 +119,10 @@ def _cmd_compare(argv: List[Any]):
args = parser.parse_args(argv[1:])
onx1 = onnx.load(args.model1)
onx2 = onnx.load(args.model2)
res1, res2, align, dc = compare_onnx_execution(onx1, onx2, verbose=args.verbose)
text = dc.to_str(res1, res2, align, column_size=args.column_size)
res1, res2, align, dc = compare_onnx_execution(
onx1, onx2, verbose=args.verbose, mode=args.mode
)
text = dc.to_str(res1, res2, align, column_size=int(args.column_size))
print(text)


Expand All@@ -127,7 +136,7 @@ def main(argv: Optional[List[Any]] = None):
parser = get_main_parser()
parser.parse_args(argv)
else:
parsers = dict(translate=get_parser_translate)
parsers = dict(translate=get_parser_translate, compare=get_parser_compare)
cmd = argv[0]
if cmd not in parsers:
raise ValueError(
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp