Skip to content

Commit 5231b51

Browse files
codemzscodemzs
committed
Merge branch 'master' of https://github.com/dotnet/machinelearning into dvdatetime
2 parents 1672739 + 40aab06 commit 5231b51

File tree

99 files changed

+7702
-896
lines changed

Some content is hidden

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

99 files changed

+7702
-896
lines changed

‎.vsts-dotnet-ci.yml

+7
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ phases:
1111
buildScript: build.cmd
1212
queue:
1313
name: Hosted VS2017
14+
15+
- template: /build/ci/phase-template.yml
16+
parameters:
17+
name: MacOS
18+
buildScript: ./build.sh
19+
queue:
20+
name: DotNetCore-Mac

‎BuildToolsVersion.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0-preview3-02704-01
1+
3.0.0-preview1-03129-01

‎Directory.Build.props

+3-15
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@
2828
<BinDir Condition="'$(BinDir)'==''">$(RepoRoot)bin/</BinDir>
2929
<BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(BinDir)</BaseOutputPath>
3030
<ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir>
31-
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(ObjDir)</BaseIntermediateOutputPath>
31+
<RootIntermediateOutputPath Condition="'$(RootIntermediateOutputPath)'==''">$(ObjDir)</RootIntermediateOutputPath>
3232

33-
<IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(BaseIntermediateOutputPath)$(PlatformConfig)\</IntermediateOutputRootPath>
33+
<IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(RootIntermediateOutputPath)$(PlatformConfig)\</IntermediateOutputRootPath>
3434
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(IntermediateOutputRootPath)$(MSBuildProjectName)\</IntermediateOutputPath>
35+
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(IntermediateOutputPath)</BaseIntermediateOutputPath>
3536

3637
<OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(PlatformConfig)\$(MSBuildProjectName)\</OutputPath>
3738

@@ -81,10 +82,6 @@
8182
<SourceRevisionId>$(LatestCommit)</SourceRevisionId>
8283
</PropertyGroup>
8384

84-
<!--
85-
Ensure to import versioning.props before overwriting BaseIntermediateOutputPath since
86-
the source link file exists in the root bin/obj folder.
87-
-->
8885
<Import Project="$(ToolsDir)versioning.props"
8986
Condition="Exists('$(ToolsDir)versioning.props') and '$(DisableImportVersioningProps)' != 'true'" />
9087

@@ -98,15 +95,6 @@
9895
<RunningOnUnix Condition="'$(OS)'!='Windows_NT'">true</RunningOnUnix>
9996
</PropertyGroup>
10097

101-
<PropertyGroup Condition="'$(UsingMicrosoftNETSdk)' == 'true'">
102-
<!--
103-
The Microsoft.NET.Sdk changed the definition of what it assumes $(BaseIntermediateOutputPath) is.
104-
In the "old" .csproj files, BaseIntermediateOutputPath could be shared with many projects.
105-
In the SDK-based .csproj files, BaseIntermediateOutputPath is assumed to be project-specific.
106-
-->
107-
<BaseIntermediateOutputPath>$(IntermediateOutputPath)</BaseIntermediateOutputPath>
108-
</PropertyGroup>
109-
11098
<!-- Signing properties -->
11199
<PropertyGroup>
112100
<AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == ''">$(ToolsDir)Open.snk</AssemblyOriginatorKeyFile>

‎Microsoft.ML.sln

