Skip to content

Fixes KMeans scoring differences between ORT and OnnxRunner #4942

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
kere-nel merged 2 commits into from
Mar 14, 2020
Merged

Fixes KMeans scoring differences between ORT and OnnxRunner #4942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
170fabe
support for batch inferencing on ORT models
kere-nel Mar 13, 2020
19b3aa5
resolving comments
kere-nel Mar 13, 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
8 changes: 5 additions & 3 deletions src/Microsoft.ML.KMeansClustering/KMeansModelParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,19 +331,21 @@ bool ISingleCanSaveOnnx.SaveAsOnnx(OnnxContext ctx, string[] outputNames, string
var nameX = featureColumn;

// Compute X^2 from X
var nameX2 = ctx.AddIntermediateVariable(null, "X2", true);
var nameX2 = ctx.AddIntermediateVariable(new VectorDataViewType(NumberDataViewType.Single, 1), "X2");
var reduceNodeX2 = ctx.CreateNode("ReduceSumSquare", nameX, nameX2, ctx.GetNodeName("ReduceSumSquare"), "");
reduceNodeX2.AddAttribute("axes", new long[] { 1 });

// Compute -2XC^T. Note that Gemm always takes three inputs. Since we only have two here,
// a dummy one, named zero, is created.
var dataViewType = new VectorDataViewType(NumberDataViewType.Single, _centroids.Length);
var zeroName = ctx.AddInitializer(new float[] { 0f }, null, "zero");
var nameXC2 = ctx.AddIntermediateVariable(null, "XC2", true);
var nameXC2 = ctx.AddIntermediateVariable(dataViewType, "XC2");
var gemmNodeXC2 = ctx.CreateNode("Gemm", new[] { nameX, nameC, zeroName }, new[] { nameXC2 }, ctx.GetNodeName("Gemm"), "");
gemmNodeXC2.AddAttribute("alpha", -2f);
gemmNodeXC2.AddAttribute("transB", 1);

// Compute Z = X^2 - 2XC^T
var nameZ = ctx.AddIntermediateVariable(null, "Z", true);
var nameZ = ctx.AddIntermediateVariable(dataViewType, "Z");
var addNodeZ = ctx.CreateNode("Add", new[] { nameX2, nameXC2 }, new[] { nameZ }, ctx.GetNodeName("Add"), "");

// Compute Y = Z + C^2
Expand Down
65 changes: 64 additions & 1 deletion test/BaselineOutput/Common/Onnx/Cluster/BreastCancer/Kmeans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,16 @@
"X2"
],
"name": "ReduceSumSquare",
"opType": "ReduceSumSquare"
"opType": "ReduceSumSquare",
"attribute": [
{
"name": "axes",
"ints": [
"1"
],
"type": "INTS"
}
]
},
{
"input": [
Expand Down Expand Up @@ -377,6 +386,60 @@
}
}
},
{
"name": "X2",
"type": {
"tensorType": {
"elemType": 1,
"shape": {
"dim": [
{
"dimValue": "-1"
},
{
"dimValue": "1"
}
]
}
}
}
},
{
"name": "XC2",
"type": {
"tensorType": {
"elemType": 1,
"shape": {
"dim": [
{
"dimValue": "-1"
},
{
"dimValue": "4"
}
]
}
}
}
},
{
"name": "Z",
"type": {
"tensorType": {
"elemType": 1,
"shape": {
"dim": [
{
"dimValue": "-1"
},
{
"dimValue": "4"
}
]
}
}
}
},
{
"name": "Features.output",
"type": {
Expand Down