Bump version to 2.3.1 and update release notes.
commit b906b2e94748f0303f4e4f41e860d882ab434a57
Author: Manik Jindal <manikj@microsoft.com>
Date: Tue Dec 5 18:35:02 2017 -0800
Add whl and NuGet package links in README.md
commit 5f4ff237c5ee3a449577ec29cbf93d64273c562a
Author: Manik Jindal <manikj@microsoft.com>
Date: Tue Dec 5 09:48:37 2017 -0800
Bump version 2.3 to 2.3.1
commit 1d0f37072524ad1a6de36bedf43359e0596c7382
Author: Manik Jindal <manikj@microsoft.com>
Date: Tue Dec 5 00:26:26 2017 -0800
Add release notes
commit 78b941b3e4e8c345bd6e8e45b6180ff624756d27
Author: Manik Jindal <manikj@microsoft.com>
Date: Tue Dec 5 00:19:23 2017 -0800
Bump version from 2.3 to 2.3.1
This commit is contained in:
Manik Jindal
Родитель
c6f2f2c3d7
Коммит
95d88730b2
|
|
@ -30,7 +30,7 @@
|
|||
<HasJava>false</HasJava>
|
||||
<HasJava Condition="Exists('$(JAVA_HOME)\bin\javac.exe')">true</HasJava>
|
||||
|
||||
<CntkComponentVersion>2.3</CntkComponentVersion>
|
||||
<CntkComponentVersion>2.3.1</CntkComponentVersion>
|
||||
<CntkComponentVersion Condition="$(DebugBuild)">$(CntkComponentVersion)d</CntkComponentVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.3.0\lib\net45\x64\Cntk.Core.Managed-2.3.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.3.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.3.1\lib\net45\x64\Cntk.Core.Managed-2.3.1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -148,12 +148,12 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.1\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.1\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.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.3.1\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.1\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.3.0" targetFramework="net45" />
|
||||
<package id="CNTK.CPUOnly" version="2.3.1" 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,12 +98,12 @@
|
|||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.0\build\native\CNTK.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.1\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.1\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.CPUOnly.2.3.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.0\build\native\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.3.1\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.1\build\native\CNTK.CPUOnly.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.CPUOnly" version="2.3.0" targetFramework="native" />
|
||||
<package id="CNTK.CPUOnly" version="2.3.1" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -98,12 +98,12 @@
|
|||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.GPU.2.3.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.3.0\build\native\CNTK.GPU.targets')" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.3.1\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.3.1\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.GPU.2.3.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.3.0\build\native\CNTK.GPU.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.3.1\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.3.1\build\native\CNTK.GPU.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.GPU" version="2.3.0" targetFramework="native" />
|
||||
<package id="CNTK.GPU" version="2.3.1" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.3.0\lib\net45\x64\Cntk.Core.Managed-2.3.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.3.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.3.1\lib\net45\x64\Cntk.Core.Managed-2.3.1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -61,12 +61,12 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.1\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.1\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.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.3.1\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.1\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,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.CPUOnly" version="2.3.0" targetFramework="net45" />
|
||||
<package id="CNTK.CPUOnly" version="2.3.1" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.GPU.2.3.0\lib\net45\x64\Cntk.Core.Managed-2.3.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.3.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.GPU.2.3.1\lib\net45\x64\Cntk.Core.Managed-2.3.1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -65,12 +65,12 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.3.0\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.3.0\build\net45\CNTK.GPU.targets')" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.3.1\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.3.1\build\net45\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.GPU.2.3.0\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.3.0\build\net45\CNTK.GPU.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.3.1\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.3.1\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,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.GPU" version="2.3.0" targetFramework="net45" />
|
||||
<package id="CNTK.GPU" version="2.3.1" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -108,12 +108,12 @@
|
|||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\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\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.3.0" targetFramework="native" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.3.1" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -106,12 +106,12 @@
|
|||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\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\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.3.0" targetFramework="native" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.3.1" targetFramework="native" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -49,8 +49,8 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.3, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\lib\net45\x64\Cntk.Eval.Wrapper-2.3.dll</HintPath>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.3.1, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\lib\net45\x64\Cntk.Eval.Wrapper-2.3.1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -88,11 +88,11 @@
|
|||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\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\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.3.0" targetFramework="net45" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.3.1" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.3, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\lib\net45\x64\Cntk.Eval.Wrapper-2.3.dll</HintPath>
|
||||
<Reference Include="Cntk.Eval.Wrapper-2.3.1, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\lib\net45\x64\Cntk.Eval.Wrapper-2.3.1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -148,12 +148,12 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
|
||||
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\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\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.3.1\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.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<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.3.0" targetFramework="net45" />
|
||||
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.3.1" 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" />
|
||||
|
|
|
|||
|
|
@ -105,12 +105,12 @@
|
|||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
<Import Project="..\packages\CNTK.UWP.CPUOnly.2.3.0\build\native\CNTK.UWP.CPUOnly.targets" Condition="Exists('..\packages\CNTK.UWP.CPUOnly.2.3.0\build\native\CNTK.UWP.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.UWP.CPUOnly.2.3.1\build\native\CNTK.UWP.CPUOnly.targets" Condition="Exists('..\packages\CNTK.UWP.CPUOnly.2.3.1\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.3.0\build\native\CNTK.UWP.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.UWP.CPUOnly.2.3.0\build\native\CNTK.UWP.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.UWP.CPUOnly.2.3.1\build\native\CNTK.UWP.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.UWP.CPUOnly.2.3.1\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.3.0" targetFramework="native" />
|
||||
<package id="CNTK.UWP.CPUOnly" version="2.3.1" 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.3/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.3.1/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.
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.3.0\lib\net45\x64\Cntk.Core.Managed-2.3.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.3.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.CPUOnly.2.3.1\lib\net45\x64\Cntk.Core.Managed-2.3.1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -78,12 +78,12 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets')" />
|
||||
<Import Project="..\packages\CNTK.CPUOnly.2.3.1\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.3.1\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.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.0\build\net45\CNTK.CPUOnly.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.3.1\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.3.1\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,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.CPUOnly" version="2.3.0" targetFramework="net45" />
|
||||
<package id="CNTK.CPUOnly" version="2.3.1" targetFramework="net45" />
|
||||
</packages>
|
||||
|
|
@ -35,8 +35,8 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Cntk.Core.Managed-2.3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.GPU.2.3.0\lib\net45\x64\Cntk.Core.Managed-2.3.dll</HintPath>
|
||||
<Reference Include="Cntk.Core.Managed-2.3.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64">
|
||||
<HintPath>..\packages\CNTK.GPU.2.3.1\lib\net45\x64\Cntk.Core.Managed-2.3.1.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -79,12 +79,12 @@
|
|||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.3.0\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.3.0\build\net45\CNTK.GPU.targets')" />
|
||||
<Import Project="..\packages\CNTK.GPU.2.3.1\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.3.1\build\net45\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.GPU.2.3.0\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.3.0\build\net45\CNTK.GPU.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\CNTK.GPU.2.3.1\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.3.1\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,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CNTK.GPU" version="2.3.0" targetFramework="net45" />
|
||||
<package id="CNTK.GPU" version="2.3.1" targetFramework="net45" />
|
||||
</packages>
|
||||
2
Makefile
2
Makefile
|
|
@ -270,7 +270,7 @@ ORIGINDIR:='$$ORIGIN'
|
|||
# Components VERSION info
|
||||
########################################
|
||||
|
||||
CNTK_COMPONENT_VERSION := 2.3
|
||||
CNTK_COMPONENT_VERSION := 2.3.1
|
||||
ifeq ("$(BUILDTYPE)","debug")
|
||||
CNTK_COMPONENT_VERSION := $(CNTK_COMPONENT_VERSION)d
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -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.3/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.3.1/Tutorials/CNTK_200_GuidedTour.ipynb)"
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
|
|||
50
README.md
50
README.md
|
|
@ -2,6 +2,56 @@
|
|||
|
||||
## Latest news
|
||||
|
||||
***2017-12-05.* CNTK 2.3.1**
|
||||
Release of Cognitive Toolkit v.2.3.1.
|
||||
|
||||
CNTK support for ONNX format is now out of preview mode.
|
||||
|
||||
If you want to try ONNX, you can build from master or `pip install` one of the below wheel that matches you Python environment.
|
||||
|
||||
For Windows CPU-Only:
|
||||
* Python 2.7: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp27-cp27m-win_amd64.whl
|
||||
* Python 3.4: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp34-cp34m-win_amd64.whl
|
||||
* Python 3.5: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp35-cp35m-win_amd64.whl
|
||||
* Python 3.6: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp36-cp36m-win_amd64.whl
|
||||
|
||||
For Windows GPU:
|
||||
* Python 2.7: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp27-cp27m-win_amd64.whl
|
||||
* Python 3.4: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp34-cp34m-win_amd64.whl
|
||||
* Python 3.5: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp35-cp35m-win_amd64.whl
|
||||
* Python 3.6: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp36-cp36m-win_amd64.whl
|
||||
|
||||
For Windows GPU-1bit-SGD:
|
||||
* Python 2.7: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp27-cp27m-win_amd64.whl
|
||||
* Python 3.4: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp34-cp34m-win_amd64.whl
|
||||
* Python 3.5: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp35-cp35m-win_amd64.whl
|
||||
* Python 3.6: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp36-cp36m-win_amd64.whl
|
||||
|
||||
Linux CPU-Only:
|
||||
* Python 2.7: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp27-cp27mu-linux_x86_64.whl
|
||||
* Python 3.4: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp34-cp34m-linux_x86_64.whl
|
||||
* Python 3.5: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp35-cp35m-linux_x86_64.whl
|
||||
* Python 3.6: https://cntk.ai/PythonWheel/CPU-Only/cntk-2.3.1-cp36-cp36m-linux_x86_64.whl
|
||||
|
||||
Linux GPU:
|
||||
* Python 2.7: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp27-cp27mu-linux_x86_64.whl
|
||||
* Python 3.4: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp34-cp34m-linux_x86_64.whl
|
||||
* Python 3.5: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp35-cp35m-linux_x86_64.whl
|
||||
* Python 3.6: https://cntk.ai/PythonWheel/GPU/cntk-2.3.1-cp36-cp36m-linux_x86_64.whl
|
||||
|
||||
Linux GPU-1bit-SGD:
|
||||
* Python 2.7: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp27-cp27mu-linux_x86_64.whl
|
||||
* Python 3.4: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp34-cp34m-linux_x86_64.whl
|
||||
* Python 3.5: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp35-cp35m-linux_x86_64.whl
|
||||
* Python 3.6: https://cntk.ai/PythonWheel/GPU-1bit-SGD/cntk-2.3.1-cp36-cp36m-linux_x86_64.whl
|
||||
|
||||
You can also try one of the below NuGet package.
|
||||
* [CNTK, CPU-Only Build](https://www.nuget.org/packages/CNTK.CPUOnly/2.3.1)
|
||||
* [CNTK, GPU Build](https://www.nuget.org/packages/CNTK.GPU/2.3.1)
|
||||
* [CNTK, UWP CPU-Only Build](http://www.nuget.org/packages/CNTK.UWP.CPUOnly/2.3.1)
|
||||
* [CNTK CPU-only Model Evaluation Libraries (MKL based)](http://www.nuget.org/packages/Microsoft.Research.CNTK.CpuEval-mkl/2.3.1)
|
||||
|
||||
|
||||
***2017-11-22.* CNTK 2.3**
|
||||
Release of Cognitive Toolkit v.2.3.
|
||||
|
||||
|
|
|
|||
|
|
@ -597,7 +597,7 @@ int wmainWithBS(int argc, wchar_t* argv[]) // called from wmain which is a wrapp
|
|||
|
||||
static void PrintBanner(int argc, wchar_t* argv[], const string& timestamp)
|
||||
{
|
||||
fprintf(stderr, "CNTK 2.3+ (");
|
||||
fprintf(stderr, "CNTK 2.3.1+ (");
|
||||
#ifdef _GIT_EXIST
|
||||
fprintf(stderr, "%s %.6s, ", _BUILDBRANCH_, _BUILDSHA1_);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#define CNTK_ONNX_MODEL_VERSION 1
|
||||
const std::string CNTK_ONNX_PRODUCER_NAME = "CNTK";
|
||||
const std::string CNTK_ONNX_PRODUCER_VERSION = "2.3";
|
||||
const std::string CNTK_ONNX_PRODUCER_VERSION = "2.3.1";
|
||||
|
||||
namespace ONNXIR
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<CntkCsAssemblyVersion>2.3</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion>2.3.1</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(DebugBuild)">
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<!-- Explicitly defines the version of the dependent assemblies to avoid build errors or stale binaries. -->
|
||||
<!-- The change of CntkComponentVersion in CNTK.Common.props cannot be populated correctly without restarting VS and cleaning solution. -->
|
||||
<PropertyGroup>
|
||||
<CntkCsAssemblyVersion>2.3</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion>2.3.1</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(DebugBuild)">
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<!-- Explicitly defines the version of the dependent assemblies to avoid build errors or stale binaries -->
|
||||
<!-- The change of CntkComponentVersion in CNTK.Common.props cannot be populated correctly without restarting VS and cleaning solution. -->
|
||||
<PropertyGroup>
|
||||
<CntkCsAssemblyVersion>2.3</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion>2.3.1</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
|
|
|
|||
|
|
@ -77,10 +77,10 @@
|
|||
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
|
||||
<Content Include="Assets\StoreLogo.png" />
|
||||
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
|
||||
<Content Include="$(CNTKRoot)\$(Platform)\$(Configuration)\Cntk.Core_app-2.3$(CNTKBinSuffix).dll">
|
||||
<Content Include="$(CNTKRoot)\$(Platform)\$(Configuration)\Cntk.Core_app-2.3.1$(CNTKBinSuffix).dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</Content>
|
||||
<Content Include="$(CNTKRoot)\$(Platform)\$(Configuration)\Cntk.Math_app-2.3$(CNTKBinSuffix).dll">
|
||||
<Content Include="$(CNTKRoot)\$(Platform)\$(Configuration)\Cntk.Math_app-2.3.1$(CNTKBinSuffix).dll">
|
||||
<DeploymentContent>true</DeploymentContent>
|
||||
</Content>
|
||||
<Content Include="$(CNTKRoot)\$(Platform)\$(Configuration)\libopenblas.dll">
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
<!-- Explicitly defines the version of the dependent assemblies to avoid build errors or stale binaries -->
|
||||
<!-- The change of CntkComponentVersion in CNTK.Common.props cannot be populated correctly without restarting VS and cleaning solution. -->
|
||||
<PropertyGroup>
|
||||
<CntkCsAssemblyVersion>2.3</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion>2.3.1</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<!-- Explicitly defines the version of the dependent assemblies to avoid build errors or stale binaries -->
|
||||
<!-- The change of CntkComponentVersion in CNTK.Common.props cannot be populated correctly without restarting VS and cleaning solution. -->
|
||||
<PropertyGroup>
|
||||
<CntkCsAssemblyVersion>2.3</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion>2.3.1</CntkCsAssemblyVersion>
|
||||
<CntkCsAssemblyVersion Condition="$(DebugBuild)">$(CntkCsAssemblyVersion)d</CntkCsAssemblyVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
|
|
|
|||
|
|
@ -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.3/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.3.1/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.3/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.3.1/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.3/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.3.1/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.3/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.3.1/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.3/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.3.1/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.3/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.3.1/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.3/Tutorials/SLUHandsOn/atis.train.ctf) \n",
|
||||
"and [test](https://github.com/Microsoft/CNTK/blob/release/2.3/Tutorials/SLUHandsOn/atis.test.ctf) \n",
|
||||
"Download the ATIS [training](https://github.com/Microsoft/CNTK/blob/release/2.3.1/Tutorials/SLUHandsOn/atis.train.ctf) \n",
|
||||
"and [test](https://github.com/Microsoft/CNTK/blob/release/2.3.1/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.3/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n",
|
||||
"[slots](https://github.com/Microsoft/CNTK/blob/release/2.3/Examples/LanguageUnderstanding/ATIS/BrainScript/slots.wl)"
|
||||
"[queries](https://github.com/Microsoft/CNTK/blob/release/2.3.1/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n",
|
||||
"[slots](https://github.com/Microsoft/CNTK/blob/release/2.3.1/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.3/%s/%s?raw=true\"%(location, item['file'])\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.3.1/%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.3/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.3.1/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.3/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%dataPath[k]\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.3.1/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.3/Tests/EndToEndTests/Speech/Data/%s' % file, file) \n"
|
||||
" urlretrieve('https://github.com/Microsoft/CNTK/raw/release/2.3.1/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.3/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n",
|
||||
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.3.1/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n",
|
||||
" print(\"Starting download:\", file)\n",
|
||||
" download(url, file)\n",
|
||||
" print(\"Download completed\")"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
|
|||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("CNTKLibraryManaged-2.3")]
|
||||
[assembly: AssemblyTitle("CNTKLibraryManaged-2.3.1")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ call "%VCDIRECTORY%\..\..\VC\vcvarsall.bat" amd64
|
|||
|
||||
set MSSdk=1
|
||||
set DISTUTILS_USE_SDK=1
|
||||
set CNTK_COMPONENT_VERSION=2.3
|
||||
set CNTK_COMPONENT_VERSION=2.3.1
|
||||
|
||||
python .\setup.py build_ext --inplace --force --compiler msvc
|
||||
if errorlevel 1 exit /b 1
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# for full license information.
|
||||
# ==============================================================================
|
||||
|
||||
__version__ = '2.3+'
|
||||
__version__ = '2.3.1+'
|
||||
|
||||
import numpy as np
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ you can start using CNTK from Python right away (don't forget to ``activate`` yo
|
|||
|
||||
>>> import cntk
|
||||
>>> cntk.__version__
|
||||
'2.3+'
|
||||
'2.3.1+'
|
||||
|
||||
>>> cntk.minus([1, 2, 3], [4, 5, 6]).eval()
|
||||
array([-3., -3., -3.], dtype=float32)
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ else:
|
|||
]
|
||||
extra_link_args = []
|
||||
|
||||
# Expecting the dependent libs (libcntklibrary-2.3.so, etc.) inside
|
||||
# Expecting the dependent libs (libcntklibrary-2.3.1.so, etc.) inside
|
||||
# site-packages/cntk/libs.
|
||||
runtime_library_dirs = ['$ORIGIN/cntk/libs']
|
||||
os.environ["CXX"] = "mpic++"
|
||||
|
|
@ -178,7 +178,7 @@ if IS_PY2:
|
|||
cntk_install_requires.append('enum34>=1.1.6')
|
||||
|
||||
setup(name="cntk",
|
||||
version="2.3",
|
||||
version="2.3.1",
|
||||
url="http://cntk.ai",
|
||||
ext_modules=[cntk_module],
|
||||
packages=packages,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче