Skip to content

Double cast to float for some onnx estimators #4745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 6, 2020
+25 −2
Merged

Double cast to float for some onnx estimators #4745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1b845e
double fix
kere-nel Jan 30, 2020
ebfb140
added support for int64 keys
kere-nel Jan 31, 2020
083ede9
number change
kere-nel Jan 31, 2020
81f9588
modifying test case
kere-nel Jan 31, 2020
d27fa8c
modifying test case
kere-nel Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.ML.Data/Transforms/KeyToValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ public override bool SaveOnnx(OnnxContext ctx, string srcVariableName, string ds
long[] values = Array.ConvertAll<TValue, long>(_values.GetValues().ToArray(), item => Convert.ToInt64(item));
node.AddAttribute("values_int64s", values);
}
else if (TypeOutput == NumberDataViewType.Single)
else if (TypeOutput == NumberDataViewType.Double || TypeOutput == NumberDataViewType.Single)
{
float[] values = Array.ConvertAll<TValue, float>(_values.GetValues().ToArray(), item => Convert.ToSingle(item));
node.AddAttribute("values_floats", values);
Expand Down
23 changes: 22 additions & 1 deletion src/Microsoft.ML.Data/Transforms/ValueToKeyMappingTransformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,7 @@ private bool SaveAsOnnxCore(OnnxContext ctx, int iinfo, ColInfo info, string src
OnnxNode node;
long[] termIds;
string opType = "LabelEncoder";
OnnxNode castNode;
var labelEncoderOutput = ctx.AddIntermediateVariable(_types[iinfo], "LabelEncoderOutput", true);

if (info.TypeSrc.GetItemType().Equals(TextDataViewType.Instance))
Expand All @@ -800,6 +801,26 @@ private bool SaveAsOnnxCore(OnnxContext ctx, int iinfo, ColInfo info, string src
var terms = GetTermsAndIds<float>(iinfo, out termIds);
node.AddAttribute("keys_floats", terms);
}
else if (info.TypeSrc.GetItemType().Equals(NumberDataViewType.Double))
{
var castOutput = ctx.AddIntermediateVariable(null, "castOutput", true);
castNode = ctx.CreateNode("Cast", srcVariableName, castOutput, ctx.GetNodeName(opType), "");
var t = InternalDataKindExtensions.ToInternalDataKind(DataKind.Single).ToType();
castNode.AddAttribute("to", t);
node = ctx.CreateNode(opType, castOutput, labelEncoderOutput, ctx.GetNodeName(opType));
var terms = GetTermsAndIds<double>(iinfo, out termIds);
node.AddAttribute("keys_floats", terms);
}
else if (info.TypeSrc.GetItemType().Equals(NumberDataViewType.Int64))
{
var castOutput = ctx.AddIntermediateVariable(null, "castOutput", true);
castNode = ctx.CreateNode("Cast", srcVariableName, castOutput, ctx.GetNodeName(opType), "");
var t = InternalDataKindExtensions.ToInternalDataKind(DataKind.String).ToType();
castNode.AddAttribute("to", t);
node = ctx.CreateNode(opType, castOutput, labelEncoderOutput, ctx.GetNodeName(opType));
var terms = GetTermsAndIds<long>(iinfo, out termIds);
node.AddAttribute("keys_strings", terms.Select(item => item.ToString()));
}
else
{
// LabelEncoder-2 in ORT v1 only supports the following mappings
Expand All @@ -822,7 +843,7 @@ private bool SaveAsOnnxCore(OnnxContext ctx, int iinfo, ColInfo info, string src
InternalDataKindExtensions.TryGetDataKind(_parent._unboundMaps[iinfo].OutputType.RawType, out dataKind);

opType = "Cast";
var castNode = ctx.CreateNode(opType, labelEncoderOutput, dstVariableName, ctx.GetNodeName(opType), "");
castNode = ctx.CreateNode(opType, labelEncoderOutput, dstVariableName, ctx.GetNodeName(opType), "");
castNode.AddAttribute("to", dataKind.ToType());

return true;
Expand Down
2 changes: 2 additions & 0 deletions test/Microsoft.ML.Tests/OnnxConversionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,6 +1094,8 @@ public void IndicateMissingValuesOnnxConversionTest()

[Theory]
[InlineData(DataKind.Single)]
[InlineData(DataKind.Int64)]
[InlineData(DataKind.Double)]
[InlineData(DataKind.String)]
public void ValueToKeyMappingOnnxConversionTest(DataKind valueType)
{
Expand Down