Skip to content

Commit 34c2f1a

Browse files
author
Ivan Matantsev
committed
Merge branch 'master' into Ivanidze/KeyToVectorIORBug
2 parents acec961 + adb53c4 commit 34c2f1a

File tree

304 files changed

+5491
-4033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+5491
-4033
lines changed

.vsts-dotnet-ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ phases:
3131
parameters:
3232
name: Centos
3333
buildScript: ./build.sh
34+
customMatrixes:
35+
Build_Debug_Intrinsics:
36+
_configuration: Debug-Intrinsics
37+
_config_short: DI
38+
_includeBenchmarkData: false
39+
Build_Release:
40+
_configuration: Release
41+
_config_short: R
42+
_includeBenchmarkData: true
3443
queue:
3544
name: Hosted Ubuntu 1604
3645
container: CentosContainer
@@ -39,6 +48,15 @@ phases:
3948
parameters:
4049
name: Ubuntu
4150
buildScript: ./build.sh
51+
customMatrixes:
52+
Build_Debug:
53+
_configuration: Debug
54+
_config_short: D
55+
_includeBenchmarkData: false
56+
Build_Release_Intrinsics:
57+
_configuration: Release-Intrinsics
58+
_config_short: RI
59+
_includeBenchmarkData: true
4260
queue:
4361
name: Hosted Ubuntu 1604
4462
container: UbuntuContainer

BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0-preview1-03129-01
1+
3.0.0-preview1-03801-01

Microsoft.ML.sln

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests",
100100
EndProject
101101
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
102102
EndProject
103-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
103+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Components", "src\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
104104
EndProject
105105
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
106106
EndProject
@@ -142,18 +142,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.StaticPipe", "
142142
EndProject
143143
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow.StaticPipe", "src\Microsoft.ML.TensorFlow.StaticPipe\Microsoft.ML.TensorFlow.StaticPipe.csproj", "{F95F7AFB-03AF-4D20-BD75-1740B5FF71D3}"
144144
EndProject
145-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners.StaticPipe", "src\Microsoft.ML.HalLearners.StaticPipe\Microsoft.ML.HalLearners.StaticPipe.csproj", "{2F25EF6A-C754-45BE-AD9E-7DDF46A1B51A}"
145+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Mkl.Components.StaticPipe", "src\Microsoft.ML.Mkl.Components.StaticPipe\Microsoft.ML.Mkl.Components.StaticPipe.csproj", "{2F25EF6A-C754-45BE-AD9E-7DDF46A1B51A}"
146146
EndProject
147147
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.OnnxTransformer.StaticPipe", "src\Microsoft.ML.OnnxTransformer.StaticPipe\Microsoft.ML.OnnxTransformer.StaticPipe.csproj", "{D1324668-9568-40F4-AA55-30A9A516C230}"
148148
EndProject
149149
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.LightGBM.StaticPipe", "src\Microsoft.ML.LightGBM.StaticPipe\Microsoft.ML.LightGBM.StaticPipe.csproj", "{22C51B08-ACAE-47B2-A312-462DC239A23B}"
150150
EndProject
151151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TimeSeries.StaticPipe", "src\Microsoft.ML.TimeSeries.StaticPipe\Microsoft.ML.TimeSeries.StaticPipe.csproj", "{06A147ED-15EA-4106-9105-9B745125B470}"
152152
EndProject
153-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.HalLearners", "Microsoft.ML.HalLearners", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
153+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.Mkl.Components", "Microsoft.ML.Mkl.Components", "{63006A14-B924-48C5-83C9-CFE9DA22B01F}"
154154
ProjectSection(SolutionItems) = preProject
155-
pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.nupkgproj
156-
pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj = pkg\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.symbols.nupkgproj
155+
pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.nupkgproj
156+
pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj = pkg\Microsoft.ML.Mkl.Components\Microsoft.ML.Mkl.Components.symbols.nupkgproj
157157
EndProjectSection
158158
EndProject
159159
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.ML.ImageAnalytics", "Microsoft.ML.ImageAnalytics", "{1229F799-37F0-4282-B9F0-74BFA97CC362}"

README.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Along with these ML capabilities, this first release of ML.NET also brings the f
1818

