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
2 changes: 1 addition & 1 deletion CHANGELOGS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Change Logs
0.6.1
+++++

* :pr:`115`, :pr:`116`, :pr:`117`: first steps for TorchEvaluator
* :pr:`115`, :pr:`116`, :pr:`117`, :pr:`118`: first steps for TorchOnnxEvaluator
* :pr:`114`: extends the list of known rewritings
* :pr:`113`: fixes a couple of issues with ModelBuilder

Expand Down
6 changes: 3 additions & 3 deletions _doc/api/reference/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ OnnxruntimeEvaluator
.. autoclass:: onnx_diagnostic.reference.OnnxruntimeEvaluator
:members:

TorchEvaluator
++++++++++++++
TorchOnnxEvaluator
++++++++++++++++++

.. autoclass:: onnx_diagnostic.reference.TorchEvaluator
.. autoclass:: onnx_diagnostic.reference.TorchOnnxEvaluator
:members:

Other functions
Expand Down
2 changes: 1 addition & 1 deletion _doc/api/reference/torch_evaluator.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ onnx_diagnostic.reference.torch_evaluator
.. automodule:: onnx_diagnostic.reference.torch_evaluator
:members:
:no-undoc-members:
:exclude-members: TorchEvaluator
:exclude-members: TorchOnnxEvaluator
12 changes: 6 additions & 6 deletions _unittests/ut_reference/test_torch_evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
import onnx.numpy_helper as onh
import torch
from onnx_diagnostic.ext_test_case import ExtTestCase
from onnx_diagnostic.reference import ExtendedReferenceEvaluator, TorchEvaluator
from onnx_diagnostic.reference import ExtendedReferenceEvaluator, TorchOnnxEvaluator
from onnx_diagnostic.reference.torch_evaluator import get_kernels


TFLOAT = onnx.TensorProto.FLOAT
TINT64 = onnx.TensorProto.INT64


class TestTorchEvaluator(ExtTestCase):
class TestTorchOnnxEvaluator(ExtTestCase):
def test_kernels(self):
ker = get_kernels()
self.assertIsInstance(ker, dict)
Expand All @@ -36,7 +36,7 @@ def _finalize_test(self, model, *args, atol: float = 0, use_ort: bool = False):
expected = sess.run(None, feeds_numpy)
else:
expected = ExtendedReferenceEvaluator(model).run(None, feeds_numpy)
rt = TorchEvaluator(model)
rt = TorchOnnxEvaluator(model)
got = rt.run(None, feeds)
self.assertEqualAny(expected, [g.detach().numpy() for g in got], atol=atol)

Expand Down Expand Up @@ -68,7 +68,7 @@ def test_op_binary(self):
)
onnx.checker.check_model(model)

rt = TorchEvaluator(model)
rt = TorchOnnxEvaluator(model)
self.assertEqual(5, len(rt.kernels))
self.assertEqual(2, len(rt.constants))

Expand Down Expand Up @@ -144,7 +144,7 @@ def test_op_slice_squeeze(self):
expected = ExtendedReferenceEvaluator(model).run(
None, {k: v.numpy() for k, v in feeds.items()}
)
rt = TorchEvaluator(model)
rt = TorchOnnxEvaluator(model)
got = rt.run(None, feeds)
self.assertEqualAny(expected, [g.detach().numpy() for g in got])

Expand All @@ -171,7 +171,7 @@ def test_op_shape(self):
expected = ExtendedReferenceEvaluator(model).run(
None, {k: v.numpy() for k, v in feeds.items()}
)
rt = TorchEvaluator(model)
rt = TorchOnnxEvaluator(model)
got = rt.run(None, feeds)
self.assertEqualAny(expected, [g.detach().numpy() for g in got])

Expand Down
2 changes: 1 addition & 1 deletion onnx_diagnostic/reference/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .evaluator import ExtendedReferenceEvaluator
from .ort_evaluator import OnnxruntimeEvaluator
from .torch_evaluator import TorchEvaluator
from .torch_evaluator import TorchOnnxEvaluator
2 changes: 1 addition & 1 deletion onnx_diagnostic/reference/torch_evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def get_kernels() -> Dict[Tuple[str, str, int], type[torch_ops.OpRun]]:
return res


class TorchEvaluator:
class TorchOnnxEvaluator:
"""
Torch evaluator for onnx models.
The model does not stores the original proto it evaluates to avoid
Expand Down
Loading