Merge pull request #466 from Xilinx/jrickert.backport

Do not assert if an node with subgraph does not implement HasOnnxSubgraphOpInterface

Author: jorickert

src/Builder/FrontendDialectTransformer.cpp

@@ -911,9 +911,18 @@ class FrontendGenImpl {
     for (const auto &attr : node.attribute()) {
       if (attr.type() == onnx::AttributeProto_AttributeType_GRAPH) {
         OperationName opName = op->getName();
-        assert(opName.hasInterface<HasOnnxSubgraphOpInterface>() &&
-               "Op contains subgraph attributes but does not "
-               "implement HasOnnxSubgraphOpInterface interface.");
+        if (!opName.hasInterface<HasOnnxSubgraphOpInterface>()) {
+          llvm::errs() << "\nWarning: Node " << op
+                       << " contains subgraph attributes but does not "
+                          "implement HasOnnxSubgraphOpInterface interface. The "
+                          "subgraph will be dropped.\n";
+          if constexpr (!std::is_same_v<T, ONNXCustomOp>) {
+            assert(false && "Not-custom ops must implement "
+                            "HasOnnxSubgraphOpInterface if they have "
+                            "subgraph attributes.");
+          }
+          continue;
+        }
         auto opWithSubgraph =
             mlir::cast<HasOnnxSubgraphOpInterface>(op.getOperation());
         auto regionIdx = opWithSubgraph.getSubgraphRegionIdx(attr.name());

test/mlir/onnx/parse/custom_with_body.json

@@ -0,0 +1,75 @@
+// RUN: onnx-mlir --EmitONNXIR --useOnnxModelTypes=false --printIR %s > output.txt 2>&1; cat output.txt | FileCheck %s
+// CHECK: Warning: Node %0 = "onnx.Custom"(%arg0) {domain_name = "my.custom", function_name = "Super", onnx_node_name = "mySuperOp"} : (tensor<1x64x112x112xbf16>) -> tensor<*xbf16> contains subgraph attributes but does not implement HasOnnxSubgraphOpInterface interface. The subgraph will be dropped.
+// CHECK-LABEL:  func.func @main_graph
+// CHECK-SAME:   ([[PARAM_0_:%.+]]: tensor<1x64x112x112xbf16> {onnx.name = "myInput"}) -> (tensor<*xbf16> {onnx.name = "output0"}) {
+// CHECK:           [[VAR_0_:%.+]] = "onnx.Custom"([[PARAM_0_]]) {domain_name = "my.custom", function_name = "Super", onnx_node_name = "mySuperOp"} : (tensor<1x64x112x112xbf16>) -> tensor<*xbf16>
+// CHECK:           return [[VAR_0_]] : tensor<*xbf16>
+// CHECK:         }
+{
+  "irVersion": "8",
+  "producerName": "handwritten",
+  "producerVersion": "1.0",
+  "graph": {
+    "node": [
+      {
+        "input": [
+          "myInput"
+        ],
+        "output": [
+          "output0"
+        ],
+        "name": "mySuperOp",
+        "opType": "Super",
+        "domain": "my.custom",
+        "attribute": [
+          {
+            "name": "body",
+            "type": "GRAPH"
+          }
+        ]
+      }
+    ],
+    "name": "main_graph",
+    "input": [
+      {
+        "name": "myInput",
+        "type": {
+          "tensorType": {
+            "elemType": 16,
+            "shape": {
+              "dim": [
+                {
+                  "dimValue": "1"
+                },
+                {
+                  "dimValue": "64"
+                },
+                {
+                  "dimValue": "112"
+                },
+                {
+                  "dimValue": "112"
+                }
+              ]
+            }
+          }
+        }
+      }
+    ],
+    "output": [
+      {
+        "name": "output0",
+        "type": {
+          "tensorType": {
+            "elemType": 16
+          }
+        }
+      }
+    ]
+  },
+  "opsetImport": [
+    {
+      "version": "17"
+    }
+  ]
+}