All examples working, on to writing tests. However, still need to fix sclblpy.run.

Author: MKaptein

examples/.temp.onnx

@@ -24,9 +24,11 @@
 sg1 = so.add_input(sg1, "large_image", "INT32", [450, 600, 3])  # Add the input
 
 # The resize node:
+e1 = so.constant("roi", np.array([]), "FLOAT")  # Note the empty fields for roi and scales.
+e2 = so.constant("scales", np.array([]), "FLOAT")
 c1 = so.constant("size", np.array([300, 400, 3]), "INT64")
-n1 = so.node("Resize", inputs=['large_image', '', '', 'size'], outputs=['small_image'])
-sg1 = so.add_nodes(sg1, [c1, n1])
+n1 = so.node("Resize", inputs=['large_image', 'roi', 'scales', 'size'], outputs=['small_image'])
+sg1 = so.add_nodes(sg1, [e1, e2, c1, n1])
 sg1 = so.add_output(sg1, "small_image", "INT32", [300, 400, 3])
 
 # Check and clean
@@ -67,6 +69,5 @@
     print("The container in the large image is filled.")
 
 # Store the merged graph
-# Todo(McK): Check this merged graph; it does not compile...
 g = so.graph_to_file(g, "onnx/check-container-resize.onnx")
 

examples/example_06.py

@@ -2,21 +2,17 @@
 import json
 import os
 import subprocess
-
 import onnxruntime as xrt
 from onnx import ModelProto as xmp
 from onnx import helper as xhelp
 from onnx import onnx_ml_pb2 as xpb2
 from onnx import save as xsave
 from onnx import numpy_helper as xnp
-
 import sclblonnx._globals as glob
-
-
-# empty_graph creates an empty graph
 from sclblonnx.utils import _print
 
 
+# empty_graph creates an empty graph
 def empty_graph(
         _default_name: str = "sclblgraph"):
     """ empty_graph returns an empty graph
@@ -32,7 +28,7 @@ def empty_graph(
     try:
         graph = xpb2.GraphProto(name=_default_name)
     except Exception as e:
-        print("Unable to create graph: " + str(e))
+        _print("Unable to create graph: " + str(e))
         return False
     return graph
 
@@ -58,7 +54,7 @@ def graph_from_file(
             mod_temp.ParseFromString(content)
         graph = mod_temp.graph
     except Exception as e:
-        print("Unable to open the file: " + str(e))
+        _print("Unable to open the file: " + str(e))
         return False
     return graph
 
@@ -81,11 +77,11 @@ def graph_to_file(
         True if successful, False otherwise.
     """
     if not filename:
-        print("Please specify a filename.")
+        _print("Unable to save: Please specify a filename.")
         return False
 
     if type(graph) is not xpb2.GraphProto:
-        print("graph is not an ONNX graph")
+        _print("Unable to save: Graph is not an ONNX graph")
 
     try:
         mod = xhelp.make_model(graph, producer_name=_producer)
