updtae string_diff

Author: xadupre

CHANGELOGS.rst

@@ -4,6 +4,7 @@ Change Logs
 0.5.0
 +++++
 
+* :pr:`92`: support errors distribution in max_diff
 * :pr:`91`: enable strings in ``guess_dynamic_shapes``
 * :pr:`88`, :pr:`89`: extends ``steal_forward`` to dump input, outputs in onnx models
 * :pr:`83`, :pr:`85`: improves the automated rewriting of control flow (test)

_unittests/ut_helpers/test_helper.py

@@ -229,6 +229,23 @@ def test_max_diff_hist_array(self):
             },
         )
 
+    def test_max_diff_hist_array_string_diff(self):
+        x = np.arange(12).reshape((3, 4)).astype(dtype=np.float32)
+        y = x.copy()
+        y[0, 1] += 0.1
+        y[0, 2] += 0.01
+        y[0, 3] += 0.001
+        y[1, 1] += 0.0001
+        y[1, 2] += 1
+        y[2, 2] += 10
+        y[1, 3] += 100
+        y[2, 1] += 1000
+        diff = max_diff(x, y, hist=True)
+        s = string_diff(diff)
+        self.assertEndsWith(
+            "/#8>0.0-#8>0.0001-#6>0.001-#5>0.01-#5>0.1-#3>1.0-#2>10.0-#1>100.0", s
+        )
+
     def test_max_diff_hist_tensor(self):
         x = torch.arange(12).reshape((3, 4)).to(dtype=torch.float32)
         y = x.clone()

onnx_diagnostic/ext_test_case.py

@@ -1070,6 +1070,11 @@ def assertStartsWith(self, prefix: str, full: str):
         if not full.startswith(prefix):
             raise AssertionError(f"prefix={prefix!r} does not start string  {full!r}.")
 
+    def assertEndsWith(self, suffix: str, full: str):
+        """In the name"""
+        if not full.endswith(suffix):
+            raise AssertionError(f"suffix={suffix!r} does not end string  {full!r}.")
+
     def capture(self, fct: Callable):
         """
         Runs a function and capture standard output and error.

onnx_diagnostic/helpers/helper.py

@@ -1458,10 +1458,20 @@ def max_diff(
 def string_diff(diff: Dict[str, Any]) -> str:
     """Renders discrepancies return by :func:`max_diff` into one string."""
     # dict(abs=, rel=, sum=, n=n_diff, dnan=)
+    suffix = ""
+    if "rep" in diff:
+        rows = []
+        for k, v in diff["rep"].items():
+            if v > 0:
+                rows.append(f"#{v}{k}")
+        suffix = "-".join(rows)
+        suffix = f"/{suffix}"
     if diff.get("dnan", None):
         if diff["abs"] == 0 or diff["rel"] == 0:
-            return f"abs={diff['abs']}, rel={diff['rel']}, dnan={diff['dnan']}"
-        return f"abs={diff['abs']}, rel={diff['rel']}, n={diff['n']}, dnan={diff['dnan']}"
+            return f"abs={diff['abs']}, rel={diff['rel']}, dnan={diff['dnan']}{suffix}"
+        return (
+            f"abs={diff['abs']}, rel={diff['rel']}, n={diff['n']}, dnan={diff['dnan']}{suffix}"
+        )
     if diff["abs"] == 0 or diff["rel"] == 0:
-        return f"abs={diff['abs']}, rel={diff['rel']}"
-    return f"abs={diff['abs']}, rel={diff['rel']}, n={diff['n']}"
+        return f"abs={diff['abs']}, rel={diff['rel']}{suffix}"
+    return f"abs={diff['abs']}, rel={diff['rel']}, n={diff['n']}{suffix}"