+14-4
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath.UnitTe
103103
EndProject
104104
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.CpuMath.UnitTests.netcoreapp", "test\Microsoft.ML.CpuMath.UnitTests.netcoreapp\Microsoft.ML.CpuMath.UnitTests.netcoreapp.csproj", "{5F81A2A4-73AD-494C-B387-07D605EC8826}"
105105
EndProject
106-
107-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Microsoft.ML.FSharp.Tests", "test\Microsoft.ML.FSharp.Tests\Microsoft.ML.FSharp.Tests.fsproj", "{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3}"
106+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.ML.FSharp.Tests", "test\Microsoft.ML.FSharp.Tests\Microsoft.ML.FSharp.Tests.fsproj", "{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3}"
108107
EndProject
109108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.ImageAnalytics", "src\Microsoft.ML.ImageAnalytics\Microsoft.ML.ImageAnalytics.csproj", "{00E38F77-1E61-4CDF-8F97-1417D4E85053}"
110109
EndProject
111110
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.HalLearners", "src\Microsoft.ML.HalLearners\Microsoft.ML.HalLearners.csproj", "{A7222F41-1CF0-47D9-B80C-B4D77B027A61}"
112111
EndProject
112+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.TensorFlow", "src\Microsoft.ML.TensorFlow\Microsoft.ML.TensorFlow.csproj", "{570A0B8A-5463-44D2-8521-54C0CA4CACA9}"
113+
EndProject
113114
Global
114115
GlobalSection(SolutionConfigurationPlatforms) = preSolution
115116
Debug|Any CPU = Debug|Any CPU
@@ -390,6 +391,14 @@ Global
390391
{A7222F41-1CF0-47D9-B80C-B4D77B027A61}.Release|Any CPU.Build.0 = Release|Any CPU
391392
{A7222F41-1CF0-47D9-B80C-B4D77B027A61}.Release-Intrinsics|Any CPU.ActiveCfg = Release|Any CPU
392393
{A7222F41-1CF0-47D9-B80C-B4D77B027A61}.Release-Intrinsics|Any CPU.Build.0 = Release|Any CPU
394+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
395+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
396+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Debug-Intrinsics|Any CPU.ActiveCfg = Debug|Any CPU
397+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Debug-Intrinsics|Any CPU.Build.0 = Debug|Any CPU
398+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
399+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Release|Any CPU.Build.0 = Release|Any CPU
400+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Release-Intrinsics|Any CPU.ActiveCfg = Release|Any CPU
401+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9}.Release-Intrinsics|Any CPU.Build.0 = Release|Any CPU
393402
EndGlobalSection
394403
GlobalSection(SolutionProperties) = preSolution
395404
HideSolutionNode = FALSE
@@ -426,14 +435,15 @@ Global
426435
{001F3B4E-FBE4-4001-AFD2-A6A989CD1C25} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
427436
{DCF46B79-1FDB-4DBA-A263-D3D64E3AAA27} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
428437
{BF66A305-DF10-47E4-8D81-42049B149D2B} = {D3D38B03-B557-484D-8348-8BADEE4DF592}
438+
{B4E55B2D-2A92-46E7-B72F-E76D6FD83440} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
439+
{3E4ABF07-7970-4BE6-B45B-A13D3C397545} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
429440
{7333EDEF-4144-405C-A5EC-6F42201857D8} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
430441
{A0E562A9-0E6D-470D-B180-6EB44BA84D60} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
431442
{5F81A2A4-73AD-494C-B387-07D605EC8826} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
432-
{B4E55B2D-2A92-46E7-B72F-E76D6FD83440} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E}
433-
{3E4ABF07-7970-4BE6-B45B-A13D3C397545} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
434443
{802233D6-8CC0-46AD-9F23-FEE1E9AED9B3} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4}
435444
{00E38F77-1E61-4CDF-8F97-1417D4E85053} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
436445
{A7222F41-1CF0-47D9-B80C-B4D77B027A61} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
446+
{570A0B8A-5463-44D2-8521-54C0CA4CACA9} = {09EADF06-BE25-4228-AB53-95AE3E15B530}
437447
EndGlobalSection
438448
GlobalSection(ExtensibilityGlobals) = postSolution
439449
SolutionGuid = {41165AF1-35BB-4832-A189-73060F82B01D}

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc
4545
| | x64 Debug | x64 Release |
4646
|:---|----------------:|------------------:|
4747
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
48-
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
48+
|**macOS**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
4949
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
5050

5151
## Contributing

‎build.proj

+10-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<TraversalBuildDependsOn>
3232
CreateOrUpdateCurrentVersionFile;
3333
RestoreProjects;
34+
BuildRedist;
3435
BuildNative;
3536
$(TraversalBuildDependsOn);
3637
DownloadExternalTestFiles;
@@ -44,9 +45,17 @@
4445
Properties="MSBuildWarningsAsMessages=NU1503" />
4546
</Target>
4647

48+
<Target Name="BuildRedist"
49+
Condition="'$(SkipRedistBuild)' != 'true'"
50+
DependsOnTargets="RestoreProjects">
51+
<Message Importance="High" Text="Building redist components..." />
52+
<MSBuild Projects="src/Redist/build.proj"
53+
Targets="Build" />
54+
</Target>
55+
4756
<Target Name="BuildNative"
4857
Condition="'$(SkipNativeBuild)' != 'true'"
49-
DependsOnTargets="RestoreProjects">
58+
DependsOnTargets="RestoreProjects;BuildRedist">
5059
<Message Importance="High" Text="Building native components..." />
5160
<MSBuild Projects="src/Native/build.proj"
5261
Targets="Build" />

‎build/BranchInfo.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<MajorVersion>0</MajorVersion>
4-
<MinorVersion>5</MinorVersion>
4+
<MinorVersion>6</MinorVersion>
55
<PatchVersion>0</PatchVersion>
66
<PreReleaseLabel>preview</PreReleaseLabel>
77
</PropertyGroup>

