microsoft
/
CNTK
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bump release version to 2.5.1

This commit is contained in:
Thiago Crepaldi 2018-04-13 13:16:55 -07:00
Родитель 78a5ff38a6
Коммит e2375594e0
41 изменённых файлов: 138 добавлений и 138 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
CNTK.Common.props
Просмотреть файл

@ -35,7 +35,7 @@
<!-- CntkVersion: <!-- 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. --> 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 --> <!-- NOTE: Modify both CntkVersion and PublicBuild during MAJOR RELEASE -->
<CntkVersion>2.5</CntkVersion> <CntkVersion>2.5.1</CntkVersion>
<!-- PublicBuild: <!-- PublicBuild:
True if build binaries are meant to shared publicly with CNTK community. --> True if build binaries are meant to shared publicly with CNTK community. -->

16
Examples/Evaluation/CNTKAzureTutorial01/CNTKAzureTutorial01/CNTKAzureTutorial01.csproj
Просмотреть файл

@ -23,8 +23,8 @@
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cntk.Core.Managed-2.5, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64"> <Reference Include="Cntk.Core.Managed-2.5.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
<HintPath>..\packages\CNTK.CPUOnly.2.5.0\lib\net45\x64\Cntk.Core.Managed-2.5.dll</HintPath> <HintPath>..\packages\CNTK.CPUOnly.2.5.1\lib\net45\x64\Cntk.Core.Managed-2.5.1.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -148,16 +148,16 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" /> <Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets')" /> <Import Project="..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

6
Examples/Evaluation/CNTKAzureTutorial01/CNTKAzureTutorial01/packages.config
Просмотреть файл

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.CPUOnly" version="2.5.0" targetFramework="net45" /> <package id="CNTK.CPUOnly" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.OpenCV.Zip" version="2.5.1" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="5.2.3" 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.Client" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" /> <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />

12
Examples/Evaluation/CNTKLibraryCPPEvalCPUOnlyExamples/CNTKLibraryCPPEvalCPUOnlyExamples.vcxproj
Просмотреть файл

@ -99,16 +99,16 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" /> <Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.5.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.0\build\native\CNTK.CPUOnly.targets')" /> <Import Project="..\packages\CNTK.CPUOnly.2.5.1\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.1\build\native\CNTK.CPUOnly.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.0\build\native\CNTK.CPUOnly.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.1\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.1\build\native\CNTK.CPUOnly.targets'))" />
</Target> </Target>
</Project> </Project>

6
Examples/Evaluation/CNTKLibraryCPPEvalCPUOnlyExamples/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.CPUOnly" version="2.5.0" targetFramework="native" /> <package id="CNTK.CPUOnly" version="2.5.1" targetFramework="native" />
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="native" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="native" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.5.0" targetFramework="native" /> <package id="CNTK.Deps.OpenCV.Zip" version="2.5.1" targetFramework="native" />
</packages> </packages>

16
Examples/Evaluation/CNTKLibraryCPPEvalGPUExamples/CNTKLibraryCPPEvalGPUExamples.vcxproj
Просмотреть файл

@ -99,18 +99,18 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\CNTK.Deps.Cuda.2.5.0\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.5.0\build\native\CNTK.Deps.Cuda.targets')" /> <Import Project="..\packages\CNTK.Deps.Cuda.2.5.1\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.5.1\build\native\CNTK.Deps.Cuda.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" /> <Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.GPU.2.5.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.5.0\build\native\CNTK.GPU.targets')" /> <Import Project="..\packages\CNTK.GPU.2.5.1\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.5.1\build\native\CNTK.GPU.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.5.0\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.5.0\build\native\CNTK.Deps.Cuda.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.5.1\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.5.1\build\native\CNTK.Deps.Cuda.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.GPU.2.5.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.5.0\build\native\CNTK.GPU.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.GPU.2.5.1\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.5.1\build\native\CNTK.GPU.targets'))" />
</Target> </Target>
</Project> </Project>

8
Examples/Evaluation/CNTKLibraryCPPEvalGPUExamples/packages.config
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.Deps.Cuda" version="2.5.0" targetFramework="native" /> <package id="CNTK.Deps.Cuda" version="2.5.1" targetFramework="native" />
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="native" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="native" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.5.0" targetFramework="native" /> <package id="CNTK.Deps.OpenCV.Zip" version="2.5.1" targetFramework="native" />
<package id="CNTK.GPU" version="2.5.0" targetFramework="native" /> <package id="CNTK.GPU" version="2.5.1" targetFramework="native" />
</packages> </packages>

