merged from master (not yet fully building after VS 2015 transition)

.gitignore

@@ -194,6 +194,10 @@ Tests/EndToEndTests/UnitTests/MathTests/M.txt
 Tests/EndToEndTests/UnitTests/MathTests/MCPU.txt
 Tests/EndToEndTests/UnitTests/MathTests/MGPU.txt
 Tests/EndToEndTests/UnitTests/MathTests/MS.txt
+Tests/UnitTests/MathTests/M.txt
+Tests/UnitTests/MathTests/MCPU.txt
+Tests/UnitTests/MathTests/MGPU.txt
+Tests/UnitTests/MathTests/MS.txt
 
 Tests/Install/linux/BinaryDrops.tar.gz
 
@@ -221,7 +225,7 @@ bindings/python/cntk/i_plus_i_0.mod
 # CSharp bindings
 bindings/csharp/Swig/cntk_cs_wrap.h
 bindings/csharp/Swig/cntk_cs_wrap.cxx
-bindings/csharp/CSEvalV2Library/SwigProxyClasses/*.cs
+bindings/csharp/CNTKLibraryManagedDll/SwigProxyClasses/*.cs
 
 # Examples and Tutorials
 Examples/Image/DataSets/Pascal/VOC*
@@ -239,8 +243,13 @@ Examples/Image/DataSets/CIFAR-10/train_map.txt
 Examples/Image/DataSets/CIFAR-10/train_regrLabels.txt
 Examples/Image/DataSets/MNIST/Test-28x28_cntk_text.txt
 Examples/Image/DataSets/MNIST/Train-28x28_cntk_text.txt
-Examples/Image/DataSets/grocery/
-Examples/Image/PretrainedModels/
+Examples/Image/DataSets/grocery/negative/
+Examples/Image/DataSets/grocery/positive/
+Examples/Image/DataSets/grocery/testImages/
+Examples/Image/DataSets/grocery/*.txt
+Examples/Image/PretrainedModels/*.model
+Examples/Image/FeatureExtraction/*.txt
+Tests/EndToEndTests/CNTKv2Python/Examples/layerOutput.txt
 Tutorials/HelloWorld-LogisticRegression/LR.txt.p
 Tutorials/HelloWorld-LogisticRegression/Models/
 Tutorials/.ipynb_checkpoints/

CNTK.Cpp.props

@@ -23,13 +23,17 @@
     <NoOptBuild>false</NoOptBuild>
     <NoOptBuild Condition="$(Configuration.Contains('NoOpt'))">true</NoOptBuild>
 
-    <NvmlInclude>"c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\include"</NvmlInclude>
-    <NvmlLibPath>"c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib"</NvmlLibPath>
-
     <CudaVersion/>
     <CudaVersion Condition="Exists('$(CUDA_PATH_V8_0)') And '$(CudaVersion)' == ''">8.0</CudaVersion>
     <CudaVersion Condition="Exists('$(CUDA_PATH_V7_5)') And '$(CudaVersion)' == ''">7.5</CudaVersion>
-    <CudaVersion Condition="Exists('$(CUDA_PATH_V7_0)') And '$(CudaVersion)' == ''">7.0</CudaVersion>
+
+    <NvmlInclude />
+    <NvmlInclude Condition="'$(CudaVersion)' == '7.5'">"c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\include"</NvmlInclude>
+    <NvmlInclude Condition="'$(CudaVersion)' == '8.0'" />
+
+    <NvmlLibPath />
+    <NvmlLibPath Condition="'$(CudaVersion)' == '7.5'">"c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib"</NvmlLibPath>
+    <NvmlLibPath Condition="'$(CudaVersion)' == '8.0'" />
 
     <HasOpenCv>false</HasOpenCv>
     <HasOpenCv Condition="Exists('$(OPENCV_PATH)') Or Exists('$(OPENCV_PATH_V31)')">true</HasOpenCv>
@@ -55,27 +59,27 @@
   </PropertyGroup>
 
   <PropertyGroup>
-	<MathLibrary>MKL</MathLibrary>
-	<CNTKCustomMKLVersion>2</CNTKCustomMKLVersion>
-	<CNTKCustomMKLPath>$(CNTK_MKL_PATH)\$(CNTKCustomMKLVersion)</CNTKCustomMKLPath>
-	<MathIncludePath>$(CNTKCustomMKLPath)\include</MathIncludePath>
-	<MathDefine>USE_MKL</MathDefine>
+    <MathLibrary>MKL</MathLibrary>
+    <CNTKCustomMKLVersion>3</CNTKCustomMKLVersion>
+    <CNTKCustomMKLPath>$(CNTK_MKL_PATH)\$(CNTKCustomMKLVersion)</CNTKCustomMKLPath>
+    <MathIncludePath>$(CNTKCustomMKLPath)\include</MathIncludePath>
+    <MathDefine>USE_MKL</MathDefine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(CNTK_MKL_SEQUENTIAL)' != '1'">
-	<MathLibraryName>CNTK custom MKL Parallel (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
-	<MathLibraryPath>$(CNTKCustomMKLPath)\x64\parallel</MathLibraryPath>
-	<MathLinkLibrary>mkl_cntk_p.lib</MathLinkLibrary>
-	<MathDelayLoad>mkl_cntk_p.dll</MathDelayLoad>
-	<MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
-	<UnitTestDlls>$(OutDir)mkl_cntk_p.dll;$(OutDir)libiomp5md.dll;</UnitTestDlls>
+    <MathLibraryName>CNTK custom MKL Parallel (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
+    <MathLibraryPath>$(CNTKCustomMKLPath)\x64\parallel</MathLibraryPath>
+    <MathLinkLibrary>mkl_cntk_p.lib</MathLinkLibrary>
+    <MathDelayLoad>mkl_cntk_p.dll</MathDelayLoad>
+    <MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
+    <UnitTestDlls>$(OutDir)mkl_cntk_p.dll;$(OutDir)libiomp5md.dll;</UnitTestDlls>
   </PropertyGroup>
   <PropertyGroup Condition="'$(CNTK_MKL_SEQUENTIAL)' == '1'">
-	<MathLibraryName>CNTK custom MKL Sequential (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
-	<MathLibraryPath>$(CNTKCustomMKLPath)\x64\sequential</MathLibraryPath>
-	<MathLinkLibrary>mkl_cntk_s.lib</MathLinkLibrary>
-	<MathDelayLoad>mkl_cntk_s.dll</MathDelayLoad>
-	<MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
-	<UnitTestDlls>$(OutDir)mkl_cntk_s.dll;</UnitTestDlls>
+    <MathLibraryName>CNTK custom MKL Sequential (Version: $(CNTKCustomMKLVersion))</MathLibraryName>
+    <MathLibraryPath>$(CNTKCustomMKLPath)\x64\sequential</MathLibraryPath>
+    <MathLinkLibrary>mkl_cntk_s.lib</MathLinkLibrary>
+    <MathDelayLoad>mkl_cntk_s.dll</MathDelayLoad>
+    <MathPostBuildCopyPattern>$(MathLibraryPath)\*.dll</MathPostBuildCopyPattern>
+    <UnitTestDlls>$(OutDir)mkl_cntk_s.dll;</UnitTestDlls>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(UseZip)">
@@ -100,8 +104,8 @@
     <OpenCvWorld Condition="$(ReleaseBuild)">opencv_world$(OpenCvVersion)</OpenCvWorld>
     <OpenCvWorld Condition="$(DebugBuild)">opencv_world$(OpenCvVersion)d</OpenCvWorld>
     <OpenCvLib>$(OpenCvWorld).lib</OpenCvLib>
-    <OpenCvLibPath>$(OpenCvPath)\x64\vc12\lib</OpenCvLibPath>
-    <OpenCvBinPath>$(OpenCvPath)\x64\vc12\bin</OpenCvBinPath>
+    <OpenCvLibPath>$(OpenCvPath)\x64\vc14\lib</OpenCvLibPath>
+    <OpenCvBinPath>$(OpenCvPath)\x64\vc14\bin</OpenCvBinPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(HasProtobuf)">
@@ -123,12 +127,6 @@
     <CudaDlls>cublas64_75.dll;cusparse64_75.dll;curand64_75.dll;$(CudaRuntimeDll)</CudaDlls>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(CudaVersion)' == '7.0'">
-    <CudaPath>$(CUDA_PATH_V7_0)</CudaPath>
-    <CudaRuntimeDll>cudart64_70.dll</CudaRuntimeDll>
-    <CudaDlls>cublas64_70.dll;cusparse64_70.dll;curand64_70.dll;$(CudaRuntimeDll)</CudaDlls>
-  </PropertyGroup>
-
   <PropertyGroup>
     <CudaLibs>cudart.lib;cublas.lib;cusparse.lib;curand.lib</CudaLibs>
     <CudaInclude>$(CudaPath)\include</CudaInclude>
@@ -139,7 +137,7 @@
 
   <PropertyGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
     <UseDebugLibraries>$(DebugBuild)</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>$(ReleaseBuild)</WholeProgramOptimization>
     <LinkIncremental>$(DebugBuild)</LinkIncremental>

CNTK.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTK", "Source\CNTK\CNTK.vcxproj", "{E6F26F9A-FF64-4F0A-B749-CD309EE357EE}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -134,8 +134,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ComputationNetworkLib", "So
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SGDLib", "Source\SGDLib\SGDLib.vcxproj", "{DE3C54E5-D7D0-47AF-A783-DFDCE59E7937}"
 	ProjectSection(ProjectDependencies) = postProject
-		{16F14058-B116-49D9-8BA0-209F3AFFE849} = {16F14058-B116-49D9-8BA0-209F3AFFE849}
 		{4B442D34-641A-4B37-9A4B-D18DBE28A979} = {4B442D34-641A-4B37-9A4B-D18DBE28A979}
+		{16F14058-B116-49D9-8BA0-209F3AFFE849} = {16F14058-B116-49D9-8BA0-209F3AFFE849}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ParallelTraining", "ParallelTraining", "{5E666C53-2D82-49C9-9127-3FDDC321C741}"
@@ -568,6 +568,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Speech", "Speech", "{FB7AF7B9-6BEA-459F-94D9-94D53916D2B6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReaderLib", "Source\Readers\ReaderLib\ReaderLib.vcxproj", "{F0A9637C-20DA-42F0-83D4-23B4704DE602}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4B442D34-641A-4B37-9A4B-D18DBE28A979} = {4B442D34-641A-4B37-9A4B-D18DBE28A979}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AN4", "AN4", "{AC7BA8D3-B4C8-42A4-8507-B359BB6D49E8}"
 EndProject
@@ -1408,17 +1411,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RNN", "RNN", "{6730F9BE-92A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{1526F027-B007-472D-82E2-5A91340F3B62}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSharpBindings", "bindings\csharp\Swig\CSharpBindings.vcxproj", "{277EBD9D-2504-49FA-AC72-59D5515130C3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKLibraryCSBinding", "bindings\csharp\Swig\CNTKLibraryCSBinding.vcxproj", "{277EBD9D-2504-49FA-AC72-59D5515130C3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E5606ECE-48CA-4464-BB12-09D81D02B9EF} = {E5606ECE-48CA-4464-BB12-09D81D02B9EF}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSEvalV2Example", "bindings\csharp\CSEvalV2Example\CSEvalV2Example.csproj", "{3500A847-E024-4E7D-92DD-CC587C17460B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50EF9EE6-5018-453E-A063-F77044EF1A97} = {50EF9EE6-5018-453E-A063-F77044EF1A97}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSEvalV2Library", "bindings\csharp\CSEvalV2Library\CSEvalV2Library.csproj", "{50EF9EE6-5018-453E-A063-F77044EF1A97}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CNTKLibraryManagedDll", "bindings\csharp\CNTKLibraryManagedDll\CNTKLibraryManagedDll.csproj", "{50EF9EE6-5018-453E-A063-F77044EF1A97}"
 	ProjectSection(ProjectDependencies) = postProject
 		{277EBD9D-2504-49FA-AC72-59D5515130C3} = {277EBD9D-2504-49FA-AC72-59D5515130C3}
 	EndProjectSection
@@ -1453,6 +1451,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerformanceProfilerDll", "S
 		{86883653-8A61-4038-81A0-2379FAE4200A} = {86883653-8A61-4038-81A0-2379FAE4200A}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CNTKLibraryManagedExamplesTest", "Tests\EndToEndTests\EvalClientTests\CNTKLibraryManagedExamplesTest\CNTKLibraryManagedExamplesTest.csproj", "{3500A847-E024-4E7D-92DD-CC587C17460B}"
+EndProject
 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "PythonExamples", "Examples\PythonExamples.pyproj", "{292FF4EE-D9DD-4BA7-85F7-6A22148D1E01}"
 EndProject
 Global
@@ -1881,16 +1881,6 @@ Global
 		{277EBD9D-2504-49FA-AC72-59D5515130C3}.Release_NoOpt|x64.Build.0 = Release_NoOpt|x64
 		{277EBD9D-2504-49FA-AC72-59D5515130C3}.Release|x64.ActiveCfg = Release|x64
 		{277EBD9D-2504-49FA-AC72-59D5515130C3}.Release|x64.Build.0 = Release|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug|x64.ActiveCfg = Debug|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug|x64.Build.0 = Debug|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_CpuOnly|x64.ActiveCfg = Release_CpuOnly|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_NoOpt|x64.ActiveCfg = Release_NoOpt|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_NoOpt|x64.Build.0 = Release_NoOpt|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release|x64.ActiveCfg = Release|x64
-		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release|x64.Build.0 = Release|x64
 		{50EF9EE6-5018-453E-A063-F77044EF1A97}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64
 		{50EF9EE6-5018-453E-A063-F77044EF1A97}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64
 		{50EF9EE6-5018-453E-A063-F77044EF1A97}.Debug|x64.ActiveCfg = Debug|x64
@@ -1911,6 +1901,16 @@ Global
 		{4B442D34-641A-4B37-9A4B-D18DBE28A979}.Release_NoOpt|x64.Build.0 = Release_NoOpt|x64
 		{4B442D34-641A-4B37-9A4B-D18DBE28A979}.Release|x64.ActiveCfg = Release|x64
 		{4B442D34-641A-4B37-9A4B-D18DBE28A979}.Release|x64.Build.0 = Release|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug|x64.ActiveCfg = Debug|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Debug|x64.Build.0 = Debug|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_CpuOnly|x64.ActiveCfg = Release_CpuOnly|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_NoOpt|x64.ActiveCfg = Release_NoOpt|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release_NoOpt|x64.Build.0 = Release_NoOpt|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release|x64.ActiveCfg = Release|x64
+		{3500A847-E024-4E7D-92DD-CC587C17460B}.Release|x64.Build.0 = Release|x64
 		{292FF4EE-D9DD-4BA7-85F7-6A22148D1E01}.Debug_CpuOnly|x64.ActiveCfg = Debug|Any CPU
 		{292FF4EE-D9DD-4BA7-85F7-6A22148D1E01}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{292FF4EE-D9DD-4BA7-85F7-6A22148D1E01}.Release_CpuOnly|x64.ActiveCfg = Release|Any CPU
@@ -2106,14 +2106,14 @@ Global
 		{784A839C-762F-4A85-9EF1-A1E00546AD6C} = {D30B34AF-3618-4C55-900E-8F60A9F39E66}
 		{6730F9BE-92AA-45F7-9F98-CD13E725CCA9} = {784A839C-762F-4A85-9EF1-A1E00546AD6C}
 		{277EBD9D-2504-49FA-AC72-59D5515130C3} = {1526F027-B007-472D-82E2-5A91340F3B62}
-		{3500A847-E024-4E7D-92DD-CC587C17460B} = {1526F027-B007-472D-82E2-5A91340F3B62}
 		{50EF9EE6-5018-453E-A063-F77044EF1A97} = {1526F027-B007-472D-82E2-5A91340F3B62}
 		{2A95B23C-D91E-4DF9-B8F0-5E997608AB65} = {47755F2E-D674-4175-9E38-8EA053455072}
 		{FB604F98-008F-45CD-B06E-42C30E121F13} = {2A95B23C-D91E-4DF9-B8F0-5E997608AB65}
 		{5EDBCD1A-4F07-4618-84C9-FC6905A438B4} = {FB604F98-008F-45CD-B06E-42C30E121F13}
 		{39C3C8CA-9A8A-4733-ADBB-3E19D0F52528} = {2A95B23C-D91E-4DF9-B8F0-5E997608AB65}
 		{CB4566F1-6C8F-4270-83EE-F6AED84EBB2B} = {39C3C8CA-9A8A-4733-ADBB-3E19D0F52528}
 		{4B442D34-641A-4B37-9A4B-D18DBE28A979} = {DD043083-71A4-409A-AA91-F9C548DCF7EC}
+		{3500A847-E024-4E7D-92DD-CC587C17460B} = {05E45AF7-C069-4057-BC16-0A532D068CE4}
 		{292FF4EE-D9DD-4BA7-85F7-6A22148D1E01} = {47755F2E-D674-4175-9E38-8EA053455072}
 	EndGlobalSection
 EndGlobal

Dependencies/CNTKCustomMKL/build-windows.cmd

@@ -12,7 +12,7 @@ echo.
 echo Requirements:
 echo  - Intel MKL SDK installed on the machine
 echo  - MKLROOT environment variable is set to the MKL directory inside the Intel MKL SDK
-echo  - Visual Studio 2013 installed and included in the path
+echo  - Visual Studio 2015 installed and included in the path
 echo.
 
 setlocal enableextensions enabledelayedexpansion

Dependencies/CNTKCustomMKL/version.txt

@@ -1 +1 @@
-2
+3

Examples/Evaluation/CNTKAzureTutorial01/CNTKAzureTutorial01/CNTKAzureTutorial01.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -163,4 +163,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>