‎build/Dependencies.props

+1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<MlNetMklDepsPackageVersion>0.0.0.5</MlNetMklDepsPackageVersion>
1212
<SystemDrawingCommonPackageVersion>4.5.0</SystemDrawingCommonPackageVersion>
1313
<BenchmarkDotNetVersion>0.11.0</BenchmarkDotNetVersion>
14+
<TensorFlowVersion>1.10.0</TensorFlowVersion>
1415
</PropertyGroup>
1516
</Project>

‎build/sign.proj

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030

3131
<!-- If we are not signing nuget packages we default to sign binaries -->
3232
<ItemGroup Condition="'$(SignNugetPackages)' != 'true'">
33-
<FilesToSign Include="$(OutDir)**/*.dll">
33+
<!-- Don't sign tensorflow since we don't build it. -->
34+
<ExcludeFilesToSign Include="$(OutDir)**/tensorflow.dll" />
35+
36+
<FilesToSign Include="$(OutDir)**/*.dll" Exclude="@(ExcludeFilesToSign)">
3437
<Authenticode>Microsoft</Authenticode>
3538
</FilesToSign>
3639
</ItemGroup>

‎init-tools.cmd

+11-12
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
setlocal
33

44
set INIT_TOOLS_LOG=%~dp0init-tools.log
5-
if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages\
5+
if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages
66
if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
77
set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\
88
if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe
99
if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
1010
set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt"
11-
set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\
11+
set BUILD_TOOLS_PATH=%PACKAGES_DIR%\Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib
1212
set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild
1313
set BUILD_TOOLS_SEMAPHORE_DIR=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%
1414
set BUILD_TOOLS_SEMAPHORE=%BUILD_TOOLS_SEMAPHORE_DIR%\init-tools.completed
1515

1616
:: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated
1717
if [%1]==[force] (
1818
if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%"
19-
if exist "%PACKAGES_DIR%Microsoft.DotNet.BuildTools" rmdir /S /Q "%PACKAGES_DIR%Microsoft.DotNet.BuildTools"
19+
if exist "%PACKAGES_DIR%\Microsoft.DotNet.BuildTools" rmdir /S /Q "%PACKAGES_DIR%\Microsoft.DotNet.BuildTools"
2020
)
2121

2222
:: If semaphore exists do nothing
@@ -27,8 +27,6 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" (
2727

2828
if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%"
2929

30-
if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%"
31-
3230
if exist "%DotNetBuildToolsDir%" (
3331
echo Using tools from '%DotNetBuildToolsDir%'.
3432
mklink /j "%TOOLRUNTIME_DIR%" "%DotNetBuildToolsDir%"
@@ -39,6 +37,7 @@ if exist "%DotNetBuildToolsDir%" (
3937
)
4038

4139
echo Done initializing tools.
40+
if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%"
4241
echo Using tools from '%DotNetBuildToolsDir%'. > "%BUILD_TOOLS_SEMAPHORE%"
4342
exit /b 0
4443
)
@@ -64,19 +63,18 @@ if NOT exist "%DOTNET_LOCAL_PATH%" (
6463

6564
if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore
6665
echo Restoring BuildTools version %BUILDTOOLS_VERSION%...
67-
echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
68-
call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%"
69-
if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" (
66+
echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%PACKAGES_DIR%" --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
67+
call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%PACKAGES_DIR%" --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
68+
if NOT exist "%BUILD_TOOLS_PATH%\init-tools.cmd" (
7069
echo ERROR: Could not restore build tools correctly. 1>&2
7170
goto :error
7271
)
7372

7473
:afterbuildtoolsrestore
7574

76-
7775
echo Initializing BuildTools...
78-
echo Running: "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
79-
call "%BUILD_TOOLS_PATH%init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%"
76+
echo Running: "%BUILD_TOOLS_PATH%\init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" "%PACKAGES_DIR%" >> "%INIT_TOOLS_LOG%"
77+
call "%BUILD_TOOLS_PATH%\init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" "%PACKAGES_DIR%" >> "%INIT_TOOLS_LOG%"
8078
set INIT_TOOLS_ERRORLEVEL=%ERRORLEVEL%
8179
if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
8280
echo ERROR: An error occured when trying to initialize the tools. 1>&2
@@ -85,10 +83,11 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
8583

8684
:: Create semaphore file
8785
echo Done initializing tools.
86+
if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%"
8887
echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%"
8988
exit /b 0
9089

9190
:error
9291
echo Please check the detailed log that follows. 1>&2
9392
type "%INIT_TOOLS_LOG%" 1>&2
94-
exit /b 1
93+
exit /b 1

0 commit comments

Comments
 (0)