1919
ML.NET runs on Windows, Linux, and macOS using [.NET Core](https://github.com/dotnet/core), or Windows using .NET Framework. 64 bit is supported on all platforms. 32 bit is supported on Windows, except for TensorFlow, LightGBM, and ONNX related functionality.
2020

21-
The current release is 0.10. Check out the [release notes](docs/release-notes/0.10/release-0.10.md) to see what's new.
21+
The current release is 0.11. Check out the [release notes](docs/release-notes/0.11/release-0.11.md) to see what's new.
2222

2323
First, ensure you have installed [.NET Core 2.1](https://www.microsoft.com/net/learn/get-started) or later. ML.NET also works on the .NET Framework 4.6.1 or later, but 4.7.2 or later is recommended.
2424

@@ -46,7 +46,7 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc
4646

4747
| | Debug | Release |
4848
|:---|----------------:|------------------:|
49-
|**Linux**|[![x64-debug](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=Linux&configuration=Build_Debug)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=Linux&configuration=Build_Release)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
49+
|**CentOS**|[![x64-debug](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=CentOS&configuration=Build_Debug_Intrinsics)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=CentOS&configuration=Build_Release)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
5050
|**macOS**|[![x64-debug](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=macOS&configuration=Build_Debug)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=macOS&configuration=Build_Release)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
5151
|**Windows x64**|[![x64-debug](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=Windows_x64&configuration=Build_Debug)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobname=Windows_x64&configuration=Build_Release)](https://dnceng.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
5252
|**Windows x86**|[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x86&configuration=Build_Debug)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=104?branchName=master)|[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/machinelearning/MachineLearning-CI?branchName=master&jobName=Windows_x86&configuration=Build_Release)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=104?branchName=master)|
@@ -69,16 +69,14 @@ Here's an example of code to train a model to predict sentiment from text sample
6969

