Skip to content

[AutoML] publish AutoML package #3383

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 7 commits into from
Apr 18, 2019
Merged

[AutoML] publish AutoML package #3383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36e575f
publish AutoML package
Dmitry-A Apr 17, 2019
37f816a
Only leave automl and mlnet tests to run
Dmitry-A Apr 18, 2019
f721e4c
publish AutoML package
Dmitry-A Apr 17, 2019
dc97ced
Only leave automl and mlnet tests to run
Dmitry-A Apr 18, 2019
3a3b034
merge with Daniel's changes to revert proj-level dependency on ml.net
Dmitry-A Apr 18, 2019
efce098
fix build issues when ml.net is not building
Dmitry-A Apr 18, 2019
7242e22
sync with upstream
Dmitry-A Apr 18, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</PropertyGroup>

<ItemGroup>
<!-- <Project Include="Microsoft.ML.sln" /> -->
Copy link
Contributor

@daholste daholste Apr 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for this!!!!
<Project Include="Microsoft.ML.AutoML.sln" />
<Project Include="Microsoft.ML.sln" />
</ItemGroup>

<Import Project="dir.traversal.targets" />
Expand All @@ -34,7 +34,7 @@
CreateOrUpdateCurrentVersionFile;
RestoreProjects;
BuildRedist;
BuildNative;
<!-- BuildNative; -->
$(TraversalBuildDependsOn);
DownloadExternalTestFiles;
</TraversalBuildDependsOn>
Expand Down Expand Up @@ -68,7 +68,7 @@
<Message Importance="High" Text="Building packages ..." />

<ItemGroup>
<PkgProject Include="pkg\**\*.nupkgproj" />
<PkgProject Include="pkg\Microsoft.ML.Auto\Microsoft.ML.Auto.nupkgproj" />
</ItemGroup>

<MSBuild Projects="@(PkgProject)"
Expand Down
2 changes: 1 addition & 1 deletion build/BranchInfo.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(IsStableProject)' != 'true'">
<MajorVersion>0</MajorVersion>
<MinorVersion>13</MinorVersion>
<MinorVersion>2</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseLabel>preview</PreReleaseLabel>
</PropertyGroup>
Expand Down
14 changes: 14 additions & 0 deletions pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageDescription>ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters</PackageDescription>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
</ItemGroup>

</Project>
5 changes: 5 additions & 0 deletions pkg/Microsoft.ML.Auto/Microsoft.ML.Auto.symbols.nupkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project DefaultTargets="Pack">

<Import Project="Microsoft.ML.Auto.nupkgproj" />

</Project>
25 changes: 3 additions & 22 deletions src/Microsoft.ML.Auto/Microsoft.ML.Auto.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,18 @@
<!-- TODO: make the code compliant and remove the following two lines: -->
<UseStyleCopAnalyzer>false</UseStyleCopAnalyzer>
<UseMLCodeAnalyzer>false</UseMLCodeAnalyzer>
<IncludeInPackage>Microsoft.ML.Auto</IncludeInPackage>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
<PackageReference Include="Microsoft.ML" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.LightGbm" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.0.0-preview" />
</ItemGroup>

<PropertyGroup>
<Authors>Microsoft</Authors>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://dot.net/ml</PackageProjectUrl>
<PackageIconUrl>https://aka.ms/mlnetlogo</PackageIconUrl>
<PackageReleaseNotes>https://aka.ms/mlnetreleasenotes</PackageReleaseNotes>
<!-- space separated -->
<PackageTags>ML.NET ML Machine Learning AutoML</PackageTags>
<AssemblyName>Microsoft.ML.Auto</AssemblyName>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702</NoWarn>
</PropertyGroup>

<ItemGroup Condition="'$(IncludeMLNetNotices)' != 'false'">
<Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.TXT" Pack="true" PackagePath="" />
<Content Include="$(RepoRoot)\LICENSE" Pack="true" PackagePath="" />
</ItemGroup>


</Project>
13 changes: 1 addition & 12 deletions src/mlnet/mlnet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,13 @@
<PackageReference Include="System.CommandLine.Experimental" Version="0.2.0-alpha.19174.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.1" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.ML.Auto\Microsoft.ML.Auto.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="mscorlib">
<HintPath>mscorlib</HintPath>
</Reference>
<Reference Include="System">
<HintPath>System</HintPath>
</Reference>
<Reference Include="System.Core">
<HintPath>System.Core</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.ML.AutoML.Tests/Microsoft.ML.AutoML.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions test/run-tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />

<ItemGroup>
<Project Include="$(MSBuildThisFileDirectory)**\*.csproj" />
<Project Include="$(MSBuildThisFileDirectory)**\*.fsproj" />
<Project Include="$(MSBuildThisFileDirectory)\Microsoft.ML.AutoML.Tests\*.csproj" />
<Project Include="$(MSBuildThisFileDirectory)\mlnet.Tests\*.csproj" />
<!-- <Project Include="$(MSBuildThisFileDirectory)**\*.fsproj" /> -->
</ItemGroup>

<Target Name="RunTests">
Expand Down