Save ConvertTransform as ONNX Operator and Control the Use of Experimental Features with a Flag (#947)

wschin · web-flow · commit 5684398e359e · 2018-10-09T17:54:54.000-07:00
* Some changes for adding experimental conversion to ONNX
1. Introduce a new argument to SaveOnnx, which is OnnxVersion.
   Two values are currently allowed, "Latest" and "Experimental".
   Note that "Latest" means that the produced ONNX model meets
   the latest ONNX release while "Experimental" may produce
   things not officially supported in ONNX.
2. For (1), the interface of saving ONNX is slightly changed. Now,
   CanSaveOnnx requires an OnnxContext as its input argument.
3. Add exporter for ConvertTransform. It doesn't use standard
   ONNX operator.

* Update CSharpAPI and entry point

* Address one comment

* Update old APIs to reflect enum's change

* Extend doc string for targeted version

* Address comments

* Update API
diff --git a/src/Microsoft.ML.Data/DataView/RowToRowMapperTransform.cs b/src/Microsoft.ML.Data/DataView/RowToRowMapperTransform.cs
@@ -247,7 +247,7 @@ private static VersionInfo GetVersionInfo()
 
         public override ISchema Schema { get { return _bindings; } }
 
-        public bool CanSaveOnnx => _mapper is ICanSaveOnnx onnxMapper ? onnxMapper.CanSaveOnnx : false;
+        public bool CanSaveOnnx(OnnxContext ctx) => _mapper is ICanSaveOnnx onnxMapper ? onnxMapper.CanSaveOnnx(ctx) : false;
 
         public bool CanSavePfa => _mapper is ICanSavePfa pfaMapper ? pfaMapper.CanSavePfa : false;
 
@@ -339,7 +339,7 @@ public void SaveAsOnnx(OnnxContext ctx)
             Host.CheckValue(ctx, nameof(ctx));
             if (_mapper is ISaveAsOnnx onnx)
             {
-                Host.Check(onnx.CanSaveOnnx, "Cannot be saved as ONNX.");
+                Host.Check(onnx.CanSaveOnnx(ctx), "Cannot be saved as ONNX.");
                 onnx.SaveAsOnnx(ctx);
             }
         }
diff --git a/src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs b/src/Microsoft.ML.Data/Model/Onnx/ICanSaveOnnx.cs
@@ -15,7 +15,7 @@ public interface ICanSaveOnnx
         /// only detectable during runtime that would prevent its being savable. (For example,
         /// it may wrap some other object that may or may not be savable.)
         /// </summary>
-        bool CanSaveOnnx { get; }
+        bool CanSaveOnnx(OnnxContext ctx);
     }
 
     /// <summary>
