Merge pull request #474 from Xilinx/jrickert.custom_types

Always try to take the element type from custom ops from the model, instead of guessing

Author: jorickert

src/Builder/FrontendDialectTransformer.cpp

@@ -848,23 +848,33 @@ class FrontendGenImpl {
     // Use the type map or types in input model to determine the data type of
     // output.
     std::vector<int> outputMap = T::getTypeMap();
+    const bool shouldTakeShapeFromModelForCustomOp =
+        isCustomOp &&
+        (options_.useOnnxModelTypesForCustomOps || givenOutputTypes.empty());
     for (unsigned int i = 0; i < (unsigned int)node.output().size(); i++) {
       // Optional outputs using empty string.
       if (node.output()[i].empty()) {
         outputTypes.emplace_back(builder_.getNoneType());
       } else {
-        if (options_.useOnnxModelTypes ||
-            (isCustomOp && options_.useOnnxModelTypesForCustomOps)) {
+        if (options_.useOnnxModelTypes || shouldTakeShapeFromModelForCustomOp) {
           auto onnxModelType = ConvertOnnxType(node.output(i), errorMessage);
           if (onnxModelType) {
             const auto ec = onnxModelType->getError();
             if (!ec) {
-              outputTypes.emplace_back(*onnxModelType.value());
+              Type outputType = *onnxModelType.value();
+              if (!options_.useOnnxModelTypesForCustomOps &&
+                  !options_.useOnnxModelTypes) {
+                if (auto shapedType = mlir::dyn_cast<ShapedType>(outputType)) {
+                  Type elementType = shapedType.getElementType();
+                  outputType = UnrankedTensorType::get(elementType);
+                }
+              }
+              outputTypes.emplace_back(outputType);
               continue;
             }
             if (!options_.allowMissingOutputTypes || ec != InvalidOnnxFormat) {
               errorMessage +=
-                  "Failed to get type for '" + node.output(i) + "\n";
+                  "Failed to get type for '" + node.output(i) + "'\n";
               return ec;
             }
             llvm::errs() << "Warning: "
@@ -874,13 +884,19 @@ class FrontendGenImpl {
         }
         unsigned int j = i;
         // Variadic output is a single ODS result.
-        if (variadicOut)
+        if (variadicOut) {
           j = 0;
+        }
         if (!givenOutputTypes.empty()) {
+          assert(givenOutputTypes.size() > i &&
+                 "givenOutputTypes size is less than number of outputs");
           outputTypes.emplace_back(
               UnrankedTensorType::get(givenOutputTypes[i]));
         } else if (j < outputMap.size() && outputMap[j] >= MAX_NUM_TYPES) {
           // Mapping gives a connection with an input.
+          assert(
+              outputMap[j] - MAX_NUM_TYPES < static_cast<int>(inputs.size()) &&
+              "output type mapping to input is out of range");
           Type inputType = inputs[outputMap[j] - MAX_NUM_TYPES].getType();
           if (mlir::isa<TensorType>(inputType)) {
             Type elementType =
@@ -1570,10 +1586,9 @@ class FrontendGenImpl {
     auto domainAttr = builder_.getNamedAttr(
         "domain_name", builder_.getStringAttr(node.domain()));
     attributes.push_back(domainAttr);
-    int nIn = 0;
-    int nOut = 0;
+    const int nIn = ONNXCustomOp::getNumberOfOperands();
+    const int nOut = ONNXCustomOp::getNumberOfResults();
     getNodeInputs(node, inputs);
-    nOut = node.output().size();
     std::vector<Type> givenOutputTypes;
 
     // We lack a way of specifying import behavior for custom domains. For now

test/mlir/onnx/parse/add_missing_output_types.json

@@ -4,7 +4,7 @@
 
 // FAILURE: Could not successfully parse ONNX file
 // FAILURE: ONNX type with id: 0 is not a valid type
-// FAILURE: Failed to import output type for
+// FAILURE: Failed to get type for 'output_c'
 // FAILURE: Failed to import main graph, could not get its function type
 
 // RUN: onnx-mlir --EmitONNXIR --useOnnxModelTypes=false --useOnnxModelTypesForCustomOps=false --allowMissingOutputTypes=true --printIR %s  | FileCheck --check-prefix=INFERRED %s

test/mlir/onnx/parse/custom_multiple_results.onnxtext

@@ -0,0 +1,22 @@
+// RUN: onnx-mlir --EmitONNXIR --useOnnxModelTypes=false --useOnnxModelTypesForCustomOps=false --printIR %s  | FileCheck %s
+<
+    ir_version: 10,
+    opset_import: ["" : 17, "com.test" : 1000]
+>
+test_custom (float[1,3,800,800] input) => (float[1,625,256] out)
+<float input_scale =  {0.015625}, uint8 input_zero_point =  {128}, float dq_scale =  {0.5}, uint8 dq_zero_point =  {128}, uint8[1,3,800,800] quant_linear, uint8[625,256] customop_res1, uint8[1,625,256] customop_res2> {
+    quant_linear = QuantizeLinear <axis: int = 1> (input, input_scale, input_zero_point)
+    customop_res1, customop_res2 = com.test.super_layer <body: string = "subgraph"> (quant_linear)
+    out = DequantizeLinear <axis: int = 1> (customop_res2, dq_scale, dq_zero_point)
+}
+// CHECK-LABEL:  func.func 
+// CHECK-SAME:   ([[PARAM_0_:%.+]]: tensor<1x3x800x800xf32> {onnx.name = "input"}) -> (tensor<1x625x256xf32> {onnx.name = "out"}) {
+// CHECK-DAG:       [[VAR_0_:%.+]] = onnx.Constant dense<1.562500e-02> : tensor<f32>
+// CHECK-DAG:       [[VAR_1_:%.+]] = onnx.Constant dense<128> : tensor<ui8>
+// CHECK-DAG:       [[VAR_2_:%.+]] = onnx.Constant dense<5.000000e-01> : tensor<f32>
+// CHECK-DAG:       [[VAR_3_:%.+]] = onnx.Constant dense<128> : tensor<ui8>
+// CHECK:           [[VAR_4_:%.+]] = "onnx.QuantizeLinear"([[PARAM_0_]], [[VAR_0_]], [[VAR_1_]]) {axis = 1 : si64, block_size = 0 : si64, onnx_node_name = "onnx.QuantizeLinear_0", output_dtype = 0 : si64, saturate = 1 : si64} : (tensor<1x3x800x800xf32>, tensor<f32>, tensor<ui8>) -> tensor<1x3x800x800xui8>
+// CHECK:           [[VAR_5_:%.+]]:2 = "onnx.Custom"([[VAR_4_]]) {body = "subgraph", domain_name = "com.test", function_name = "super_layer", onnx_node_name = "onnx.Custom_1"} : (tensor<1x3x800x800xui8>) -> (tensor<*xui8>, tensor<*xui8>)
+// CHECK:           [[VAR_6_:%.+]] = "onnx.DequantizeLinear"([[VAR_5_]]#1, [[VAR_2_]], [[VAR_3_]]) {axis = 1 : si64, block_size = 0 : si64, onnx_node_name = "onnx.DequantizeLinear_2"} : (tensor<*xui8>, tensor<f32>, tensor<ui8>) -> tensor<1x625x256xf32>
+// CHECK:           return [[VAR_6_]] : tensor<1x625x256xf32>
+// CHECK:         }