16
Examples/Evaluation/CNTKLibraryCSEvalCPUOnlyExamples/CNTKLibraryCSEvalCPUOnlyExamples.csproj
Просмотреть файл

@ -39,8 +39,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cntk.Core.Managed-2.5, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64"> <Reference Include="Cntk.Core.Managed-2.5.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
<HintPath>..\packages\CNTK.CPUOnly.2.5.0\lib\net45\x64\Cntk.Core.Managed-2.5.dll</HintPath> <HintPath>..\packages\CNTK.CPUOnly.2.5.1\lib\net45\x64\Cntk.Core.Managed-2.5.1.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -61,16 +61,16 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" /> <Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets')" /> <Import Project="..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

6
Examples/Evaluation/CNTKLibraryCSEvalCPUOnlyExamples/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.CPUOnly" version="2.5.0" targetFramework="net45" /> <package id="CNTK.CPUOnly" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.OpenCV.Zip" version="2.5.1" targetFramework="net45" />
</packages> </packages>

20
Examples/Evaluation/CNTKLibraryCSEvalGPUExamples/CNTKLibraryCSEvalGPUExamples.csproj
Просмотреть файл

@ -39,8 +39,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cntk.Core.Managed-2.5, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64"> <Reference Include="Cntk.Core.Managed-2.5.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64">
<HintPath>..\packages\CNTK.GPU.2.5.0\lib\net45\x64\Cntk.Core.Managed-2.5.dll</HintPath> <HintPath>..\packages\CNTK.GPU.2.5.1\lib\net45\x64\Cntk.Core.Managed-2.5.1.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -65,18 +65,18 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets')" /> <Import Project="..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" /> <Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets')" /> <Import Project="..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

8
Examples/Evaluation/CNTKLibraryCSEvalGPUExamples/packages.config
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.Deps.Cuda" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.Cuda" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.OpenCV.Zip" version="2.5.1" targetFramework="net45" />
<package id="CNTK.GPU" version="2.5.0" targetFramework="net45" /> <package id="CNTK.GPU" version="2.5.1" targetFramework="net45" />
</packages> </packages>

8
Examples/Evaluation/LegacyEvalDll/CPPEvalClient/CPPEvalClient.vcxproj
Просмотреть файл

@ -109,14 +109,14 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" /> <Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" /> <Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
</Target> </Target>
</Project> </Project>

4
Examples/Evaluation/LegacyEvalDll/CPPEvalClient/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="native" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="native" />
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.0" targetFramework="native" /> <package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.1" targetFramework="native" />
</packages> </packages>

8
Examples/Evaluation/LegacyEvalDll/CPPEvalExtendedClient/CPPEvalExtendedClient.vcxproj
Просмотреть файл

@ -107,14 +107,14 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" /> <Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\native\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\native\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" /> <Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\native\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
</Target> </Target>
</Project> </Project>

4
Examples/Evaluation/LegacyEvalDll/CPPEvalExtendedClient/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="native" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="native" />
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.0" targetFramework="native" /> <package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.1" targetFramework="native" />
</packages> </packages>

12
Examples/Evaluation/LegacyEvalDll/CSEvalClient/CSEvalClient.csproj
Просмотреть файл

@ -49,8 +49,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cntk.Eval.Wrapper-2.5, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64"> <Reference Include="Cntk.Eval.Wrapper-2.5.1, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\lib\net45\x64\Cntk.Eval.Wrapper-2.5.dll</HintPath> <HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\lib\net45\x64\Cntk.Eval.Wrapper-2.5.1.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -88,13 +88,13 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" /> <Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" /> <Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
</Target> </Target>
</Project> </Project>

4
Examples/Evaluation/LegacyEvalDll/CSEvalClient/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="net45" />
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.0" targetFramework="net45" /> <package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.1" targetFramework="net45" />
</packages> </packages>

12
Examples/Evaluation/LegacyEvalDll/EvalDll_AzureTutorial/EvalDll_AzureTutorial/EvalDll_AzureTutorial.csproj
Просмотреть файл

