Skip to content

Commit 82b7a39

Browse files
committed
merge release 2.7
1 parent 6b72436 commit 82b7a39

File tree

38 files changed

+172
-156
lines changed

38 files changed

+172
-156
lines changed

CNTK.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<!-- CntkVersion:
3939
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. -->
4040
<!-- NOTE: Modify both CntkVersion and PublicBuild during MAJOR RELEASE -->
41-
<CntkVersion>2.6</CntkVersion>
41+
<CntkVersion>2.7</CntkVersion>
4242

4343
<!-- PublicBuild:
4444
True if build binaries are meant to shared publicly with CNTK community. -->

Examples/Evaluation/CNTKAzureTutorial01/CNTKAzureTutorial01/CNTKAzureTutorial01.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</NuGetPackageImportStamp>
2424
</PropertyGroup>
2525
<ItemGroup>
26-
<Reference Include="Cntk.Core.Managed-2.6, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
27-
<HintPath>..\packages\CNTK.CPUOnly.2.6.0\lib\net45\x64\Cntk.Core.Managed-2.6.dll</HintPath>
26+
<Reference Include="Cntk.Core.Managed-2.7, Version=1.0.0.0, Culture=neutral, PublicKeyToken=21fff2ec8197defe, processorArchitecture=AMD64">
27+
<HintPath>..\packages\CNTK.CPUOnly.2.7.0\lib\net45\x64\Cntk.Core.Managed-2.7.dll</HintPath>
2828
<Private>True</Private>
2929
</Reference>
3030
<Reference Include="Microsoft.CSharp" />
@@ -148,16 +148,16 @@
148148
</FlavorProperties>
149149
</VisualStudio>
150150
</ProjectExtensions>
151-
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
152-
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
153-
<Import Project="..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" />
151+
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
152+
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
153+
<Import Project="..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" />
154154
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
155155
<PropertyGroup>
156156
<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>
157157
</PropertyGroup>
158-
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
159-
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
160-
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets'))" />
158+
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
159+
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
160+
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets'))" />
161161
</Target>
162162
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
163163
Other similar extension points exist, see Microsoft.Common.targets.

Examples/Evaluation/CNTKAzureTutorial01/CNTKAzureTutorial01/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="net45" />
4-
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
5-
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="net45" />
3+
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="net45" />
4+
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
5+
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net45" />
77
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
88
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />

Examples/Evaluation/CNTKLibraryCPPEvalCPUOnlyExamples/CNTKLibraryCPPEvalCPUOnlyExamples.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,16 @@
9898
</ItemDefinitionGroup>
9999
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
100100
<ImportGroup Label="ExtensionTargets">
101-
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
102-
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
103-
<Import Project="..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets')" />
101+
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
102+
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
103+
<Import Project="..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets" Condition="Exists('..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets')" />
104104
</ImportGroup>
105105
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
106106
<PropertyGroup>
107107
<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>
108108
</PropertyGroup>
109-
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
110-
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
111-
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\native\CNTK.CPUOnly.targets'))" />
109+
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
110+
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
111+
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\native\CNTK.CPUOnly.targets'))" />
112112
</Target>
113113
</Project>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="native" />
4-
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
5-
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="native" />
3+
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="native" />
4+
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
5+
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="native" />
66
</packages>

Examples/Evaluation/CNTKLibraryCPPEvalGPUExamples/CNTKLibraryCPPEvalGPUExamples.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,18 @@
9898
</ItemDefinitionGroup>
9999
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
100100
<ImportGroup Label="ExtensionTargets">
101-
<Import Project="..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets')" />
102-
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" />
103-
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
104-
<Import Project="..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets')" />
101+
<Import Project="..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets" Condition="Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets')" />
102+
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" />
103+
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" />
104+
<Import Project="..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets" Condition="Exists('..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets')" />
105105
</ImportGroup>
106106
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
107107
<PropertyGroup>
108108
<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>
109109
</PropertyGroup>
110-
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.6.0\build\native\CNTK.Deps.Cuda.targets'))" />
111-
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\native\CNTK.Deps.MKL.targets'))" />
112-
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
113-
<Error Condition="!Exists('..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.6.0\build\native\CNTK.GPU.targets'))" />
110+
<Error Condition="!Exists('..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.Cuda.2.7.0\build\native\CNTK.Deps.Cuda.targets'))" />
111+
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\native\CNTK.Deps.MKL.targets'))" />
112+
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\native\CNTK.Deps.OpenCV.Zip.targets'))" />
113+
<Error Condition="!Exists('..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.GPU.2.7.0\build\native\CNTK.GPU.targets'))" />
114114
</Target>
115115
</Project>
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CNTK.Deps.Cuda" version="2.6.0" targetFramework="native" />
4-
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="native" />
5-
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="native" />
6-
<package id="CNTK.GPU" version="2.6.0" targetFramework="native" />
3+
<package id="CNTK.Deps.Cuda" version="2.7.0" targetFramework="native" />
4+
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="native" />
5+
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="native" />
6+
<package id="CNTK.GPU" version="2.7.0" targetFramework="native" />
77
</packages>

Examples/Evaluation/CNTKLibraryCSEvalCPUOnlyExamples/CNTKLibraryCSEvalCPUOnlyExamples.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
<None Include="packages.config" />
6060
</ItemGroup>
6161
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
62-
<Import Project="..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" />
63-
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
62+
<Import Project="..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets" Condition="Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" />
63+
<Import Project="..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets" Condition="Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" />
6464
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
6565
<PropertyGroup>
6666
<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>
6767
</PropertyGroup>
68-
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.6.0\build\net45\CNTK.Deps.MKL.targets'))" />
69-
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.6.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
70-
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.6.0\build\net45\CNTK.CPUOnly.targets'))" />
68+
<Error Condition="!Exists('..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.MKL.2.7.0\build\net45\CNTK.Deps.MKL.targets'))" />
69+
<Error Condition="!Exists('..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.Deps.OpenCV.Zip.2.7.0\build\net45\CNTK.Deps.OpenCV.Zip.targets'))" />
70+
<Error Condition="!Exists('..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CNTK.CPUOnly.2.7.0\build\net45\CNTK.CPUOnly.targets'))" />
7171
</Target>
7272
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7373
Other similar extension points exist, see Microsoft.Common.targets.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CNTK.CPUOnly" version="2.6.0" targetFramework="net45" />
4-
<package id="CNTK.Deps.MKL" version="2.6.0" targetFramework="net45" />
5-
<package id="CNTK.Deps.OpenCV.Zip" version="2.6.0" targetFramework="net45" />
3+
<package id="CNTK.CPUOnly" version="2.7.0" targetFramework="net45" />
4+
<package id="CNTK.Deps.MKL" version="2.7.0" targetFramework="net45" />
5+
<package id="CNTK.Deps.OpenCV.Zip" version="2.7.0" targetFramework="net45" />
66
</packages>

0 commit comments

Comments
 (0)