merge release 2.7
This commit is contained in:
liqfu
Родитель
6b72436abd
Коммит
82b7a392fb
|
|
@ -38,7 +38,7 @@
|
|||
<!-- CntkVersion:
|
||||
CNTK version which should be used where CNTK version is required. Ex: print version or tag CNTK binaries. Default value is the last released version of CNTK. -->
|
||||
<!-- NOTE: Modify both CntkVersion and PublicBuild during MAJOR RELEASE -->
|
||||
<CntkVersion>2.6</CntkVersion>
|
||||
<CntkVersion>2.7</CntkVersion>
|
||||
|
||||
<!-- PublicBuild:
|
||||
True if build binaries are meant to shared publicly with CNTK community. -->
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.6, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.6.0\lib\net45\x64\Cntk.Core.Managed-2.6.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.7, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.7.0\lib\net45\x64\Cntk.Core.Managed-2.7.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -148,16 +148,16 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
|
||||
|
|
|
|||
|
|
@ -98,16 +98,16 @@
|
|||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
@ -98,18 +98,18 @@
|
|||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.Deps.Cuda" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.GPU" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.Cuda" version="2.7.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="native" />
|
||||
<package id="CNTK.GPU" version="2.7.0" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
@ -59,15 +59,15 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
@ -63,17 +63,17 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.Deps.Cuda.2.6.0\build\net45\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\net45\CNTK.Deps.Cuda.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.Cuda.2.7.0\build\net45\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\net45\CNTK.Deps.Cuda.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\net45\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.6.0\build\net45\CNTK.Deps.Cuda.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.6.0\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.6.0\build\net45\CNTK.GPU.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\net45\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.7.0\build\net45\CNTK.Deps.Cuda.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.7.0\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.7.0\build\net45\CNTK.GPU.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.Deps.Cuda" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.GPU" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.Cuda" version="2.7.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="net45" />
|
||||
<package id="CNTK.GPU" version="2.7.0" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
@ -108,14 +108,14 @@
|
|||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.7.0" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -106,14 +106,14 @@
|
|||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.7.0" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
@ -49,8 +49,8 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.6, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\lib\net45\x64\Cntk.Eval.Wrapper-2.6.dll</HintPath>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.7, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\lib\net45\x64\Cntk.Eval.Wrapper-2.7.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -88,13 +88,13 @@
|
|||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.7.0" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.6, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\lib\net45\x64\Cntk.Eval.Wrapper-2.6.dll</HintPath>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.7, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\lib\net45\x64\Cntk.Eval.Wrapper-2.7.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -148,14 +148,14 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.6.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.7.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
|
||||
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.6.0" targetFramework="net45" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.7.0" targetFramework="net45" />
|
||||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
|
||||
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
|
||||
<package id="Swashbuckle" version="5.3.1" targetFramework="net45" />
|
||||
|
|
|
|||
|
|
@ -103,12 +103,12 @@
|
|||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.UWP.CPUOnly.2.6.0\build\native\CNTK.UWP.CPUOnly.targets" Condition="Exists('..\packages\CNTK.UWP.CPUOnly.2.6.0\build\native\CNTK.UWP.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.UWP.CPUOnly.2.7.0\build\native\CNTK.UWP.CPUOnly.targets" Condition="Exists('..\packages\CNTK.UWP.CPUOnly.2.7.0\build\native\CNTK.UWP.CPUOnly.targets')" />
|
||||
</ImportGroup>
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.UWP.CPUOnly.2.6.0\build\native\CNTK.UWP.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.UWP.CPUOnly.2.6.0\build\native\CNTK.UWP.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.UWP.CPUOnly.2.7.0\build\native\CNTK.UWP.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.UWP.CPUOnly.2.7.0\build\native\CNTK.UWP.CPUOnly.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.UWP.CPUOnly" version="2.6.0" targetFramework="native" />
|
||||
<package id="CNTK.UWP.CPUOnly" version="2.7.0" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
@ -4,7 +4,7 @@ This example demonstrates how to use sampled softmax for training a token based
|
|||
The model predicts the next word in a text given the previous ones where the probability of the next word is computed using a softmax.
|
||||
As the number of different words might be very high this final softmax step can turn out to be costly.
|
||||
|
||||
Sampled-softmax is a technique to reduce this cost at training time. For details see also the [sampled softmax tutorial](https://github.com/Microsoft/CNTK/blob/release/2.6/Tutorials/CNTK_207_Training_with_Sampled_Softmax.ipynb)
|
||||
Sampled-softmax is a technique to reduce this cost at training time. For details see also the [sampled softmax tutorial](https://github.com/Microsoft/CNTK/blob/release/2.7/Tutorials/CNTK_207_Training_with_Sampled_Softmax.ipynb)
|
||||
|
||||
Note the provided data set has only 10.000 distinct words. This number is still not very high and sampled softmax doesn't show any significant perf improvements here.
|
||||
The real perf gains will show up with larger vocabularies.
|
||||
|
|
|
|||
|
|
@ -71,24 +71,24 @@
|
|||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.6, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.6.0\lib\netstandard2.0\Cntk.Core.Managed-2.6.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.7, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.7.0\lib\netstandard2.0\Cntk.Core.Managed-2.7.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<None Include="App.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.6.0\build\netstandard2.0\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.6.0\build\netstandard2.0\CNTK.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.7.0\build\netstandard2.0\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.7.0\build\netstandard2.0\CNTK.CPUOnly.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\netstandard2.0\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\netstandard2.0\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\netstandard2.0\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\netstandard2.0\CNTK.CPUOnly.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="netstandard2.0" />
|
||||
</packages>
|
||||
|
|
@ -72,26 +72,26 @@
|
|||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.6, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.GPU.2.6.0\lib\netstandard2.0\Cntk.Core.Managed-2.6.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.7, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.GPU.2.7.0\lib\netstandard2.0\Cntk.Core.Managed-2.7.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<None Include="App.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.Deps.Cuda.2.6.0\build\netstandard2.0\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\netstandard2.0\CNTK.Deps.Cuda.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.6.0\build\netstandard2.0\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.6.0\build\netstandard2.0\CNTK.GPU.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.Cuda.2.7.0\build\netstandard2.0\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\netstandard2.0\CNTK.Deps.Cuda.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" />
|
||||
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.7.0\build\netstandard2.0\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.7.0\build\netstandard2.0\CNTK.GPU.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\netstandard2.0\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.6.0\build\netstandard2.0\CNTK.Deps.Cuda.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\netstandard2.0\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.6.0\build\netstandard2.0\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.6.0\build\netstandard2.0\CNTK.GPU.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\netstandard2.0\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.7.0\build\netstandard2.0\CNTK.Deps.Cuda.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\netstandard2.0\CNTK.Deps.MKL.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\netstandard2.0\CNTK.Deps.OpenCV.Zip.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.7.0\build\netstandard2.0\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.7.0\build\netstandard2.0\CNTK.GPU.targets'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.Deps.Cuda" version="2.6.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.GPU" version="2.6.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.Cuda" version="2.7.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="netstandard2.0" />
|
||||
<package id="CNTK.GPU" version="2.7.0" targetFramework="netstandard2.0" />
|
||||
</packages>
|
||||
|
|
@ -481,7 +481,7 @@
|
|||
"### Testing\n",
|
||||
"If the test configuration is given, after completion of training, the train method runs evaluation on the specified minibatch source. If you need to run only evaluation without training, consider using [Function.test](https://www.cntk.ai/pythondocs/cntk.ops.functions.html#cntk.ops.functions.Function.test) method instead.\n",
|
||||
"\n",
|
||||
"For more advanced scenarios of use Function.train please see [Tutorial 200](https://github.com/Microsoft/CNTK/blob/release/2.6/Tutorials/CNTK_200_GuidedTour.ipynb)"
|
||||
"For more advanced scenarios of use Function.train please see [Tutorial 200](https://github.com/Microsoft/CNTK/blob/release/2.7/Tutorials/CNTK_200_GuidedTour.ipynb)"
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
|
|||
76
README.md
76
README.md
|
|
@ -46,7 +46,23 @@ You can learn more about using and contributing to CNTK with the following resou
|
|||
|
||||
## Disclaimer
|
||||
|
||||
CNTK is in active use at Microsoft and constantly evolving. There will be bugs.
|
||||
Dear community,
|
||||
|
||||
With our ongoing contributions to ONNX and the ONNX Runtime, we have made it easier to interoperate within the AI framework ecosystem and to access high performance, cross-platform inferencing capabilities for both traditional ML models and deep neural networks. Over the last few years we have been privileged to develop such key open-source machine learning projects, including the Microsoft Cognitive Toolkit, which has enabled its users to leverage industry-wide advancements in deep learning at scale.
|
||||
|
||||
Today’s 2.7 release will be the last main release of CNTK. We may have some subsequent minor releases for bug fixes, but these will be evaluated on a case-by-case basis. There are no plans for new feature development post this release.
|
||||
|
||||
The CNTK 2.7 release has full support for ONNX 1.4.1, and we encourage those seeking to operationalize their CNTK models to take advantage of ONNX and the ONNX Runtime. Moving forward, users can continue to leverage evolving ONNX innovations via the number of frameworks that support it. For example, users can natively export ONNX models from PyTorch or convert TensorFlow models to ONNX with the TensorFlow-ONNX converter.
|
||||
|
||||
We are incredibly grateful for all the support we have received from contributors and users over the years since the initial open-source release of CNTK. CNTK has enabled both Microsoft teams and external users to execute complex and large-scale workloads in all manner of deep learning applications, such as historical breakthroughs in speech recognition achieved by Microsoft Speech researchers, the originators of the framework.
|
||||
|
||||
As ONNX is increasingly employed in serving models used across Microsoft products such as Bing and Office, we are dedicated to synthesizing innovations from research with the rigorous demands of production to progress the ecosystem forward.
|
||||
|
||||
Above all, our goal is to make innovations in deep learning across the software and hardware stacks as open and accessible as possible. We will be working hard to bring both the existing strengths of CNTK and new state-of-the-art research into other open-source projects to truly broaden the reach of such technologies.
|
||||
|
||||
With gratitude,
|
||||
|
||||
-- The CNTK Team
|
||||
|
||||
## Microsoft Open Source Code of Conduct
|
||||
|
||||
|
|
@ -56,6 +72,35 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
|
|||
|
||||
> You can find more news on [the official project feed](https://docs.microsoft.com/en-us/cognitive-toolkit/news)
|
||||
|
||||
***2019-03-29.*** CNTK 2.7.0
|
||||
## Highlights of this release
|
||||
* Moved to CUDA 10 for both Windows and Linux.
|
||||
* Support advance RNN loop in ONNX export.
|
||||
* Export larger than 2GB models in ONNX format.
|
||||
* Support FP16 in Brain Script train action.
|
||||
|
||||
## CNTK support for CUDA 10
|
||||
|
||||
### CNTK now supports CUDA 10. This requires an update to build environment to Visual Studio 2017 v15.9 for Windows.
|
||||
|
||||
To setup build and runtime environment on Windows:
|
||||
* Install [Visual Studio 2017](https://www.visualstudio.com/downloads/). Note: going forward for CUDA 10 and beyond, it is no longer required to install and run with the specific VC Tools version 14.11.
|
||||
* Install [Nvidia CUDA 10](https://developer.nvidia.com/cuda-downloads?target_os=Windows&target_arch=x86_64)
|
||||
* From PowerShell, run:
|
||||
[DevInstall.ps1](../Tools/devInstall/Windows/DevInstall.ps1)
|
||||
* Start Visual Studio 2017 and open [CNTK.sln](./CNTK.sln).
|
||||
|
||||
To setup build and runtime environment on Linux using docker, please build Unbuntu 16.04 docker image using Dockerfiles [here](./Tools/docker). For other Linux systems, please refer to the Dockerfiles to setup dependent libraries for CNTK.
|
||||
|
||||
## Support advance RNN loop in ONNX export
|
||||
CNTK models with recursive loops can be exported to ONNX models with scan ops.
|
||||
|
||||
## Export larger than 2GB models in ONNX format
|
||||
To export models larger than 2GB in ONNX format, use cntk.Function API:
|
||||
save(self, filename, format=ModelFormat.CNTKv2, use_external_files_to_store_parameters=False)
|
||||
with 'format' set to ModelFormat.ONNX and use_external_files_to_store_parameters set to True.
|
||||
In this case, model parameters are saved in external files. Exported models shall be used with external parameter files when doing model evaluation with onnxruntime.
|
||||
|
||||
***2018-11-26.***
|
||||
[Netron](https://github.com/lutzroeder/netron) now supports visualizing CNTK v1 and CNTK v2 `.model` files.
|
||||
|
||||
|
|
@ -337,32 +382,3 @@ Halide Binary Convolution
|
|||
|
||||
See more in the [Release Notes](https://docs.microsoft.com/en-us/cognitive-toolkit/ReleaseNotes/CNTK_2_4_Release_Notes).
|
||||
Get the Release from the [CNTK Releases page](https://github.com/Microsoft/CNTK/releases).
|
||||
|
||||
---
|
||||
|
||||
***2018-01-22.*** CNTK support for CUDA 9
|
||||
|
||||
CNTK now supports CUDA 9/cuDNN 7. This requires an update to build environment to Ubuntu 16/GCC 5 for Linux, and Visual Studio 2017/VCTools 14.11 for Windows. With CUDA 9, CNTK also added a preview for 16-bit floating point (a.k.a FP16) computation.
|
||||
|
||||
Please check out the example of FP16 in ResNet50 [here](./Examples/Image/Classification/ResNet/Python/TrainResNet_ImageNet_Distributed.py)
|
||||
|
||||
Notes on FP16 preview:
|
||||
* FP16 implementation on CPU is not optimized, and it's not supposed to be used in CPU inference directly. User needs to convert the model to 32-bit floating point before running on CPU.
|
||||
* Loss/Criterion for FP16 training needs to be 32bit for accumulation without overflow, using cast function. Please check the example above.
|
||||
* Readers do not have FP16 output unless using numpy to feed data, cast from FP32 to FP16 is needed. Please check the example above.
|
||||
* FP16 gradient aggregation is currently only implemented on GPU using NCCL2. Distributed training with FP16 with MPI is not supported.
|
||||
* FP16 math is a subset of current FP32 implementation. Some model may get Feature Not Implemented exception using FP16.
|
||||
* FP16 is currently not supported in BrainScript. Please use Python for FP16.
|
||||
|
||||
To setup build and runtime environment on Windows:
|
||||
* Install [Visual Studio 2017](https://www.visualstudio.com/downloads/) with following workloads and components. From command line (use Community version installer as example):
|
||||
`vs_community.exe --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.Universal --add Microsoft.Component.PythonTools --add Microsoft.VisualStudio.Component.VC.Tools.14.11`
|
||||
* Install [NVidia CUDA 9](https://developer.nvidia.com/cuda-90-download-archive?target_os=Windows&target_arch=x86_64)
|
||||
* From PowerShell, run:
|
||||
[DevInstall.ps1](./Tools/devInstall/Windows/DevInstall.ps1)
|
||||
* Start VCTools 14.11 command line, run:
|
||||
`cmd /k "%VS2017INSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64 --vcvars_ver=14.11`
|
||||
* Open [CNTK.sln](./CNTK.sln) from the VCTools 14.11 command line. Note that starting CNTK.sln other than VCTools 14.11 command line, would causes CUDA 9 [build error](https://developercommunity.visualstudio.com/content/problem/163758/vs-2017-155-doesnt-support-cuda-9.html).
|
||||
|
||||
To setup build and runtime environment on Linux using docker, please build Unbuntu 16.04 docker image using Dockerfiles [here](./Tools/docker). For other Linux systems, please refer to the Dockerfiles to setup dependent libraries for CNTK.
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"\n",
|
||||
"This tutorial is targeted to individuals who are new to CNTK and to machine learning. In this tutorial, you will train a simple yet powerful machine learning model that is widely used in industry for a variety of applications. The model trained below scales to massive data sets in the most expeditious manner by harnessing computational scalability leveraging the computational resources you may have (one or more CPU cores, one or more GPUs, a cluster of CPUs or a cluster of GPUs), transparently via the CNTK library.\n",
|
||||
"\n",
|
||||
"The following notebook uses Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.6/Tutorials/HelloWorld-LogisticRegression). \n",
|
||||
"The following notebook uses Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.7/Tutorials/HelloWorld-LogisticRegression). \n",
|
||||
"\n",
|
||||
"## Introduction\n",
|
||||
"\n",
|
||||
|
|
|
|||
|
|
@ -864,7 +864,7 @@
|
|||
"source": [
|
||||
"**Code link**\n",
|
||||
"\n",
|
||||
"If you want to try running the tutorial from python command prompt. Please run the [FeedForwardNet.py](https://github.com/Microsoft/CNTK/blob/release/2.6/Tutorials/NumpyInterop/FeedForwardNet.py) example."
|
||||
"If you want to try running the tutorial from python command prompt. Please run the [FeedForwardNet.py](https://github.com/Microsoft/CNTK/blob/release/2.7/Tutorials/NumpyInterop/FeedForwardNet.py) example."
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
"\n",
|
||||
"We assume that you have successfully completed CNTK 103 Part A.\n",
|
||||
"\n",
|
||||
"In this tutorial we will build and train a Multinomial Logistic Regression model using the MNIST data. This notebook provides the recipe using Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.6/Examples/Image/GettingStarted)\n",
|
||||
"In this tutorial we will build and train a Multinomial Logistic Regression model using the MNIST data. This notebook provides the recipe using Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.7/Examples/Image/GettingStarted)\n",
|
||||
"\n",
|
||||
"## Introduction\n",
|
||||
"\n",
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
"\n",
|
||||
"We assume that you have successfully completed CNTK 103 Part A.\n",
|
||||
"\n",
|
||||
"In this tutorial, we train a multi-layer perceptron on MNIST data. This notebook provides the recipe using Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.6/Examples/Image/GettingStarted)\n",
|
||||
"In this tutorial, we train a multi-layer perceptron on MNIST data. This notebook provides the recipe using Python APIs. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.7/Examples/Image/GettingStarted)\n",
|
||||
"\n",
|
||||
"## Introduction\n",
|
||||
"\n",
|
||||
|
|
@ -762,7 +762,7 @@
|
|||
"source": [
|
||||
"**Code link**\n",
|
||||
"\n",
|
||||
"If you want to try running the tutorial from Python command prompt please run the [SimpleMNIST.py](https://github.com/Microsoft/CNTK/tree/release/2.6/Examples/Image/Classification/MLP/Python) example."
|
||||
"If you want to try running the tutorial from Python command prompt please run the [SimpleMNIST.py](https://github.com/Microsoft/CNTK/tree/release/2.7/Examples/Image/Classification/MLP/Python) example."
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
"\n",
|
||||
"We assume that you have successfully completed CNTK 103 Part A (MNIST Data Loader).\n",
|
||||
"\n",
|
||||
"In this tutorial we will train a Convolutional Neural Network (CNN) on MNIST data. This notebook provides the recipe using the Python API. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.6/Examples/Image/GettingStarted)\n",
|
||||
"In this tutorial we will train a Convolutional Neural Network (CNN) on MNIST data. This notebook provides the recipe using the Python API. If you are looking for this example in BrainScript, please look [here](https://github.com/Microsoft/CNTK/tree/release/2.7/Examples/Image/GettingStarted)\n",
|
||||
"\n",
|
||||
"## Introduction\n",
|
||||
"\n",
|
||||
|
|
|
|||
|
|
@ -46,12 +46,12 @@
|
|||
"In this tutorial, we are going to use a (lightly preprocessed) version of the ATIS dataset. You can download the data automatically by running the cells below or by executing the manual instructions.\n",
|
||||
"\n",
|
||||
"**Fallback manual instructions**\n",
|
||||
"Download the ATIS [training](https://github.com/Microsoft/CNTK/blob/release/2.6/Tutorials/SLUHandsOn/atis.train.ctf) \n",
|
||||
"and [test](https://github.com/Microsoft/CNTK/blob/release/2.6/Tutorials/SLUHandsOn/atis.test.ctf) \n",
|
||||
"Download the ATIS [training](https://github.com/Microsoft/CNTK/blob/release/2.7/Tutorials/SLUHandsOn/atis.train.ctf) \n",
|
||||
"and [test](https://github.com/Microsoft/CNTK/blob/release/2.7/Tutorials/SLUHandsOn/atis.test.ctf) \n",
|
||||
"files and put them at the same folder as this notebook. If you want to see how the model is \n",
|
||||
"predicting on new sentences you will also need the vocabulary files for \n",
|
||||
"[queries](https://github.com/Microsoft/CNTK/blob/release/2.6/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n",
|
||||
"[slots](https://github.com/Microsoft/CNTK/blob/release/2.6/Examples/LanguageUnderstanding/ATIS/BrainScript/slots.wl)"
|
||||
"[queries](https://github.com/Microsoft/CNTK/blob/release/2.7/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n",
|
||||
"[slots](https://github.com/Microsoft/CNTK/blob/release/2.7/Examples/LanguageUnderstanding/ATIS/BrainScript/slots.wl)"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
" print(\"Reusing locally cached:\", item['file'])\n",
|
||||
" else:\n",
|
||||
" print(\"Starting download:\", item['file'])\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.6/%s/%s?raw=true\"%(location, item['file'])\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.7/%s/%s?raw=true\"%(location, item['file'])\n",
|
||||
" download(url, item['file'])\n",
|
||||
" print(\"Download completed\")\n"
|
||||
]
|
||||
|
|
@ -845,7 +845,7 @@
|
|||
"> Note: training with Batch Normalization is currently only supported on GPU.\n",
|
||||
"\n",
|
||||
"So your task will be to insert batch-normalization layers before and after the recurrent LSTM layer.\n",
|
||||
"If you have completed the [hands-on labs on image processing](https://github.com/Microsoft/CNTK/blob/release/2.6/Tutorials/CNTK_201B_CIFAR-10_ImageHandsOn.ipynb),\n",
|
||||
"If you have completed the [hands-on labs on image processing](https://github.com/Microsoft/CNTK/blob/release/2.7/Tutorials/CNTK_201B_CIFAR-10_ImageHandsOn.ipynb),\n",
|
||||
"you may remember that the [batch-normalization layer](https://www.cntk.ai/pythondocs/layerref.html#batchnormalization-layernormalization-stabilizer) has this form:\n",
|
||||
"```\n",
|
||||
" BatchNormalization()\n",
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@
|
|||
" print(\"Reusing locally cached:\", path)\n",
|
||||
" else:\n",
|
||||
" print(\"Starting download:\", dataPath[k])\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.6/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%dataPath[k]\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.7/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%dataPath[k]\n",
|
||||
" download(url, path)\n",
|
||||
" print(\"Download completed\")\n",
|
||||
" dataPath[k] = path"
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
" print('Already downloaded %s' % file)\n",
|
||||
" else:\n",
|
||||
" print('Downloading %s' % file)\n",
|
||||
" urlretrieve('https://github.com/Microsoft/CNTK/raw/release/2.6/Tests/EndToEndTests/Speech/Data/%s' % file, file) \n"
|
||||
" urlretrieve('https://github.com/Microsoft/CNTK/raw/release/2.7/Tests/EndToEndTests/Speech/Data/%s' % file, file) \n"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@
|
|||
" if os.path.exists(file):\n",
|
||||
" print(\"Reusing locally cached: \", file)\n",
|
||||
" else:\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.6/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.7/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n",
|
||||
" print(\"Starting download:\", file)\n",
|
||||
" download(url, file)\n",
|
||||
" print(\"Download completed\")"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ call "%VS2017INSTALLDIR%\VC\Auxiliary\build\vcvarsall.bat" amd64 -vcvars_ver=14.
|
|||
|
||||
set MSSdk=1
|
||||
set DISTUTILS_USE_SDK=1
|
||||
set CNTK_VERSION=2.6
|
||||
set CNTK_VERSION=2.7
|
||||
set CNTK_VERSION_BANNER=%CNTK_VERSION%+
|
||||
set CNTK_COMPONENT_VERSION=%CNTK_VERSION%
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче