rename project files, address CR comments

CNTK.sln

@@ -1141,9 +1141,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedEvalTests", "Tests\U
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Evaluation", "Evaluation", "{3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSEvalClient-FromCntkSln", "Examples\Evaluation\CSEvalClient-FromCntkSln\CSEvalClient-FromCntkSln.csproj", "{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSEvalClient-CntkSln", "Examples\Evaluation\CSEvalClient-CntkSln\CSEvalClient-CntkSln.csproj", "{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPPEvalClient-FromCntkSln", "Examples\Evaluation\CPPEvalClient-FromCntkSln\CPPEvalClient-FromCntkSln.vcxproj", "{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPPEvalClient-CntkSln", "Examples\Evaluation\CPPEvalClient-CntkSln\CPPEvalClient-CntkSln.vcxproj", "{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {482999D1-B7E2-466E-9F8D-2119F93EAFD9}
 	EndProjectSection

Examples/Evaluation/CPPEvalClient-FromCntkSln/CPPEvalClient-FromCntkSln.vcxproj → Examples/Evaluation/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj

@@ -21,8 +21,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>CPPEvalClient-FromCntkSln</RootNamespace>
-    <ProjectName>CPPEvalClient-FromCntkSln</ProjectName>
+    <RootNamespace>CPPEvalClient-CntkSln</RootNamespace>
+    <ProjectName>CPPEvalClient-CntkSln</ProjectName>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\CNTK.Cpp.props" />
   <PropertyGroup Condition="$(DebugBuild)" Label="Configuration">
@@ -52,7 +52,7 @@
   <PropertyGroup>
     <!-- TODO intentional for all? -->
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>CPPEvalClient-FromCntkSln</TargetName>
+    <TargetName>CPPEvalClient-CntkSln</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>

Examples/Evaluation/CPPEvalClient-CntkSln/README.md

@@ -0,0 +1 @@
+This folder contains the VC++ project file used by cntk.sln to build CPPEvalClient.exe. The C++ source code used by the project is available in ..\CPPEvalClient.

Examples/Evaluation/CPPEvalClient/CPPEvalClient.cpp

@@ -58,8 +58,8 @@ int main(int argc, char* argv[])
     struct stat statBuf;
     if (stat(modelFilePath.c_str(), &statBuf) != 0)
     {
-        printf("Error: The model %s does not exist. Please run the example in <CNTK>/Examples/Image/MNIST to create the model.\n", modelFilePath.c_str());
-        exit(1);
+        fprintf(stderr, "Error: The model %s does not exist. Please follow instructions in README.md in <CNTK>/Examples/Image/MNIST to create the model.\n", modelFilePath.c_str());
+        return(1);
     }
 
     GetEvalF(&model);    

Examples/Evaluation/CSEvalClient-FromCntkSln/CSEvalClient-FromCntkSln.csproj → Examples/Evaluation/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.MSR.CNTK.Extensibility.Managed.CSEvalClientFromCntkSln</RootNamespace>
-    <AssemblyName>CSEvalClient-FromCntkSln</AssemblyName>
+    <RootNamespace>Microsoft.MSR.CNTK.Extensibility.Managed.CSEvalClientCntkSln</RootNamespace>
+    <AssemblyName>CSEvalClient-CntkSln</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

Examples/Evaluation/CSEvalClient-CntkSln/README.md

@@ -0,0 +1 @@
+This folder contains the C# project file used by cntk.sln to build CSEvalClient.exe. The C# source code used by the project is available in ..\CSEvalClient.

Examples/Evaluation/CSEvalClient/Program.cs

@@ -112,7 +112,7 @@ private static void EvaluateModelSingleLayer()
                     string modelFilePath = Path.Combine(Environment.CurrentDirectory, @"..\Output\Models\01_OneHidden");
                     if (!File.Exists(modelFilePath))
                     {
-                        Console.WriteLine("Error: The model {0} does not exist. Please run the example in <CNTK>/Examples/Image/MNIST to create the model.", modelFilePath);
+                        Console.WriteLine("Error: The model {0} does not exist. Please follow instructions in README.md in <CNTK>/Examples/Image/MNIST to create the model.", modelFilePath);
                         throw new FileNotFoundException(string.Format("File {0} not found.", modelFilePath));
                     }
 
@@ -167,7 +167,7 @@ private static void EvaluateModelMultipleLayers()
                     string modelFilePath = Path.Combine(Environment.CurrentDirectory, @"..\Output\Models\01_OneHidden");
                     if (!File.Exists(modelFilePath))
                     {
-                        Console.WriteLine("Error: The model {0} does not exist. Please run the example in <CNTK>/Examples/Image/MNIST to create the model.", modelFilePath);
+                        Console.WriteLine("Error: The model {0} does not exist. Please follow instructions in README.md in <CNTK>/Examples/Image/MNIST to create the model.", modelFilePath);
                         throw new FileNotFoundException(string.Format("File {0} not found.", modelFilePath));
                     }
 
@@ -379,7 +379,7 @@ private static void EvaluateMultipleModels()
             string modelFilePath = Path.Combine(Environment.CurrentDirectory, @"..\Output\Models\02_Convolution");
             if (!File.Exists(modelFilePath))
             {
-                Console.WriteLine("Error: The model {0} does not exist. Please run the example in <CNTK>/Examples/Image/MNIST to create the model.", modelFilePath);
+                Console.WriteLine("Error: The model {0} does not exist. Please follow instructions in README.md in <CNTK>/Examples/Image/MNIST to create the model.", modelFilePath);
                 throw new FileNotFoundException(string.Format("File {0} not found.", modelFilePath));
             }
 
@@ -389,7 +389,7 @@ private static void EvaluateMultipleModels()
             string testfile = Path.Combine(Environment.CurrentDirectory, @"Test-28x28_cntk_text.txt");
             if (!File.Exists(testfile))
             {
-                Console.WriteLine("Error: The test file {0} does not exist. Please read README.md in <CNTK>/Examples/Image/MNIST to download the data file", testfile);
+                Console.WriteLine("Error: The test file {0} does not exist. Please follow instructions in README.md in <CNTK>/Examples/Image/MNIST to download the data.", testfile);
                 throw new FileNotFoundException(string.Format("File {0} not found.", testfile));
             }
 

Examples/Evaluation/README.md

@@ -1,8 +1,8 @@
 #EvalClients
 
-Thefolder contains examples using the CNTK evaluation library. Please note that only 64-bit target is supported by CNTK evaluation library.
--CPPEvalClient:it is C++ example code and VS C++ project file
--CSEvalClient:it is C# example code and VS C# project file
--EvalClients.sln:the VS solution file to build examples in the CNTK binary download package. It creates 2 binaries in the directory $(SolutionDir)..\..\x64\:
-*CPPEvalClient.$(Configuration)\CPPEvalClient.exe: the C++ example executable. Only the release configuraiton is supported by the CNTK binary download. To start the example, please first include the directory containing CNTK dependent dlls, usually $(SolutionDir)..\..\cntk, in the PATH environment variable.  
-*CSEvalClient.$(Configuration)\CSEvalClient.exe: the C# example executable.
+The folder contains some examples using the CNTK evaluation library. Please note that only 64-bit target is supported by CNTK evaluation library.
+-CPPEvalClient: demonstrate the use of C++ CNTK eval lib. Only the release configuration is supported.  
+-CSEvalClient: demonstrate the use of C# CNTK eval lib.
+-EvalClients.sln: the VS2013 solution file to build examples. It creates two binaries in the directory $(SolutionDir)..\..\x64\:
+    * CPPEvalClient.$(Configuration)\CPPEvalClient.exe: the C++ example executable. To run the example, please first include the directory containing CNTK dependent dlls, usually $(SolutionDir)..\..\cntk, in the PATH environment variable.  
+    * CSEvalClient.$(Configuration)\CSEvalClient.exe: the C# example executable.

Tools/make_binary_drop_windows.ps1

@@ -111,9 +111,15 @@ Copy-Item $includeFile -Destination $baseIncludePath
 # Copy Examples
 Write-Verbose "Copying Examples ..."
 Copy-Item Examples -Recurse -Destination $baseDropPath\Examples
-#   Remove directories for CNTK.sln-only use:
-Remove-Item $baseDropPath\Examples\Evaluation\CPPEvalClient-FromCntkSln
-Remove-Item $baseDropPath\Examples\Evaluation\CSEvalClient-FromCntkSln
+# The following directories are only used by cntk.sln and should be included in the binary drop. Remove them.
+if (Test-Path $baseDropPath\Examples\Evaluation\CPPEvalClient-CntkSln)
+{
+    Remove-Item $baseDropPath\Examples\Evaluation\CPPEvalClient-CntkSln
+}
+if (Test-Path $baseDropPath\Examples\Evaluation\CSEvalClient-CntkSln)
+{
+    Remove-Item $baseDropPath\Examples\Evaluation\CSEvalClient-CntkSln
+}
 
 # Copy Scripts
 Write-Verbose "Copying Scripts ..."