fix names in to_dot

xadupre · xadupre · commit 1feac721b484 · 2024-03-01T14:48:10.000+01:00
diff --git a/_doc/api/plotting.rst b/_doc/api/plotting.rst
@@ -6,6 +6,8 @@ Dot
 
 .. autofunction:: onnx_array_api.plotting.dot_plot.to_dot
 
+.. autofunction:: onnx_array_api.plotting.graphviz_helper.plot_dot
+
 Statistics
 ++++++++++
 
diff --git a/onnx_array_api/plotting/dot_plot.py b/onnx_array_api/plotting/dot_plot.py
@@ -116,7 +116,12 @@ def myloss(x, y):
     clean_label_reg2 = re.compile("\\\\p\\{[0-9P]{1,6}\\}")
 
     def dot_name(text):
-        return text.replace("/", "_").replace(":", "__").replace(".", "_")
+        return (
+            text.replace("/", "_")
+            .replace(":", "__")
+            .replace(".", "_")
+            .replace("-", "_")
+        )
 
     def dot_label(text):
         if text is None:
diff --git a/onnx_array_api/plotting/graphviz_helper.py b/onnx_array_api/plotting/graphviz_helper.py
@@ -73,7 +73,7 @@ def _run_subprocess(
         shell=False,
         env=os.environ,
         stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
+        stderr=subprocess.PIPE,
     )
     raise_exception = False
     output = ""
@@ -91,12 +91,14 @@ def _run_subprocess(
             ):
                 raise_exception = True
     p.poll()
+    error = p.stderr.readline().decode(errors="ignore")
     p.stdout.close()
-    if raise_exception:
+    if error and raise_exception:
         raise RuntimeError(
-            "An error was found in the output. The build is stopped.\n{output}"
+            f"An error was found in the output. The build is stopped."
+            f"\n{output}\n---\n{error}"
         )
-    return output
+    return output + "\n" + error
 
 
 def _run_graphviz(filename: str, image: str, engine: str = "dot") -> str:
@@ -134,8 +136,12 @@ def _run_graphviz(filename: str, image: str, engine: str = "dot") -> str:
         exe = engine
     if os.path.exists(image):
         os.remove(image)
-    output = _run_subprocess([exe, f"-T{ext[1:]}", filename, "-o", image])
-    assert os.path.exists(image), f"Graphviz failed due to {output}"
+    cmd = [exe, f"-T{ext[1:]}", filename, "-o", image]
+    output = _run_subprocess(cmd)
+    assert os.path.exists(image), (
+        f"Unable to find {image!r}, command line is "
+        f"{' '.join(cmd)!r}, Graphviz failed due to\n{output}"
+    )
     return output
 
 
