Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion _unittests/ut_xrun_doc/test_command_lines_exe.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
import unittest
from contextlib import redirect_stdout
from io import StringIO
from onnx_diagnostic.ext_test_case import ExtTestCase
from onnx_diagnostic.ext_test_case import ExtTestCase, ignore_warnings
from onnx_diagnostic._command_lines_parser import main
from onnx_diagnostic.helpers.log_helper import enumerate_csv_files


class TestCommandLines(ExtTestCase):
Expand Down Expand Up @@ -66,6 +67,20 @@ def test_parser_validate(self):
text = st.getvalue()
self.assertIn("model_clas", text)

@ignore_warnings(UserWarning)
def test_parser_agg(self):
path = os.path.abspath(
os.path.join(os.path.dirname(__file__), "..", "ut_helpers", "data")
)
assert list(enumerate_csv_files([f"{path}/*.zip"]))
output = self.get_dump_file("test_parser_agg.xlsx")
st = StringIO()
with redirect_stdout(st):
main(["agg", output, f"{path}/*.zip", "--filter", ".*.csv", "-v", "1"])
text = st.getvalue()
self.assertIn("[CubeLogs.to_excel] plots 1 plots", text)
self.assertExists(output)


if __name__ == "__main__":
unittest.main(verbosity=2)
13 changes: 13 additions & 0 deletions _unittests/ut_xrun_doc/test_doc_doc.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import unittest
from onnx_diagnostic.ext_test_case import ExtTestCase
from onnx_diagnostic.doc import reset_torch_transformers


class TestDocDoc(ExtTestCase):

def test_reset(self):
reset_torch_transformers(None, None)


if __name__ == "__main__":
unittest.main(verbosity=2)
5 changes: 5 additions & 0 deletions _unittests/ut_xrun_doc/test_unit_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
has_cuda,
has_onnxscript,
)
from onnx_diagnostic.api import TensorLike


class TestUnitTest(ExtTestCase):
Expand Down Expand Up @@ -110,6 +111,10 @@ def test_measure_time_max(self):
},
)

def test_exc(self):
self.assertRaise(lambda: TensorLike().dtype, NotImplementedError)
self.assertRaise(lambda: TensorLike().shape, NotImplementedError)


if __name__ == "__main__":
unittest.main(verbosity=2)
2 changes: 1 addition & 1 deletion onnx_diagnostic/_command_lines_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ def _cmd_agg(argv: List[Any]):
args.inputs, verbose=args.verbose, filtering=lambda name: bool(reg.search(name))
)
)
assert csv, f"No csv files in {args.inputs}, csv={csv}"
assert csv, f"No csv files in {args.inputs}, args.filter={args.filter!r}, csv={csv}"
if args.verbose:
from tqdm import tqdm

Expand Down
44 changes: 30 additions & 14 deletions onnx_diagnostic/helpers/log_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,11 @@ def to_excel(
df.to_excel(writer, sheet_name=main, freeze_panes=(1, 1))

for name, view in views.items():
if view is None:
continue
df, tview = self.view(view, return_view_def=True, verbose=max(verbose - 1, 0))
if tview is None:
continue
memory = df.memory_usage(deep=True).sum()
if verbose:
print(
Expand Down Expand Up @@ -1654,10 +1658,12 @@ def unbiased_export(df):

def view(
self,
view_def: Union[str, CubeViewDef],
view_def: Optional[Union[str, CubeViewDef]],
return_view_def: bool = False,
verbose: int = 0,
) -> Union[pandas.DataFrame, Tuple[pandas.DataFrame, CubeViewDef]]:
) -> Union[
Optional[pandas.DataFrame], Tuple[Optional[pandas.DataFrame], Optional[CubeViewDef]]
]:
"""
Returns a dataframe, a pivot view.

Expand All @@ -1666,18 +1672,22 @@ def view(
:param view_def: view definition or a string
:param return_view_def: returns the view definition as well
:param verbose: verbosity level
:return: dataframe
:return: dataframe or a couple (dataframe, view definition),
both of them can be one if view_def cannot be interpreted
"""
assert view_def is not None, "view_def is None, this is not allowed."
if isinstance(view_def, str):
view_def = self.make_view_def(view_def)
if view_def is None:
return (None, None) if return_view_def else None
return super().view(view_def, return_view_def=return_view_def, verbose=verbose)

def make_view_def(self, name: str) -> CubeViewDef:
def make_view_def(self, name: str) -> Optional[CubeViewDef]:
"""
Returns a view definition.

:param name: name of the view
:return: a CubeViewDef
:return: a CubeViewDef or None if name does not make sense

Available views:

Expand Down Expand Up @@ -1892,14 +1902,6 @@ def mean_geo(gr):
f_highlight=f_bucket,
order=order,
),
"cmd": lambda: CubeViewDef(
key_index=index_cols,
values=self._filter_column(["CMD"], self.values),
ignore_unique=True,
keep_columns_in_index=["suite"],
name="cmd",
order=order,
),
"onnx": lambda: CubeViewDef(
key_index=index_cols,
values=self._filter_column(
Expand Down Expand Up @@ -1927,11 +1929,25 @@ def mean_geo(gr):
no_index=True,
),
}
assert name in implemented_views, (

cmd_col = self._filter_column(["CMD"], self.values, can_be_empty=True)
if cmd_col:
implemented_views["cmd"] = lambda: CubeViewDef(
key_index=index_cols,
values=cmd_col,
ignore_unique=True,
keep_columns_in_index=["suite"],
name="cmd",
order=order,
)

assert name in implemented_views or name in {"cmd"}, (
f"Unknown view {name!r}, expected a name in {sorted(implemented_views)},"
f"\n--\nkeys={pprint.pformat(sorted(self.keys_time))}, "
f"\n--\nvalues={pprint.pformat(sorted(self.values))}"
)
if name not in implemented_views:
return None
return implemented_views[name]()

def post_load_process_piece(
Expand Down
Loading