7070
```C#
7171
var mlContext = new MLContext();
72-
var reader = mlContext.Data.CreateTextLoader(new TextLoader.Arguments
73-
{
74-
Column = new[] {
75-
new TextLoader.Column("SentimentText", DataKind.Text, 1),
76-
new TextLoader.Column("Label", DataKind.Bool, 0),
77-
},
78-
HasHeader = true,
79-
Separator = ","
80-
});
81-
var data = reader.Read(dataPath);
72+
var loader = mlContext.Data.CreateTextLoader(new[]
73+
{
74+
new TextLoader.Column("SentimentText", DataKind.String, 1),
75+
new TextLoader.Column("Label", DataKind.Boolean, 0),
76+
},
77+
hasHeader: true,
78+
separatorChar: ',');
79+
var data = loader.Load(dataPath);
8280
var learningPipeline = mlContext.Transforms.Text.FeaturizeText("Features", "SentimentText")
8381
.Append(mlContext.BinaryClassification.Trainers.FastTree());
8482
var model = learningPipeline.Fit(data);
@@ -116,4 +114,3 @@ ML.NET is a [.NET Foundation](https://www.dotnetfoundation.org/projects) project
116114
There are many .NET related projects on GitHub.
117115

118116
- [.NET home repo](https://github.com/Microsoft/dotnet) - links to 100s of .NET projects, from Microsoft and the community.
119-
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# ML.NET 0.11 Release Notes
2+
3+
[ML.NET](https://aka.ms/mlnet) 0.11 will be the last preview release before we reach `Release Candidate` for v1. We continue to push for creating a coherent and clean API surface for [ML.NET](https://aka.ms/mlnet) users. This release includes several bug fixes as well as extensive work on reducing the public API surface. The work on the API is tracked via [this project](https://github.com/dotnet/machinelearning/projects/13). In the upcoming 0.12 (RC1) releases before we reach 1.0, we will continue on refining the API and improving documentation.
4+
5+
### Installation
6+
7+
ML.NET supports Windows, MacOS, and Linux. See [supported OS versions of .NET Core 2.0](https://github.com/dotnet/core/blob/master/release-notes/2.0/2.0-supported-os.md) for more details.
8+
9+
You can install ML.NET NuGet from the CLI using:
10+
```
11+
dotnet add package Microsoft.ML
12+
```
13+
14+
From package manager:
15+
```
16+
Install-Package Microsoft.ML
17+
```
18+
19+
### Release Notes
20+
21+
Below are a few of the highlights from this release. There are many other improvements in the API.
22+
23+
* Creation of components through MLContext: advanced options and other feedback. ([#1798](https://github.coalsom/dotnet/machinelearning/issues/1798))
24+
* Several issues closed on internalizing public surface. ([19 issues](https://github.com/dotnet/machinelearning/issues?q=is%3Aissue+lockdown+is%3Aclosed))
25+
* Stop using MEF as part of the public API. ([#2422](https://github.com/dotnet/machinelearning/issues/2422))
26+
* Several `NameSpace` changes. ([#2326](https://github.com/dotnet/machinelearning/issues/2326))
27+
* `ONNX` is now `ONNXConverter`. ([#2625](https://github.com/dotnet/machinelearning/pull/2625))
28+
* `ONNXTransform` is now `ONNXTransformer`. ([#2544](https://github.com/dotnet/machinelearning/pull/2544))
29+
* `FastTree` has it's own package now. ([#2752](https://github.com/dotnet/machinelearning/issues/2752))
30+
* `Ensemble` has been moved out of `Microsoft.ML` package. ([#2717](https://github.com/dotnet/machinelearning/issues/2717))
31+
* Add support for string types in TensorFlowTransformer. ([#2545](https://github.com/dotnet/machinelearning/issues/2545))
32+
* Make FastTree/LightGBM learned model suitable for public consumption. ([#1960](https://github.com/dotnet/machinelearning/issues/1960))
33+
34+
35+
### Acknowledgements
36+
37+
Shoutout to [PaulTFreedman](https://github.com/PaulTFreedman),
38+
[kant2002](https://github.com/kant2002),
39+
[jwood803](https://github.com/jwood803), [mareklinka](https://github.com/mareklinka), [elbruno](https://github.com/elbruno) and the [ML.NET](https://aka.ms/mlnet) team for their
40+
contributions as part of this release!

docs/samples/Microsoft.ML.Samples/Dynamic/Calibrator.cs

Lines changed: 0 additions & 113 deletions
This file was deleted.

docs/samples/Microsoft.ML.Samples/Dynamic/FastTreeRegression.cs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,12 @@ public static void Example()
3030
// We will train a FastTreeRegression model with 1 tree on these two columns to predict Age.
3131
string outputColumnName = "Features";
3232
var pipeline = ml.Transforms.Concatenate(outputColumnName, new[] { "Parity", "Induced" })
33-
.Append(ml.Regression.Trainers.FastTree(labelColumnName: "Age", featureColumnName: outputColumnName, numTrees: 1, numLeaves: 2, minDatapointsInLeaves: 1));
33+
.Append(ml.Regression.Trainers.FastTree(labelColumnName: "Age", featureColumnName: outputColumnName, numberOfTrees: 1, numberOfLeaves: 2, minimumExampleCountPerLeaf: 1));
3434

3535
var model = pipeline.Fit(trainData);
3636

3737
// Get the trained model parameters.
3838
var modelParams = model.LastTransformer.Model;
39-
40-
// Let's see where an example with Parity = 1 and Induced = 1 would end up in the single trained tree.
41-
var testRow = new VBuffer<float>(2, new[] { 1.0f, 1.0f });
42-
// Use the path object to pass to GetLeaf, which will populate path with the IDs of th nodes from root to leaf.
43-
List<int> path = default;
44-
// Get the ID of the leaf this example ends up in tree 0.
45-
var leafID = modelParams.GetLeaf(0, in testRow, ref path);
46-
// Get the leaf value for this leaf ID in tree 0.
47-
var leafValue = modelParams.GetLeafValue(0, leafID);
48-
Console.WriteLine("The leaf value in tree 0 is: " + leafValue);
4939
}
5040
}
5141
}

docs/samples/Microsoft.ML.Samples/Dynamic/FeatureContributionCalculationTransform.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ public static void Example()
4444
var outData = featureContributionCalculator.Fit(scoredData).Transform(scoredData);
4545

4646
// Let's extract the weights from the linear model to use as a comparison
47-
var weights = new VBuffer<float>();
48-
model.Model.GetFeatureWeights(ref weights);
47+
var weights = model.Model.Weights;
4948

5049
// Let's now walk through the first ten records and see which feature drove the values the most
5150
// Get prediction scores and contributions
@@ -63,7 +62,7 @@ public static void Example()
6362
var value = row.Features[featureOfInterest];
6463
var contribution = row.FeatureContributions[featureOfInterest];
6564
var name = data.Schema[featureOfInterest + 1].Name;
66-
var weight = weights.GetValues()[featureOfInterest];
65+
var weight = weights[featureOfInterest];
6766

6867
Console.WriteLine("{0:0.00}\t{1:0.00}\t{2}\t{3:0.00}\t{4:0.00}\t{5:0.00}",
6968
row.MedianHomeValue,

0 commit comments

Comments
 (0)