@ -23,8 +23,8 @@
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cntk.Eval.Wrapper-2.5, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64"> <Reference Include="Cntk.Eval.Wrapper-2.5.1, Version=0.0.0.0, Culture=neutral, PublicKeyToken=52681d72504348ec, processorArchitecture=AMD64">
<HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\lib\net45\x64\Cntk.Eval.Wrapper-2.5.dll</HintPath> <HintPath>..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\lib\net45\x64\Cntk.Eval.Wrapper-2.5.1.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -148,14 +148,14 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" /> <Import Project="..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets" Condition="Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.0\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" /> <Error Condition="!Exists('..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Research.CNTK.CpuEval-mkl.2.5.1\build\net45\Microsoft.Research.CNTK.CpuEval-mkl.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

4
Examples/Evaluation/LegacyEvalDll/EvalDll_AzureTutorial/EvalDll_AzureTutorial/packages.config
Просмотреть файл

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="5.2.3" 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.Client" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Core" 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.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.0" targetFramework="net45" /> <package id="Microsoft.Research.CNTK.CpuEval-mkl" version="2.5.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.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="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Swashbuckle" version="5.3.1" targetFramework="net45" /> <package id="Swashbuckle" version="5.3.1" targetFramework="net45" />

4
Examples/Evaluation/UWPImageRecognition/ImageRecognizerLib/ImageRecognizerLib.vcxproj
Просмотреть файл

@ -105,12 +105,12 @@
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\CNTK.UWP.CPUOnly.2.5.0\build\native\CNTK.UWP.CPUOnly.targets" Condition="Exists('..\packages\CNTK.UWP.CPUOnly.2.5.0\build\native\CNTK.UWP.CPUOnly.targets')" /> <Import Project="..\packages\CNTK.UWP.CPUOnly.2.5.1\build\native\CNTK.UWP.CPUOnly.targets" Condition="Exists('..\packages\CNTK.UWP.CPUOnly.2.5.1\build\native\CNTK.UWP.CPUOnly.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.UWP.CPUOnly.2.5.0\build\native\CNTK.UWP.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.UWP.CPUOnly.2.5.0\build\native\CNTK.UWP.CPUOnly.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.UWP.CPUOnly.2.5.1\build\native\CNTK.UWP.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.UWP.CPUOnly.2.5.1\build\native\CNTK.UWP.CPUOnly.targets'))" />
</Target> </Target>
</Project> </Project>

2
Examples/Evaluation/UWPImageRecognition/ImageRecognizerLib/packages.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.UWP.CPUOnly" version="2.5.0" targetFramework="native" /> <package id="CNTK.UWP.CPUOnly" version="2.5.1" targetFramework="native" />
</packages> </packages>

2
Examples/Text/WordLMWithSampledSoftmax/README.md
Просмотреть файл

@ -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. 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. 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.5/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.5.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. 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. The real perf gains will show up with larger vocabularies.

16
Examples/TrainingCSharp/CSTrainingCPUOnlyExamples/CSTrainingCPUOnlyExamples.csproj
Просмотреть файл

@ -34,8 +34,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cntk.Core.Managed-2.5, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64"> <Reference Include="Cntk.Core.Managed-2.5.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
<HintPath>..\packages\CNTK.CPUOnly.2.5.0\lib\net45\x64\Cntk.Core.Managed-2.5.dll</HintPath> <HintPath>..\packages\CNTK.CPUOnly.2.5.1\lib\net45\x64\Cntk.Core.Managed-2.5.1.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -78,16 +78,16 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" /> <Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets')" /> <Import Project="..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.0\build\net45\CNTK.CPUOnly.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.5.1\build\net45\CNTK.CPUOnly.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

6
Examples/TrainingCSharp/CSTrainingCPUOnlyExamples/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.CPUOnly" version="2.5.0" targetFramework="net45" /> <package id="CNTK.CPUOnly" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.OpenCV.Zip" version="2.5.1" targetFramework="net45" />
</packages> </packages>

20
Examples/TrainingCSharp/CSTrainingGPUExamples/CSTrainingGPUExamples.csproj
Просмотреть файл

