Fixed output schema of OnnxTransformer (#4849)

* Fixed output schema of OnnxTransformer * Fixed column names of other failing tests * Fixed bad change in TextNormalizingOnnxConversionTest * Removed obsolete comments and fixed pipeline based on CR comments
dotnet · Feb 19, 2020 · 051ff17 · 051ff17
1 parent 9f27612
commit 051ff17
Show file tree

Hide file tree

Showing 23 changed files with 273 additions and 305 deletions.
diff --git a/src/Microsoft.ML.OnnxConverter/SaveOnnxCommand.cs b/src/Microsoft.ML.OnnxConverter/SaveOnnxCommand.cs
@@ -201,7 +201,7 @@ internal static ModelProto ConvertTransformListToOnnxModel(OnnxContextImpl ctx,
                 ch.Check(variableName != null, "The targeted pipeline can not be fully converted into a well-defined ONNX model. " +
                     "Please check if all steps in that pipeline are convertible to ONNX " +
                     "and all necessary variables are not dropped (via command line arguments).");
-                var trueVariableName = ctx.AddIntermediateVariable(null, idataviewColumnName + ".onnx", true);
+                var trueVariableName = ctx.AddIntermediateVariable(null, idataviewColumnName + ".output", true);
                 ctx.CreateNode("Identity", variableName, trueVariableName, ctx.GetNodeName("Identity"), "");
                 ctx.AddOutputVariable(outputData.Schema[i].Type, trueVariableName);
             }

diff --git a/src/Microsoft.ML.OnnxTransformer/OnnxTransform.cs b/src/Microsoft.ML.OnnxTransformer/OnnxTransform.cs
@@ -410,9 +410,14 @@ public Mapper(OnnxTransformer parent, DataViewSchema inputSchema) :
 
             protected override DataViewSchema.DetachedColumn[] GetOutputColumnsCore()
             {
+                var stdSuffix = ".output";
                 var info = new DataViewSchema.DetachedColumn[_parent.Outputs.Length];
                 for (int i = 0; i < _parent.Outputs.Length; i++)
-                    info[i] = new DataViewSchema.DetachedColumn(_parent.Outputs[i], _parent.OutputTypes[i], null);
+                {
+                    var onnxOutputName = _parent.Outputs[i];
+                    var columnName = onnxOutputName.EndsWith(stdSuffix) ? onnxOutputName.Replace(stdSuffix, "") : onnxOutputName;
+                    info[i] = new DataViewSchema.DetachedColumn(columnName, _parent.OutputTypes[i], null);
+                }
                 return info;
             }
 

diff --git a/...Output/Common/Onnx/BinaryClassification/BreastCancer/ExcludeVariablesInOnnxConversion.txt b/...Output/Common/Onnx/BinaryClassification/BreastCancer/ExcludeVariablesInOnnxConversion.txt
@@ -450,7 +450,7 @@
           "PredictedLabel"
         ],
         "output": [
-          "PredictedLabel.onnx"
+          "PredictedLabel.output"
         ],
         "name": "Identity",
         "opType": "Identity"
@@ -460,7 +460,7 @@
           "Score"
         ],
         "output": [
-          "Score.onnx"
+          "Score.output"
         ],
         "name": "Identity0",
         "opType": "Identity"
@@ -470,7 +470,7 @@
           "Probability"
         ],
         "output": [
-          "Probability.onnx"
+          "Probability.output"
         ],
         "name": "Identity1",
         "opType": "Identity"
@@ -533,7 +533,7 @@
     ],
     "output": [
       {
-        "name": "PredictedLabel.onnx",
+        "name": "PredictedLabel.output",
         "type": {
           "tensorType": {
             "elemType": 9,
@@ -551,7 +551,7 @@
         }
       },
       {
-        "name": "Score.onnx",
+        "name": "Score.output",
         "type": {
           "tensorType": {
             "elemType": 1,
@@ -569,7 +569,7 @@
         }
       },
       {
-        "name": "Probability.onnx",
+        "name": "Probability.output",
         "type": {
           "tensorType": {
             "elemType": 1,

diff --git a/...Onnx/BinaryClassification/BreastCancer/LightGbmBinaryClassificationOnnxConversionTest.txt b/...Onnx/BinaryClassification/BreastCancer/LightGbmBinaryClassificationOnnxConversionTest.txt
@@ -360,7 +360,7 @@
           "FeatureVector0"
         ],
         "output": [
-          "FeatureVector.onnx"
+          "FeatureVector.output"
         ],
         "name": "Identity",
         "opType": "Identity"
@@ -370,7 +370,7 @@
           "Target"
         ],
         "output": [
-          "Target.onnx"
+          "Target.output"
         ],
         "name": "Identity0",
         "opType": "Identity"
@@ -380,7 +380,7 @@
           "Score"
         ],
         "output": [
-          "Score.onnx"
+          "Score.output"
         ],
         "name": "Identity1",
         "opType": "Identity"
@@ -427,7 +427,7 @@
     ],
     "output": [
       {
-        "name": "FeatureVector.onnx",
+        "name": "FeatureVector.output",
         "type": {
           "tensorType": {
             "elemType": 1,
@@ -445,7 +445,7 @@
         }
       },
       {
-        "name": "Target.onnx",
+        "name": "Target.output",
         "type": {
           "tensorType": {
             "elemType": 1,
@@ -463,7 +463,7 @@
         }
       },
       {
-        "name": "Score.onnx",
+        "name": "Score.output",
         "type": {
           "tensorType": {
             "elemType": 1,

diff --git a/...t/Common/Onnx/BinaryClassification/BreastCancer/LogisticRegressionSaveModelToOnnxTest.txt b/...t/Common/Onnx/BinaryClassification/BreastCancer/LogisticRegressionSaveModelToOnnxTest.txt
@@ -104,7 +104,7 @@
           "FeatureVector0"
         ],
         "output": [
-          "FeatureVector.onnx"
+          "FeatureVector.output"
         ],
         "name": "Identity",
         "opType": "Identity"
@@ -114,7 +114,7 @@
           "Target"
         ],
         "output": [
-          "Target.onnx"
+          "Target.output"
         ],
         "name": "Identity0",
         "opType": "Identity"
@@ -124,7 +124,7 @@
           "Score"
         ],
         "output": [
-          "Score.onnx"
+          "Score.output"
         ],
         "name": "Identity1",
         "opType": "Identity"
@@ -171,7 +171,7 @@
     ],
     "output": [
       {
-        "name": "FeatureVector.onnx",
+        "name": "FeatureVector.output",
         "type": {
           "tensorType": {
             "elemType": 1,
@@ -189,7 +189,7 @@
         }
       },
       {
-        "name": "Target.onnx",
+        "name": "Target.output",
         "type": {
           "tensorType": {
             "elemType": 1,
@@ -207,7 +207,7 @@
         }
       },
       {
-        "name": "Score.onnx",
+        "name": "Score.output",
         "type": {
           "tensorType": {
             "elemType": 1,

diff --git a/test/BaselineOutput/Common/Onnx/BinaryClassification/BreastCancer/ModelWithLessIO.txt b/test/BaselineOutput/Common/Onnx/BinaryClassification/BreastCancer/ModelWithLessIO.txt
@@ -677,27 +677,27 @@
             "floats": [
               -0.9850374,
               -1,
-              -0.428571433,
+              -0.42857143,
               0.05882353,
               0.9655172,
-              0.478260875,
-              7.006492E-45,
+              0.47826087,
+              7E-45,
               0.9354839,
               -0.837172,
-              -0.896625638,
+              -0.89662564,
               -0.3455931,
-              0.223126009,
+              0.22312601,
               0.8040303,
               0.60825175,
               -0.06932944,
-              -0.402043074,
+              -0.40204307,
               -0.7417274,
-              -0.408434927,
+              -0.40843493,
               0.7105746,
               0.1875386,
               0.7631735,
-              0.706173241,
-              0.625906467,
+              0.70617324,
+              0.62590647,
               -0.35968104
             ],
             "type": "FLOATS"
@@ -776,7 +776,7 @@
           "PredictedLabel"
         ],
         "output": [
-          "PredictedLabel.onnx"
+          "PredictedLabel.output"
         ],
         "name": "Identity",
         "opType": "Identity"
@@ -786,7 +786,7 @@
           "Score"
         ],
         "output": [
-          "Score.onnx"
+          "Score.output"
         ],
         "name": "Identity0",
         "opType": "Identity"
@@ -796,7 +796,7 @@
           "Probability"
         ],
         "output": [
-          "Probability.onnx"
+          "Probability.output"
         ],
         "name": "Identity1",
         "opType": "Identity"
@@ -859,7 +859,7 @@
     ],
     "output": [
       {
-        "name": "PredictedLabel.onnx",
+        "name": "PredictedLabel.output",
         "type": {
           "tensorType": {
             "elemType": 9,
@@ -877,7 +877,7 @@
         }
       },
       {
-        "name": "Score.onnx",
+        "name": "Score.output",
         "type": {
           "tensorType": {
             "elemType": 1,
@@ -895,7 +895,7 @@
         }
       },
       {
-        "name": "Probability.onnx",
+        "name": "Probability.output",
         "type": {
           "tensorType": {
             "elemType": 1,