Skip to content

Improves graph rendering for timeseries #162

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 5 commits into from
Jun 23, 2025
Merged

Improves graph rendering for timeseries #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c46f6b
update version
xadupre Jun 23, 2025
d40eb78
Improves graph on timeseries
xadupre Jun 23, 2025
96793dd
Merge branch 'main' of https://github.com/sdpython/onnx-diagnostic in…
xadupre Jun 23, 2025
543e6ff
mypy
xadupre Jun 23, 2025
b803974
group
xadupre Jun 23, 2025
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
99 changes: 99 additions & 0 deletions _unittests/ut_helpers/test_log_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
from onnx_diagnostic.helpers.log_helper import (
CubeLogs,
CubeLogsPerformance,
CubePlot,
CubeViewDef,
enumerate_csv_files,
open_dataframe,
filter_data,
)


Expand Down Expand Up @@ -303,6 +305,103 @@ def test_historical(self):
self.assertEqual((2, 3), view.shape)
self.assertEqual(["METRICS", "exporter", "date"], view.columns.names)

def test_group_columns(self):
val = [
"eager/export-nostrict/none",
"eager/inductor/none",
"eager/modelbuilder/none",
"eager/olive-exporter/ir",
"eager/olive-exporter/none",
"eager/torch_script/default",
"eager/torch_script/none",
"sdpa/export-nostrict/none",
"sdpa/olive-exporter/ir",
"sdpa/olive-exporter/none",
]
spl = CubePlot.group_columns(val, depth=1)
expected = [
[
"eager/export-nostrict/none",
"eager/inductor/none",
"eager/modelbuilder/none",
"eager/olive-exporter/ir",
"eager/olive-exporter/none",
"eager/torch_script/default",
"eager/torch_script/none",
],
[
"sdpa/export-nostrict/none",
"sdpa/olive-exporter/ir",
"sdpa/olive-exporter/none",
],
]
self.assertEqual(expected, spl)

val = [
"eager/custom/default",
"eager/custom/default+onnxruntime",
"eager/custom/none",
"eager/export-nostrict/none",
"eager/inductor/none",
"eager/modelbuilder/none",
"eager/olive-exporter/ir",
"eager/olive-exporter/none",
"eager/onnx_dynamo-fallback/ir",
"eager/onnx_dynamo-fallback/none",
"eager/onnx_dynamo-fallback/os_ort",
"eager/onnx_dynamo/ir",
"eager/onnx_dynamo/none",
"eager/onnx_dynamo/os_ort",
"eager/torch_script/default",
"eager/torch_script/none",
"sdpa/custom/default",
"sdpa/custom/default+onnxruntime",
"sdpa/custom/none",
"sdpa/export-nostrict/none",
"sdpa/olive-exporter/ir",
"sdpa/olive-exporter/none",
"sdpa/onnx_dynamo/ir",
"sdpa/onnx_dynamo/none",
"sdpa/onnx_dynamo/os_ort",
]
spl = CubePlot.group_columns(val)
expected = [
[
"eager/export-nostrict/none",
"eager/inductor/none",
"eager/modelbuilder/none",
"eager/olive-exporter/ir",
"eager/olive-exporter/none",
"eager/torch_script/default",
"eager/torch_script/none",
],
[
"sdpa/export-nostrict/none",
"sdpa/olive-exporter/ir",
"sdpa/olive-exporter/none",
],
["eager/custom/default", "eager/custom/default+onnxruntime", "eager/custom/none"],
["eager/onnx_dynamo/ir", "eager/onnx_dynamo/none", "eager/onnx_dynamo/os_ort"],
[
"eager/onnx_dynamo-fallback/ir",
"eager/onnx_dynamo-fallback/none",
"eager/onnx_dynamo-fallback/os_ort",
],
["sdpa/custom/default", "sdpa/custom/default+onnxruntime", "sdpa/custom/none"],
["sdpa/onnx_dynamo/ir", "sdpa/onnx_dynamo/none", "sdpa/onnx_dynamo/os_ort"],
]
self.assertEqual(expected, spl)

@hide_stdout()
def test_filter_data(self):
df = self.df1()
df2 = filter_data(df, "", "", verbose=1)
self.assertEqualDataFrame(df, df2)
df2 = filter_data(df, "model_exporter:onnx-dynamo;T", "", verbose=1)
self.assertEqualDataFrame(df[df.model_exporter == "onnx-dynamo"], df2)
df2 = filter_data(df, "", "model_exporter:onnx-dynamo;T", verbose=1)
self.assertEqualDataFrame(df[df.model_exporter != "onnx-dynamo"], df2)


if __name__ == "__main__":
unittest.main(verbosity=2)
21 changes: 19 additions & 2 deletions onnx_diagnostic/_command_lines_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,11 +733,28 @@ def get_parser_agg() -> ArgumentParser:
help="Views to dump as csv files.",
)
parser.add_argument("-v", "--verbose", type=int, default=0, help="verbosity")
parser.add_argument(
"--filter_in",
default="",
help="adds a filter to filter in data, syntax is\n"
'``"<column1>:<value1>;<value2>/<column2>:<value3>"`` ...',
)
parser.add_argument(
"--filter_out",
default="",
help="adds a filter to filter out data, syntax is\n"
'``"<column1>:<value1>;<value2>/<column2>:<value3>"`` ...',
)
return parser


def _cmd_agg(argv: List[Any]):
from .helpers.log_helper import CubeLogsPerformance, open_dataframe, enumerate_csv_files
from .helpers.log_helper import (
CubeLogsPerformance,
open_dataframe,
enumerate_csv_files,
filter_data,
)

parser = get_parser_agg()
args = parser.parse_args(argv[1:])
Expand All @@ -761,7 +778,7 @@ def _cmd_agg(argv: List[Any]):
assert (
args.time in df.columns
), f"Missing time column {args.time!r} in {c!r}\n{df.head()}\n{sorted(df.columns)}"
dfs.append(df)
dfs.append(filter_data(df, filter_in=args.filter_in, filter_out=args.filter_out))

drop_keys = set(args.drop_keys.split(","))
cube = CubeLogsPerformance(
Expand Down
9 changes: 9 additions & 0 deletions onnx_diagnostic/ext_test_case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,15 @@ def assertEqualArray(
]
raise AssertionError("\n".join(rows)) # noqa: B904

def assertEqualDataFrame(self, d1, d2, **kwargs):
"""
Checks that two dataframes are equal.
Calls :func:`pandas.testing.assert_frame_equal`.
"""
from pandas.testing import assert_frame_equal

assert_frame_equal(d1, d2, **kwargs)

def assertEqualTrue(self, value: Any, msg: str = ""):
if value is True:
return
Expand Down
Loading
Loading