@ -35,8 +35,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Cntk.Core.Managed-2.5, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64"> <Reference Include="Cntk.Core.Managed-2.5.1, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a82c1f3f67b62253, processorArchitecture=AMD64">
<HintPath>..\packages\CNTK.GPU.2.5.0\lib\net45\x64\Cntk.Core.Managed-2.5.dll</HintPath> <HintPath>..\packages\CNTK.GPU.2.5.1\lib\net45\x64\Cntk.Core.Managed-2.5.1.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -79,18 +79,18 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets')" /> <Import Project="..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets')" />
<Import Project="..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" /> <Import Project="..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" />
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" /> <Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
<Import Project="..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets')" /> <Import Project="..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.5.0\build\net45\CNTK.Deps.Cuda.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.5.1\build\net45\CNTK.Deps.Cuda.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.0\build\net45\CNTK.Deps.MKL.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.5.1\build\net45\CNTK.Deps.MKL.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.5.1\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
<Error Condition="!Exists('..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.5.0\build\net45\CNTK.GPU.targets'))" /> <Error Condition="!Exists('..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.5.1\build\net45\CNTK.GPU.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

8
Examples/TrainingCSharp/CSTrainingGPUExamples/packages.config
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CNTK.Deps.Cuda" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.Cuda" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.MKL" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.MKL" version="2.5.1" targetFramework="net45" />
<package id="CNTK.Deps.OpenCV.Zip" version="2.5.0" targetFramework="net45" /> <package id="CNTK.Deps.OpenCV.Zip" version="2.5.1" targetFramework="net45" />
<package id="CNTK.GPU" version="2.5.0" targetFramework="net45" /> <package id="CNTK.GPU" version="2.5.1" targetFramework="net45" />
</packages> </packages>

2
Manual/Manual_How_to_train_using_declarative_and_imperative_API.ipynb
Просмотреть файл

@ -481,7 +481,7 @@
"### Testing\n", "### 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", "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", "\n",
"For more advanced scenarios of use Function.train please see [Tutorial 200](https://github.com/Microsoft/CNTK/blob/release/2.5/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.5.1/Tutorials/CNTK_200_GuidedTour.ipynb)"
] ]
} }
], ],

2
Tutorials/CNTK_101_LogisticRegression.ipynb
Просмотреть файл

@ -21,7 +21,7 @@
"\n", "\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", "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", "\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.5/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.5.1/Tutorials/HelloWorld-LogisticRegression). \n",
"\n", "\n",
"## Introduction\n", "## Introduction\n",
"\n", "\n",

2
Tutorials/CNTK_102_FeedForward.ipynb
Просмотреть файл

@ -864,7 +864,7 @@
"source": [ "source": [
"**Code link**\n", "**Code link**\n",
"\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.5/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.5.1/Tutorials/NumpyInterop/FeedForwardNet.py) example."
] ]
} }
], ],

2
Tutorials/CNTK_103B_MNIST_LogisticRegression.ipynb
Просмотреть файл

@ -23,7 +23,7 @@
"\n", "\n",
"We assume that you have successfully completed CNTK 103 Part A.\n", "We assume that you have successfully completed CNTK 103 Part A.\n",
"\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.5/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.5.1/Examples/Image/GettingStarted)\n",
"\n", "\n",
"## Introduction\n", "## Introduction\n",
"\n", "\n",

4
Tutorials/CNTK_103C_MNIST_MultiLayerPerceptron.ipynb
Просмотреть файл

@ -23,7 +23,7 @@
"\n", "\n",
"We assume that you have successfully completed CNTK 103 Part A.\n", "We assume that you have successfully completed CNTK 103 Part A.\n",
"\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.5/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.5.1/Examples/Image/GettingStarted)\n",
"\n", "\n",
"## Introduction\n", "## Introduction\n",
"\n", "\n",
@ -762,7 +762,7 @@
"source": [ "source": [
"**Code link**\n", "**Code link**\n",
"\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.5/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.5.1/Examples/Image/Classification/MLP/Python) example."
] ]
} }
], ],

2
Tutorials/CNTK_103D_MNIST_ConvolutionalNeuralNetwork.ipynb
Просмотреть файл