@@ -122,20 +118,20 @@ def run(
 
     store = graph_to_file(graph, _tmpfile)
     if not store:
-        print("Unable to store model for evaluation.")
+        _print("Unable to store model for evaluation.")
         return False
 
     try:
         sess = xrt.InferenceSession(_tmpfile)
         out = sess.run(outputs, inputs)
     except Exception as e:
-        print("Failed to run the model: " + str(e))
+        _print("Failed to run the model: " + str(e))
         return False
 
     try:
         os.remove(_tmpfile)
     except Exception as e:
-        print("We were unable to delete the file " + _tmpfile)
+        print("We were unable to delete the file " + _tmpfile, "MSG")
 
     return out
 
@@ -162,7 +158,7 @@ def display(
         SclblONNXError
     """
     if type(graph) is not xpb2.GraphProto:
-        print("graph is not a valid ONNX graph.")
+        _print("graph is not a valid ONNX graph.")
         return False
 
     # store as tmpfile

examples/onnx/check-container-resize.onnx

@@ -0,0 +1,17 @@
+	sclblonnx:i
+$
+x1
+x2sumsclbl-onnx-node1"Add
+sclblgraphZ
+x1
+
+

+
Z
+x2
+
+

+
b
+sum
+
+

+
B

examples/onnx/resize-image-450x600-300x400.onnx

@@ -0,0 +1,17 @@
+	sclblonnx:i
+$
+x1
+x2sumsclbl-onnx-node1"Add
+sclblgraphZ
+x1
+
+

+
Z
+x2
+
+

+
b
+sum
+
+

+
B

examples/onnx/tf-keras-static.onnx

@@ -1,66 +1,49 @@
 import os
-import onnx
-import pytest
+import numpy as np
+from onnx import onnx_ml_pb2 as xpb2
+from sclblonnx import empty_graph, graph_from_file, graph_to_file, run
 
-from sclblonnx.main import display, graph_from_file, graph_to_file, check, clean
+
+def test_empty_graph():
+    g = empty_graph()
+    assert type(g) is xpb2.GraphProto, "Failed to create empty graph."
 
 
-# Test graph from file:
 def test_graph_from_file():
-    # Test non-existing file
-    g = graph_from_file('not_existing.onnx')
-    assert not g, "This should be false"
-    # Test existing file
-    g = graph_from_file("source/example01.onnx")
-    assert type(g) is onnx.onnx_ml_pb2.GraphProto
+    g = graph_from_file("files/non-existing-file.onnx")
+    assert not g, "Graph from file failed to check emtpy file."
+    g = graph_from_file("files/example01.onnx")
+    assert type(g) is xpb2.GraphProto, "Graph from file failed to open file."
 
 
-# Test graph storage:
 def test_graph_to_file():
-    # Test not a proper graph
-    with pytest.raises(SclblONNXError) as excinfo:
-        graph_to_file({}, 'name.onnx')
-    assert "valid ONNX graph" in str(excinfo.value)
-    # Test existing file
-    g = graph_from_file("source/example01.onnx")
-    result = graph_to_file(g, '_tmp.onnx')
-    assert result is True
-    # Remove the file
-    os.remove("_tmp.onnx")
-
-
-# Test alle examples in test/source
-def test_check():
-    dir = "files"
-    for fname in os.listdir(dir):
-        if fname.endswith(".onnx"):
-            print(fname)
-            fpath = dir + "/" + fname
-            g = graph_from_file(fpath)
-            check(g, False)
-
+    g = empty_graph()
+    check1 = graph_to_file(g, "")
+    assert not check1, "Graph to file failed should have failed."
+    check2 = graph_to_file(g, "files/test_graph_to_file.onnx")
+    assert check2, "Graph to file failed to write file."
+    os.remove("files/test_graph_to_file.onnx")
 
-# Functional test off all bits of the package:
-def test_functional():
-    # Open an existing graph:
-    g = graph_from_file("source/example07.onnx")
 
-    # Display the graph:
-    display(g)
+def test_run():
+    g = graph_from_file("files/add.onnx")
+    example = {"x1": np.array([2]).astype(np.float32), "x2": np.array([5]).astype(np.float32)}
+    result = run(g,
+                    inputs=example,
+                    outputs=["sum"]
+                    )
+    assert result[0] == 7, "Add output not correct."
+    result = run(g, inputs="", outputs="sum")
+    assert not result, "Model with this input should not run."
 
-    # Clean up:
-    g = clean(g, _optimize=True, _simplify=True, _check=False)
-    display(g)
 
+def test_display():
+    from onnx import TensorProto
+    print(TensorProto.DOUBLE)
 
-    # Check the graph:
-    #check(g)
-    #print(g)
+    return True  # No test for display
 
-#test_graph_from_file()
-#test_graph_to_file()
-#test_functional()
-#test_check()
 
-g = graph_from_file("source/example01.onnx")
-display(g)
+# def test_scblbl_input():
+# def test_list_data_types
+# def test_list_operators