diff --git a/src/Microsoft.ML.Data/Model/Onnx/OnnxContext.cs b/src/Microsoft.ML.Data/Model/Onnx/OnnxContext.cs
@@ -7,6 +7,8 @@
 
 namespace Microsoft.ML.Runtime.Model.Onnx
 {
+    public enum OnnxVersion { Stable=0, Experimental=1 }
+
     /// <summary>
     /// A context for defining a ONNX output. The context internally contains the model-in-progress being built. This
     /// same context object is iteratively given to exportable components via the <see cref="ICanSaveOnnx"/> interface
@@ -99,6 +101,12 @@ public abstract OnnxNode CreateNode(string opType, IEnumerable<string> inputs,
         public OnnxNode CreateNode(string opType, string input, string output, string name, string domain = null)
             => CreateNode(opType, new[] { input }, new[] { output }, name, domain);
 
+        /// <summary>
+        /// Get the targeted ONNX version string. Only two values are allowed now: "Stable" and "Experimental".
+        /// </summary>
+        /// <returns></returns>
+        public abstract OnnxVersion GetOnnxVersion();
+
         /// <summary>
         /// Retrieve the shape of an ONNX variable. Returns null if no shape for the specified variable can be found.
         /// </summary>
diff --git a/src/Microsoft.ML.Data/Prediction/Calibrator.cs b/src/Microsoft.ML.Data/Prediction/Calibrator.cs
@@ -225,7 +225,7 @@ public abstract class ValueMapperCalibratedPredictorBase : CalibratedPredictorBa
         public ColumnType OutputType => _mapper.OutputType;
         public ColumnType DistType => NumberType.Float;
         public bool CanSavePfa => (_mapper as ICanSavePfa)?.CanSavePfa == true;
-        public bool CanSaveOnnx => (_mapper as ICanSaveOnnx)?.CanSaveOnnx == true;
+        public bool CanSaveOnnx(OnnxContext ctx) => (_mapper as ICanSaveOnnx)?.CanSaveOnnx(ctx) == true;
 
         protected ValueMapperCalibratedPredictorBase(IHostEnvironment env, string name, IPredictorProducing<Float> predictor, ICalibrator calibrator)
             : base(env, name, predictor, calibrator)
@@ -308,7 +308,7 @@ public bool SaveAsOnnx(OnnxContext ctx, string[] outputNames, string featureColu
                 return false;
 
             var calibrator = Calibrator as ISingleCanSaveOnnx;
-            if (!(calibrator?.CanSaveOnnx == true && calibrator.SaveAsOnnx(ctx, new[] { outputNames[1], outputNames[2] }, featureColumnName)))
+            if (!(calibrator?.CanSaveOnnx(ctx) == true && calibrator.SaveAsOnnx(ctx, new[] { outputNames[1], outputNames[2] }, featureColumnName)))
                 ctx.RemoveVariable(outputNames[1], true);
 
             return true;
@@ -622,7 +622,7 @@ private static VersionInfo GetVersionInfo()
         /// </summary>
         public bool CanSavePfa => (_bindable as ICanSavePfa)?.CanSavePfa == true;
 
-        public bool CanSaveOnnx => (_bindable as ICanSaveOnnx)?.CanSaveOnnx == true;
+        public bool CanSaveOnnx(OnnxContext ctx) => (_bindable as ICanSaveOnnx)?.CanSaveOnnx(ctx) == true;
 
         public SchemaBindableCalibratedPredictor(IHostEnvironment env, IPredictorProducing<Single> predictor, ICalibrator calibrator)
             : base(env, LoaderSignature, predictor, calibrator)
@@ -668,7 +668,7 @@ public bool SaveAsOnnx(OnnxContext ctx, RoleMappedSchema schema, string[] output
             Host.CheckValue(ctx, nameof(ctx));
             Host.CheckParam(Utils.Size(outputs) == 2, nameof(outputs), "Expected this to have two outputs");
             Host.CheckValue(schema, nameof(schema));
-            Host.Check(CanSaveOnnx, "Called despite not being savable");
+            Host.Check(CanSaveOnnx(ctx), "Called despite not being savable");
             return false;
         }
 
@@ -1349,7 +1349,7 @@ private static VersionInfo GetVersionInfo()
         public Double ParamA { get; }
         public Double ParamB { get; }
         public bool CanSavePfa => true;
-        public bool CanSaveOnnx => true;
+        public bool CanSaveOnnx(OnnxContext ctx) => true;
 
         public PlattCalibrator(IHostEnvironment env, Double paramA, Double paramB)
         {
diff --git a/src/Microsoft.ML.Data/Scorers/GenericScorer.cs b/src/Microsoft.ML.Data/Scorers/GenericScorer.cs
@@ -141,7 +141,7 @@ private static VersionInfo GetVersionInfo()
 
         public bool CanSavePfa => (Bindable as ICanSavePfa)?.CanSavePfa == true;
 
-        public bool CanSaveOnnx => (Bindable as ICanSaveOnnx)?.CanSaveOnnx == true;
+        public bool CanSaveOnnx(OnnxContext ctx) => (Bindable as ICanSaveOnnx)?.CanSaveOnnx(ctx) == true;
 
         /// <summary>
         /// The <see cref="SignatureDataScorer"/> entry point for creating a <see cref="GenericScorer"/>.
diff --git a/src/Microsoft.ML.Data/Scorers/MultiClassClassifierScorer.cs b/src/Microsoft.ML.Data/Scorers/MultiClassClassifierScorer.cs
@@ -78,7 +78,7 @@ public sealed class LabelNameBindableMapper : ISchemaBindableMapper, ICanSaveMod
 
             public VectorType Type => _type;
             public bool CanSavePfa => (_bindable as ICanSavePfa)?.CanSavePfa == true;
-            public bool CanSaveOnnx => (_bindable as ICanSaveOnnx)?.CanSaveOnnx == true;
+            public bool CanSaveOnnx(OnnxContext ctx) => (_bindable as ICanSaveOnnx)?.CanSaveOnnx(ctx) == true;
             public ISchemaBindableMapper InnerBindable => _bindable;
 
             private static VersionInfo GetVersionInfo()
@@ -209,7 +209,7 @@ public bool SaveAsOnnx(OnnxContext ctx, RoleMappedSchema schema, string[] output
             {
                 Contracts.CheckValue(ctx, nameof(ctx));
                 Contracts.CheckValue(schema, nameof(schema));
-                Contracts.Check(CanSaveOnnx, "Cannot be saved as ONNX.");
+                Contracts.Check(CanSaveOnnx(ctx), "Cannot be saved as ONNX.");
                 Contracts.Assert(_bindable is IBindableCanSaveOnnx);
                 return ((IBindableCanSaveOnnx)_bindable).SaveAsOnnx(ctx, schema, outputNames);
             }
diff --git a/src/Microsoft.ML.Data/Scorers/PredictedLabelScorerBase.cs b/src/Microsoft.ML.Data/Scorers/PredictedLabelScorerBase.cs
@@ -284,7 +284,7 @@ protected override BindingsBase GetBindings()
 
         public bool CanSavePfa => (Bindable as ICanSavePfa)?.CanSavePfa == true;
 
-        public bool CanSaveOnnx => (Bindable as ICanSaveOnnx)?.CanSaveOnnx == true;
+        public bool CanSaveOnnx(OnnxContext ctx) => (Bindable as ICanSaveOnnx)?.CanSaveOnnx(ctx) == true;
 
         protected PredictedLabelScorerBase(ScorerArgumentsBase args, IHostEnvironment env, IDataView data,
             ISchemaBoundMapper mapper, RoleMappedSchema trainSchema, string registrationName, string scoreColKind, string scoreColName,
diff --git a/src/Microsoft.ML.Data/Scorers/SchemaBindablePredictorWrapper.cs b/src/Microsoft.ML.Data/Scorers/SchemaBindablePredictorWrapper.cs
@@ -46,7 +46,7 @@ public abstract class SchemaBindablePredictorWrapperBase : ISchemaBindableMapper
 
         public bool CanSavePfa => (ValueMapper as ICanSavePfa)?.CanSavePfa == true;
 
-        public bool CanSaveOnnx => (ValueMapper as ICanSaveOnnx)?.CanSaveOnnx == true;
+        public bool CanSaveOnnx(OnnxContext ctx) => (ValueMapper as ICanSaveOnnx)?.CanSaveOnnx(ctx) == true;
 
         public SchemaBindablePredictorWrapperBase(IPredictor predictor)
         {
diff --git a/src/Microsoft.ML.Data/Transforms/ConcatTransform.cs b/src/Microsoft.ML.Data/Transforms/ConcatTransform.cs
@@ -431,7 +431,7 @@ private sealed class Mapper : IRowMapper, ISaveAsOnnx, ISaveAsPfa
             private readonly ConcatTransform _parent;
             private readonly BoundColumn[] _columns;
 
-            public bool CanSaveOnnx => true;
+            public bool CanSaveOnnx(OnnxContext ctx) => true;
             public bool CanSavePfa => true;
 
             public Mapper(ConcatTransform parent, ISchema inputSchema)
@@ -902,7 +902,7 @@ public void SaveAsPfa(BoundPfaContext ctx)
             public void SaveAsOnnx(OnnxContext ctx)
             {
                 _host.CheckValue(ctx, nameof(ctx));
-                Contracts.Assert(CanSaveOnnx);
+                Contracts.Assert(CanSaveOnnx(ctx));
 
                 string opType = "FeatureVectorizer";
                 for (int iinfo = 0; iinfo < _columns.Length; ++iinfo)
diff --git a/src/Microsoft.ML.Data/Transforms/ConvertTransform.cs b/src/Microsoft.ML.Data/Transforms/ConvertTransform.cs
@@ -16,6 +16,7 @@
 using Microsoft.ML.Runtime.Data.Conversion;
 using Microsoft.ML.Runtime.Internal.Utilities;
 using Microsoft.ML.Runtime.Model;
+using Microsoft.ML.Runtime.Model.Onnx;
 using Microsoft.ML.Runtime.Command;
 using Microsoft.ML.Runtime.EntryPoints;
 
@@ -375,6 +376,30 @@ public override void Save(ModelSaveContext ctx)
             }
         }
 
+        public override bool CanSaveOnnx(OnnxContext ctx) => ctx.GetOnnxVersion() == OnnxVersion.Experimental;
+
+        protected override bool SaveAsOnnxCore(OnnxContext ctx, int iinfo, ColInfo info, string srcVariableName, string dstVariableName)
+        {
+            var opType = "CSharp";
+
+            for (int i = 0; i < _exes.Length; i++)
+            {
+                var ex = _exes[i];
+                var node = ctx.CreateNode(opType, srcVariableName, dstVariableName, ctx.GetNodeName(opType));
+                node.AddAttribute("type", LoaderSignature);
+                node.AddAttribute("to", (byte)ex.Kind);
+                if (ex.HasKeyRange)
+                {
+                    var key = ex.TypeDst.ItemType.AsKey;
+                    node.AddAttribute("min", key.Min);
+                    node.AddAttribute("max", key.Count);
+                    node.AddAttribute("contiguous", key.Contiguous);
+                }
+            }
+
+            return true;
+        }
+
         private static bool TryCreateEx(IExceptionContext ectx, ColInfo info, DataKind kind, KeyRange range, out PrimitiveType itemType, out ColInfoEx ex)
         {
             ectx.AssertValue(info);
diff --git a/src/Microsoft.ML.Data/Transforms/KeyToVectorTransform.cs b/src/Microsoft.ML.Data/Transforms/KeyToVectorTransform.cs
@@ -605,7 +605,7 @@ private ValueGetter<VBuffer<float>> MakeGetterInd(IRow input, int iinfo)
                     };
             }
 
-            public bool CanSaveOnnx => true;
+            public bool CanSaveOnnx(OnnxContext ctx) => true;
 
             public bool CanSavePfa => true;
 
diff --git a/src/Microsoft.ML.Data/Transforms/NormalizeColumn.cs b/src/Microsoft.ML.Data/Transforms/NormalizeColumn.cs
@@ -384,7 +384,7 @@ private AffineColumnFunction(IHost host)
             public abstract void Save(ModelSaveContext ctx);
 
             public abstract JToken PfaInfo(BoundPfaContext ctx, JToken srcToken);
-            public bool CanSaveOnnx => true;
+            public bool CanSaveOnnx(OnnxContext ctx) => true;
             public abstract bool OnnxInfo(OnnxContext ctx, OnnxNode nodeProtoWrapper, int featureCount);
 
             public abstract Delegate GetGetter(IRow input, int icol);
@@ -503,7 +503,7 @@ public JToken PfaInfo(BoundPfaContext ctx, JToken srcToken)
                 return null;
             }
 
-            public bool CanSaveOnnx => false;
+            public bool CanSaveOnnx(OnnxContext ctx) => false;
 
             public bool OnnxInfo(OnnxContext ctx, OnnxNode nodeProtoWrapper, int featureCount)
                 => throw Host.ExceptNotSupp();
@@ -637,7 +637,7 @@ public JToken PfaInfo(BoundPfaContext ctx, JToken srcToken)
                 return null;
             }
 
-            public bool CanSaveOnnx => false;
+            public bool CanSaveOnnx(OnnxContext ctx) => false;
 
             public bool OnnxInfo(OnnxContext ctx, OnnxNode nodeProtoWrapper, int featureCount)
                 => throw Host.ExceptNotSupp();
diff --git a/src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs b/src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs
@@ -60,7 +60,7 @@ internal interface IColumnFunction : ICanSaveModel
 
         JToken PfaInfo(BoundPfaContext ctx, JToken srcToken);
 
-        bool CanSaveOnnx { get; }
+        bool CanSaveOnnx(OnnxContext ctx);
 
         bool OnnxInfo(OnnxContext ctx, OnnxNode nodeProtoWrapper, int featureCount);
     }
diff --git a/src/Microsoft.ML.Data/Transforms/Normalizer.cs b/src/Microsoft.ML.Data/Transforms/Normalizer.cs
@@ -453,7 +453,7 @@ private sealed class Mapper : MapperBase, ISaveAsOnnx, ISaveAsPfa
         {
             private NormalizerTransformer _parent;
 
-            public bool CanSaveOnnx => true;
+            public bool CanSaveOnnx(OnnxContext ctx) => true;
             public bool CanSavePfa => true;
 
             public Mapper(NormalizerTransformer parent, ISchema schema)
@@ -563,12 +563,12 @@ private bool SaveAsOnnxCore(OnnxContext ctx, int iinfo, ColumnInfo info, string
                 Contracts.AssertValue(ctx);
                 Contracts.Assert(0 <= iinfo && iinfo < _parent._columns.Length);
                 Contracts.Assert(_parent._columns[iinfo] == info);
-                Contracts.Assert(CanSaveOnnx);
+                Contracts.Assert(CanSaveOnnx(ctx));
 
                 if (info.InputType.ValueCount == 0)
                     return false;
 
-                if (info.ColumnFunction.CanSaveOnnx)
+                if (info.ColumnFunction.CanSaveOnnx(ctx))
                 {
                     string opType = "Scaler";
                     var node = ctx.CreateNode(opType, srcVariableName, dstVariableName, ctx.GetNodeName(opType));
diff --git a/src/Microsoft.ML.Data/Transforms/TermTransform.cs b/src/Microsoft.ML.Data/Transforms/TermTransform.cs
@@ -722,7 +722,7 @@ private sealed class Mapper : MapperBase, ISaveAsOnnx, ISaveAsPfa
 
             private readonly BoundTermMap[] _termMap;
 
-            public bool CanSaveOnnx => true;
+            public bool CanSaveOnnx(OnnxContext ctx) => true;
 
             public bool CanSavePfa => true;
 
diff --git a/src/Microsoft.ML.Data/Transforms/TransformBase.cs b/src/Microsoft.ML.Data/Transforms/TransformBase.cs
@@ -470,7 +470,7 @@ private sealed class ColumnTmp : OneToOneColumn
 
         public virtual bool CanSavePfa => false;
 
-        public virtual bool CanSaveOnnx => false;
+        public virtual bool CanSaveOnnx(OnnxContext ctx) => false;
 
         protected OneToOneTransformBase(IHostEnvironment env, string name, OneToOneColumn[] column,
             IDataView input, Func<ColumnType, string> testType)
@@ -575,7 +575,7 @@ public void SaveAsPfa(BoundPfaContext ctx)
         public void SaveAsOnnx(OnnxContext ctx)
         {
             Host.CheckValue(ctx, nameof(ctx));
-            Host.Assert(CanSaveOnnx);
+            Host.Assert(CanSaveOnnx(ctx));
 
             for (int iinfo = 0; iinfo < Infos.Length; ++iinfo)
             {
diff --git a/src/Microsoft.ML.FastTree/FastTree.cs b/src/Microsoft.ML.FastTree/FastTree.cs
@@ -2859,7 +2859,7 @@ public abstract class FastTreePredictionWrapper :
         public ColumnType InputType { get; }
         public ColumnType OutputType => NumberType.Float;
         public bool CanSavePfa => true;
-        public bool CanSaveOnnx => true;
+        public bool CanSaveOnnx(OnnxContext ctx) => true;
 
         protected FastTreePredictionWrapper(IHostEnvironment env, string name, Ensemble trainedEnsemble, int numFeatures, string innerArgs)
             : base(env, name)
diff --git a/src/Microsoft.ML.Legacy/CSharpApi.cs b/src/Microsoft.ML.Legacy/CSharpApi.cs
@@ -3362,6 +3362,12 @@ public OneVersusAllPipelineStep(Output output)
 
     namespace Legacy.Models
     {
+        public enum OnnxVersion
+        {
+            Stable = 0,
+            Experimental = 1
+        }
+
 
         /// <summary>
         /// Converts the model to ONNX format.
@@ -3405,6 +3411,11 @@ public sealed partial class OnnxConverter
             /// </summary>
             public Var<Microsoft.ML.Runtime.EntryPoints.ITransformModel> Model { get; set; } = new Var<Microsoft.ML.Runtime.EntryPoints.ITransformModel>();
 
+            /// <summary>
+            /// The targeted ONNX version. It can be either "Stable" or "Experimental". If "Experimental" is used, produced model can contain components that is not officially supported in ONNX standard.
+            /// </summary>
+            public OnnxVersion OnnxVersion { get; set; } = OnnxVersion.Stable;
+
             /// <summary>
             /// The data file
             /// </summary>
diff --git a/src/Microsoft.ML.Onnx/OnnxContextImpl.cs b/src/Microsoft.ML.Onnx/OnnxContextImpl.cs
@@ -32,9 +32,10 @@ internal sealed class OnnxContextImpl : OnnxContext
         private readonly string _domain;
         private readonly string _producerVersion;
         private readonly long _modelVersion;
+        private readonly OnnxVersion _onnxVersion;
 
         public OnnxContextImpl(IHostEnvironment env, string name, string producerName,
-            string producerVersion, long modelVersion, string domain)
+            string producerVersion, long modelVersion, string domain, OnnxVersion onnxVersion)
         {
             Contracts.CheckValue(env, nameof(env));
             _host = env.Register(nameof(OnnxContext));
@@ -54,6 +55,7 @@ public OnnxContextImpl(IHostEnvironment env, string name, string producerName,
             _producerVersion = producerVersion;
             _modelVersion = modelVersion;
             _domain = domain;
+            _onnxVersion = onnxVersion;
         }
 
         public override bool ContainsColumn(string colName) => _columnNameMap.ContainsKey(colName);
@@ -330,5 +332,11 @@ public override string AddInitializer(IEnumerable<string> values, IEnumerable<lo
         /// </summary>
         public ModelProto MakeModel()
             => OnnxUtils.MakeModel(_nodes, _producerName, _name, _domain, _producerVersion, _modelVersion, _inputs, _outputs, _intermediateValues, _initializers);
+
+        /// <summary>
+        /// Return either "Experimental" or "Stable". The string "Experimental" indicates that some experimental features which are
+        /// not officially supported in the official ONNX standard. Otherwise, only official ONNX features should be used.
+        /// </summary>
+        public override OnnxVersion GetOnnxVersion() => _onnxVersion;
     }
 }
diff --git a/src/Microsoft.ML.Onnx/OnnxUtils.cs b/src/Microsoft.ML.Onnx/OnnxUtils.cs
@@ -311,14 +311,39 @@ public static ModelArgs GetModelArgs(ColumnType type, string colName,
                 case DataKind.TX:
                     dataType = TensorProto.Types.DataType.String;
                     break;
+                case DataKind.I1:
+                    dataType = TensorProto.Types.DataType.Int8;
+                    break;
+                case DataKind.U1:
+                    dataType = TensorProto.Types.DataType.Uint8;
+                    break;
+                case DataKind.I2:
+                    dataType = TensorProto.Types.DataType.Int16;
+                    break;
+                case DataKind.U2:
+                    dataType = TensorProto.Types.DataType.Uint16;
+                    break;
+                case DataKind.I4:
+                    dataType = TensorProto.Types.DataType.Int32;
+                    break;
                 case DataKind.U4:
                     dataType = TensorProto.Types.DataType.Int64;
                     break;
+                case DataKind.I8:
+                    dataType = TensorProto.Types.DataType.Int64;
+                    break;
+                case DataKind.U8:
+                    dataType = TensorProto.Types.DataType.Uint64;
+                    break;
                 case DataKind.R4:
                     dataType = TensorProto.Types.DataType.Float;
                     break;
+                case DataKind.R8:
+                    dataType = TensorProto.Types.DataType.Double;
+                    break;
                 default:
-                    Contracts.Assert(false, "Unknown type.");
+                    string msg = "Unsupported type: DataKind " + rawKind.ToString();
+                    Contracts.Check(false, msg);
                     break;
             }
 
diff --git a/src/Microsoft.ML.Onnx/SaveOnnxCommand.cs b/src/Microsoft.ML.Onnx/SaveOnnxCommand.cs
diff --git a/src/Microsoft.ML.StandardLearners/Standard/LinearPredictor.cs b/src/Microsoft.ML.StandardLearners/Standard/LinearPredictor.cs
diff --git a/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/MulticlassLogisticRegression.cs b/src/Microsoft.ML.StandardLearners/Standard/LogisticRegression/MulticlassLogisticRegression.cs
diff --git a/src/Microsoft.ML.Transforms/NAReplaceTransform.cs b/src/Microsoft.ML.Transforms/NAReplaceTransform.cs
diff --git a/test/BaselineOutput/Common/EntryPoints/core_manifest.json b/test/BaselineOutput/Common/EntryPoints/core_manifest.json
diff --git a/test/Microsoft.ML.Tests/OnnxTests.cs b/test/Microsoft.ML.Tests/OnnxTests.cs

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ private static VersionInfo GetVersionInfo()`
`247`	`247`
`248`	`248`	`public override ISchema Schema { get { return _bindings; } }`
`249`	`249`
`250`		`- public bool CanSaveOnnx => _mapper is ICanSaveOnnx onnxMapper ? onnxMapper.CanSaveOnnx : false;`
	`250`	`+ public bool CanSaveOnnx(OnnxContext ctx) => _mapper is ICanSaveOnnx onnxMapper ? onnxMapper.CanSaveOnnx(ctx) : false;`
`251`	`251`
`252`	`252`	`public bool CanSavePfa => _mapper is ICanSavePfa pfaMapper ? pfaMapper.CanSavePfa : false;`
`253`	`253`
`@@ -339,7 +339,7 @@ public void SaveAsOnnx(OnnxContext ctx)`
`339`	`339`	`Host.CheckValue(ctx, nameof(ctx));`
`340`	`340`	`if (_mapper is ISaveAsOnnx onnx)`
`341`	`341`	`{`
`342`		`- Host.Check(onnx.CanSaveOnnx, "Cannot be saved as ONNX.");`
	`342`	`+ Host.Check(onnx.CanSaveOnnx(ctx), "Cannot be saved as ONNX.");`
`343`	`343`	`onnx.SaveAsOnnx(ctx);`
`344`	`344`	`}`
`345`	`345`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public interface ICanSaveOnnx`
`15`	`15`	`/// only detectable during runtime that would prevent its being savable. (For example,`
`16`	`16`	`/// it may wrap some other object that may or may not be savable.)`
`17`	`17`	`/// </summary>`
`18`		`- bool CanSaveOnnx { get; }`
	`18`	`+ bool CanSaveOnnx(OnnxContext ctx);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public abstract class SchemaBindablePredictorWrapperBase : ISchemaBindableMapper`
`46`	`46`
`47`	`47`	`public bool CanSavePfa => (ValueMapper as ICanSavePfa)?.CanSavePfa == true;`
`48`	`48`
`49`		`- public bool CanSaveOnnx => (ValueMapper as ICanSaveOnnx)?.CanSaveOnnx == true;`
	`49`	`+ public bool CanSaveOnnx(OnnxContext ctx) => (ValueMapper as ICanSaveOnnx)?.CanSaveOnnx(ctx) == true;`
`50`	`50`
`51`	`51`	`public SchemaBindablePredictorWrapperBase(IPredictor predictor)`
`52`	`52`	`{`