@ -23,7 +23,7 @@
"\n", "\n",
"We assume that you have successfully completed CNTK 103 Part A (MNIST Data Loader).\n", "We assume that you have successfully completed CNTK 103 Part A (MNIST Data Loader).\n",
"\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.5/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.5.1/Examples/Image/GettingStarted)\n",
"\n", "\n",
"## Introduction\n", "## Introduction\n",
"\n", "\n",

12
Tutorials/CNTK_202_Language_Understanding.ipynb
Просмотреть файл

@ -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", "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", "\n",
"**Fallback manual instructions**\n", "**Fallback manual instructions**\n",
"Download the ATIS [training](https://github.com/Microsoft/CNTK/blob/release/2.5/Tutorials/SLUHandsOn/atis.train.ctf) \n", "Download the ATIS [training](https://github.com/Microsoft/CNTK/blob/release/2.5.1/Tutorials/SLUHandsOn/atis.train.ctf) \n",
"and [test](https://github.com/Microsoft/CNTK/blob/release/2.5/Tutorials/SLUHandsOn/atis.test.ctf) \n", "and [test](https://github.com/Microsoft/CNTK/blob/release/2.5.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", "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", "predicting on new sentences you will also need the vocabulary files for \n",
"[queries](https://github.com/Microsoft/CNTK/blob/release/2.5/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n", "[queries](https://github.com/Microsoft/CNTK/blob/release/2.5.1/Examples/LanguageUnderstanding/ATIS/BrainScript/query.wl) and\n",
"[slots](https://github.com/Microsoft/CNTK/blob/release/2.5/Examples/LanguageUnderstanding/ATIS/BrainScript/slots.wl)" "[slots](https://github.com/Microsoft/CNTK/blob/release/2.5.1/Examples/LanguageUnderstanding/ATIS/BrainScript/slots.wl)"
] ]
}, },
{ {
@ -106,7 +106,7 @@
" print(\"Reusing locally cached:\", item['file'])\n", " print(\"Reusing locally cached:\", item['file'])\n",
" else:\n", " else:\n",
" print(\"Starting download:\", item['file'])\n", " print(\"Starting download:\", item['file'])\n",
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.5/%s/%s?raw=true\"%(location, item['file'])\n", " url = \"https://github.com/Microsoft/CNTK/blob/release/2.5.1/%s/%s?raw=true\"%(location, item['file'])\n",
" download(url, item['file'])\n", " download(url, item['file'])\n",
" print(\"Download completed\")\n" " print(\"Download completed\")\n"
] ]
@ -845,7 +845,7 @@
"> Note: training with Batch Normalization is currently only supported on GPU.\n", "> Note: training with Batch Normalization is currently only supported on GPU.\n",
"\n", "\n",
"So your task will be to insert batch-normalization layers before and after the recurrent LSTM layer.\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.5/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.5.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", "you may remember that the [batch-normalization layer](https://www.cntk.ai/pythondocs/layerref.html#batchnormalization-layernormalization-stabilizer) has this form:\n",
"```\n", "```\n",
" BatchNormalization()\n", " BatchNormalization()\n",

2
Tutorials/CNTK_204_Sequence_To_Sequence.ipynb
Просмотреть файл

@ -259,7 +259,7 @@
" print(\"Reusing locally cached:\", path)\n", " print(\"Reusing locally cached:\", path)\n",
" else:\n", " else:\n",
" print(\"Starting download:\", dataPath[k])\n", " print(\"Starting download:\", dataPath[k])\n",
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.5/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%dataPath[k]\n", " url = \"https://github.com/Microsoft/CNTK/blob/release/2.5.1/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%dataPath[k]\n",
" download(url, path)\n", " download(url, path)\n",
" print(\"Download completed\")\n", " print(\"Download completed\")\n",
" dataPath[k] = path" " dataPath[k] = path"

2
Tutorials/CNTK_208_Speech_Connectionist_Temporal_Classification.ipynb
Просмотреть файл

@ -61,7 +61,7 @@
" print('Already downloaded %s' % file)\n", " print('Already downloaded %s' % file)\n",
" else:\n", " else:\n",
" print('Downloading %s' % file)\n", " print('Downloading %s' % file)\n",
" urlretrieve('https://github.com/Microsoft/CNTK/raw/release/2.5/Tests/EndToEndTests/Speech/Data/%s' % file, file) \n" " urlretrieve('https://github.com/Microsoft/CNTK/raw/release/2.5.1/Tests/EndToEndTests/Speech/Data/%s' % file, file) \n"
] ]
}, },
{ {

2
Tutorials/CNTK_599A_Sequence_To_Sequence.ipynb
Просмотреть файл

@ -249,7 +249,7 @@
" if os.path.exists(file):\n", " if os.path.exists(file):\n",
" print(\"Reusing locally cached: \", file)\n", " print(\"Reusing locally cached: \", file)\n",
" else:\n", " else:\n",
" url = \"https://github.com/Microsoft/CNTK/blob/release/2.5/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n", " url = \"https://github.com/Microsoft/CNTK/blob/release/2.5.1/Examples/SequenceToSequence/CMUDict/Data/%s?raw=true\"%file\n",
" print(\"Starting download:\", file)\n", " print(\"Starting download:\", file)\n",
" download(url, file)\n", " download(url, file)\n",
" print(\"Download completed\")" " print(\"Download completed\")"

2
bindings/csharp/CNTKLibraryManagedDll/Properties/AssemblyInfo.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("CNTKLibraryManaged-2.5")] [assembly: AssemblyTitle("CNTKLibraryManaged-2.5.1")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]

2
bindings/java/Swig/pom.xml
Просмотреть файл

@ -6,7 +6,7 @@
<groupId>com.microsoft.cntk</groupId> <groupId>com.microsoft.cntk</groupId>
<artifactId>cntk</artifactId> <artifactId>cntk</artifactId>
<version>2.5</version> <version>2.5.1</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Microsoft Cognitive Toolkit</name> <name>Microsoft Cognitive Toolkit</name>

2
bindings/python/build.bat
Просмотреть файл

@ -18,7 +18,7 @@ call "%VS2017INSTALLDIR%\VC\Auxiliary\build\vcvarsall.bat" amd64 -vcvars_ver=14.
set MSSdk=1 set MSSdk=1
set DISTUTILS_USE_SDK=1 set DISTUTILS_USE_SDK=1
set CNTK_VERSION=2.5 set CNTK_VERSION=2.5.1
set CNTK_VERSION_BANNER=%CNTK_VERSION%+ set CNTK_VERSION_BANNER=%CNTK_VERSION%+
set CNTK_COMPONENT_VERSION=%CNTK_VERSION% set CNTK_COMPONENT_VERSION=%CNTK_VERSION%

6
bindings/python/doc/gettingstarted.rst
Просмотреть файл

@ -29,7 +29,7 @@ more common case) is as follows:
In the above example we are first setting up two input variables with shape ``(1, 2)``. We then setup a ``squared_error`` node with those two variables as In the above example we are first setting up two input variables with shape ``(1, 2)``. We then setup a ``squared_error`` node with those two variables as
inputs. Within the ``eval()`` method we can setup the input-mapping of the data for those two variables. In this case we pass in two numpy arrays. inputs. Within the ``eval()`` method we can setup the input-mapping of the data for those two variables. In this case we pass in two numpy arrays.
The squared error is then of course ``(2.5)**2 + (1-6)**2 = 29``. The squared error is then of course ``(2.5.1)**2 + (1-6)**2 = 29``.
Most of the data containers like parameters, constants, values, etc. implement Most of the data containers like parameters, constants, values, etc. implement
the asarray() method, which returns a NumPy interface. the asarray() method, which returns a NumPy interface.
@ -86,8 +86,8 @@ Running ``python simplenet.py`` (using the correct python environment) will gene
0.656 0.626 1575 0.656 0.626 1575
0.59 0.525 3175 0.59 0.525 3175
0.474 0.358 6375 0.474 0.358 6375
0.359 0.245 12775 0.359 0.2.5.1 12775
0.29 0.221 25575 0.29 0.221 2.5.175
error rate on an unseen minibatch: 0.0 error rate on an unseen minibatch: 0.0

2
configure поставляемый
Просмотреть файл

@ -20,7 +20,7 @@ enable_java=
# cntk build version # cntk build version
# Modify both of the following during major release # Modify both of the following during major release
default_build_version="2.5" default_build_version="2.5.1"
default_build_public="no" default_build_public="no"
build_version=$default_build_version build_version=$default_build_version
build_public=$default_build_public build_public=$default_build_public