diff --git a/CNTK.sln b/CNTK.sln index ce1caec6f..ece9deb65 100644 --- a/CNTK.sln +++ b/CNTK.sln @@ -463,12 +463,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AdditionalFiles", "Addition EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{6E5A252C-ACCE-42E0-9819-FF4DEF6D739E}" ProjectSection(SolutionItems) = preProject - Examples\Image\MNIST\Config\01_OneHidden_ndl_deprecated.cntk = Examples\Image\MNIST\Config\01_OneHidden_ndl_deprecated.cntk Examples\Image\MNIST\Config\01_OneHidden.ndl = Examples\Image\MNIST\Config\01_OneHidden.ndl - Examples\Image\MNIST\Config\02_Convolution_ndl_deprecated.cntk = Examples\Image\MNIST\Config\02_Convolution_ndl_deprecated.cntk + Examples\Image\MNIST\Config\01_OneHidden_ndl_deprecated.cntk = Examples\Image\MNIST\Config\01_OneHidden_ndl_deprecated.cntk Examples\Image\MNIST\Config\02_Convolution.ndl = Examples\Image\MNIST\Config\02_Convolution.ndl - Examples\Image\MNIST\Config\03_ConvBatchNorm_ndl_deprecated.cntk = Examples\Image\MNIST\Config\03_ConvBatchNorm_ndl_deprecated.cntk + Examples\Image\MNIST\Config\02_Convolution_ndl_deprecated.cntk = Examples\Image\MNIST\Config\02_Convolution_ndl_deprecated.cntk Examples\Image\MNIST\Config\03_ConvBatchNorm.ndl = Examples\Image\MNIST\Config\03_ConvBatchNorm.ndl + Examples\Image\MNIST\Config\03_ConvBatchNorm_ndl_deprecated.cntk = Examples\Image\MNIST\Config\03_ConvBatchNorm_ndl_deprecated.cntk Examples\Image\MNIST\Config\Macros.ndl = Examples\Image\MNIST\Config\Macros.ndl EndProjectSection EndProject @@ -476,15 +476,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CIFAR-10", "CIFAR-10", "{77 ProjectSection(SolutionItems) = preProject Examples\Image\Miscellaneous\CIFAR-10\01_Conv_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\01_Conv_ndl_deprecated.cntk Examples\Image\Miscellaneous\CIFAR-10\01_Convolution.ndl = Examples\Image\Miscellaneous\CIFAR-10\01_Convolution.ndl - Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv_ndl_deprecated.cntk Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.mel = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.mel Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.ndl = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv.ndl + Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\02_BatchNormConv_ndl_deprecated.cntk Examples\Image\Miscellaneous\CIFAR-10\03_ProjWeightsGen.py = Examples\Image\Miscellaneous\CIFAR-10\03_ProjWeightsGen.py - Examples\Image\Miscellaneous\CIFAR-10\03_ResNet_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet_ndl_deprecated.cntk Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.mel = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.mel Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.ndl = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet.ndl - Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56_ndl_deprecated.cntk + Examples\Image\Miscellaneous\CIFAR-10\03_ResNet_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\03_ResNet_ndl_deprecated.cntk Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56.ndl + Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56_ndl_deprecated.cntk = Examples\Image\Miscellaneous\CIFAR-10\04_ResNet_56_ndl_deprecated.cntk Examples\Image\Miscellaneous\CIFAR-10\16to32.txt = Examples\Image\Miscellaneous\CIFAR-10\16to32.txt Examples\Image\Miscellaneous\CIFAR-10\32to64.txt = Examples\Image\Miscellaneous\CIFAR-10\32to64.txt Examples\Image\Miscellaneous\CIFAR-10\CifarConverter.py = Examples\Image\Miscellaneous\CIFAR-10\CifarConverter.py @@ -501,8 +501,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AlexNet", "AlexNet", "{D29DC402-98A3-40C7-B683-4CC84DEC5C18}" ProjectSection(SolutionItems) = preProject Examples\Image\Miscellaneous\ImageNet\AlexNet\add_top5_layer.mel = Examples\Image\Miscellaneous\ImageNet\AlexNet\add_top5_layer.mel - Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.ndl = Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet.ndl + Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\AlexNet\AlexNet_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\AlexNet\Macros.ndl = Examples\Image\Miscellaneous\ImageNet\AlexNet\Macros.ndl EndProjectSection EndProject @@ -511,12 +511,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VGG", "VGG", "{BC0D6DFF-80C Examples\Image\Miscellaneous\ImageNet\VGG\add_top5_layer.mel = Examples\Image\Miscellaneous\ImageNet\VGG\add_top5_layer.mel Examples\Image\Miscellaneous\ImageNet\VGG\ImageNet1K_mean.xml = Examples\Image\Miscellaneous\ImageNet\VGG\ImageNet1K_mean.xml Examples\Image\Miscellaneous\ImageNet\VGG\Macros.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\Macros.ndl - Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A.ndl - Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_ndl_deprecated.cntk + Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_A_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E.ndl - Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.ndl = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN.ndl + Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_BN_ndl_deprecated.cntk + Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\VGG\VGG_E_ndl_deprecated.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other", "Other", "{CCD56F12-BA17-4753-B5EE-4995FE682995}" @@ -578,11 +578,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cntk_config", "cntk_config" Examples\Speech\Miscellaneous\AMI\cntk_config\80fbank.conf = Examples\Speech\Miscellaneous\AMI\cntk_config\80fbank.conf Examples\Speech\Miscellaneous\AMI\cntk_config\Align.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\Align.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK.cntk - Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_ndl_deprecated.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_ndl_deprecated.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn_ndl_deprecated.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn_ndl_deprecated.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn_smbr.mel = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_dnn_smbr.mel Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_ndl_deprecated.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_ndl_deprecated.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_smbr_ndl_deprecated.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_lstmp_smbr_ndl_deprecated.cntk + Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_ndl_deprecated.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_ndl_deprecated.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_smbr_ndl_deprecated.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_smbr_ndl_deprecated.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_write.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK2_write.cntk Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK_write.cntk = Examples\Speech\Miscellaneous\AMI\cntk_config\CNTK_write.cntk @@ -672,12 +672,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ResNet", "ResNet", "{06D2C6 Examples\Image\Miscellaneous\ImageNet\ResNet\create_eval_model.mel = Examples\Image\Miscellaneous\ImageNet\ResNet\create_eval_model.mel Examples\Image\Miscellaneous\ImageNet\ResNet\Macros.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\Macros.ndl Examples\Image\Miscellaneous\ImageNet\ResNet\ProjWeightsGen.py = Examples\Image\Miscellaneous\ImageNet\ResNet\ProjWeightsGen.py - Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152.ndl - Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34_ndl_deprecated.cntk + Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_152_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34.ndl - Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50_ndl_deprecated.cntk + Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_34_ndl_deprecated.cntk Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.ndl = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50.ndl + Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50_ndl_deprecated.cntk = Examples\Image\Miscellaneous\ImageNet\ResNet\ResNet_50_ndl_deprecated.cntk EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensibility", "Extensibility", "{60F87E25-BC87-4782-8E20-1621AAEBB113}" @@ -1143,19 +1143,12 @@ 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-CntkSln", "Tests\EvalClients\CSEvalClient-CntkSln\CSEvalClient-CntkSln.csproj", "{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPPEvalClient-CntkSln", "Tests\EvalClients\CPPEvalClient-CntkSln\CPPEvalClient-CntkSln.vcxproj", "{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}" - ProjectSection(ProjectDependencies) = postProject - {482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {482999D1-B7E2-466E-9F8D-2119F93EAFD9} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BrainScriptTests", "Tests\UnitTests\BrainScriptTests\BrainScriptTests.vcxproj", "{9F999212-AFC5-4EAC-AA78-F7247D46C456}" ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} {928ABD1B-4D3B-4017-AEF1-0FA1B4467513} = {928ABD1B-4D3B-4017-AEF1-0FA1B4467513} - {EAD17188-072C-4726-B840-A769C36DAD1B} = {EAD17188-072C-4726-B840-A769C36DAD1B} + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} {86883653-8A61-4038-81A0-2379FAE4200A} = {86883653-8A61-4038-81A0-2379FAE4200A} + {EAD17188-072C-4726-B840-A769C36DAD1B} = {EAD17188-072C-4726-B840-A769C36DAD1B} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorials", "Tutorials", "{8BE0642A-A3AA-4A64-95D0-C78FB285B2A4}" @@ -1260,7 +1253,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Truncated-Kaldi", "Truncate Tests\EndToEndTests\Speech\LSTM\Truncated-Kaldi\testcases.yml = Tests\EndToEndTests\Speech\LSTM\Truncated-Kaldi\testcases.yml EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EvalClients", "EvalClients", "{1A069795-9187-4286-9F74-3E53C789C61F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EvalClientTests", "EvalClientTests", "{05E45AF7-C069-4057-BC16-0A532D068CE4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPPEvalClientTest", "Tests\EndToEndTests\EvalClientTests\CPPEvalClientTest\CPPEvalClientTest.vcxproj", "{CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}" + ProjectSection(ProjectDependencies) = postProject + {482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {482999D1-B7E2-466E-9F8D-2119F93EAFD9} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSEvalClientTest", "Tests\EndToEndTests\EvalClientTests\CSEvalClientTest\CSEvalClientTest.csproj", "{1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1524,22 +1524,6 @@ Global {CC8DDDCB-D53A-4B30-8596-AEF1C493DB31}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64 {CC8DDDCB-D53A-4B30-8596-AEF1C493DB31}.Release|x64.ActiveCfg = Release|x64 {CC8DDDCB-D53A-4B30-8596-AEF1C493DB31}.Release|x64.Build.0 = Release|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug|x64.ActiveCfg = Debug|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug|x64.Build.0 = Debug|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release_CpuOnly|x64.ActiveCfg = Release_CpuOnly|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release|x64.ActiveCfg = Release|x64 - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release|x64.Build.0 = Release|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug|x64.ActiveCfg = Debug|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug|x64.Build.0 = Debug|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release_CpuOnly|x64.ActiveCfg = Release_CpuOnly|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release|x64.ActiveCfg = Release|x64 - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release|x64.Build.0 = Release|x64 {9F999212-AFC5-4EAC-AA78-F7247D46C456}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64 {9F999212-AFC5-4EAC-AA78-F7247D46C456}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64 {9F999212-AFC5-4EAC-AA78-F7247D46C456}.Debug|x64.ActiveCfg = Debug|x64 @@ -1548,6 +1532,22 @@ Global {9F999212-AFC5-4EAC-AA78-F7247D46C456}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64 {9F999212-AFC5-4EAC-AA78-F7247D46C456}.Release|x64.ActiveCfg = Release|x64 {9F999212-AFC5-4EAC-AA78-F7247D46C456}.Release|x64.Build.0 = Release|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug|x64.ActiveCfg = Debug|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Debug|x64.Build.0 = Debug|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release_CpuOnly|x64.ActiveCfg = Release_CpuOnly|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release|x64.ActiveCfg = Release|x64 + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E}.Release|x64.Build.0 = Release|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug_CpuOnly|x64.ActiveCfg = Debug_CpuOnly|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug_CpuOnly|x64.Build.0 = Debug_CpuOnly|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug|x64.ActiveCfg = Debug|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Debug|x64.Build.0 = Debug|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release_CpuOnly|x64.ActiveCfg = Release_CpuOnly|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release_CpuOnly|x64.Build.0 = Release_CpuOnly|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release|x64.ActiveCfg = Release|x64 + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1704,8 +1704,6 @@ Global {F4CC3AB2-0DB2-4281-929A-2E68E30F0F6E} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE} {CC8DDDCB-D53A-4B30-8596-AEF1C493DB31} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE} {3385EBEA-5F97-4B2B-9F30-0E6D7F91B9CA} = {47755F2E-D674-4175-9E38-8EA053455072} - {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF} = {1A069795-9187-4286-9F74-3E53C789C61F} - {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E} = {1A069795-9187-4286-9F74-3E53C789C61F} {9F999212-AFC5-4EAC-AA78-F7247D46C456} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE} {2230BF3D-4317-4A3F-A743-DDD6160503F8} = {8BE0642A-A3AA-4A64-95D0-C78FB285B2A4} {CC143D08-567D-4DAC-9E14-264749C19039} = {8BE0642A-A3AA-4A64-95D0-C78FB285B2A4} @@ -1721,6 +1719,8 @@ Global {D293C7C7-B7D7-47CE-A796-45262C16F980} = {19EE975B-232D-49F0-94C7-6F1C6424FB53} {4F534076-39A5-40E2-BF87-64EC464C52B2} = {19EE975B-232D-49F0-94C7-6F1C6424FB53} {31263D7F-F590-475E-B4F0-7DFA4E4FF4B8} = {19EE975B-232D-49F0-94C7-6F1C6424FB53} - {1A069795-9187-4286-9F74-3E53C789C61F} = {D45DF403-6781-444E-B654-A96868C5BE68} + {05E45AF7-C069-4057-BC16-0A532D068CE4} = {6E565B48-1923-49CE-9787-9BBB9D96F4C5} + {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E} = {05E45AF7-C069-4057-BC16-0A532D068CE4} + {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF} = {05E45AF7-C069-4057-BC16-0A532D068CE4} EndGlobalSection EndGlobal diff --git a/Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj b/Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/CPPEvalClientTest.vcxproj similarity index 95% rename from Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj rename to Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/CPPEvalClientTest.vcxproj index 072255e6d..b449e9aad 100644 --- a/Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj +++ b/Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/CPPEvalClientTest.vcxproj @@ -21,8 +21,8 @@ {CCC07E8E-F33A-4AF7-9F60-93E2AA61C75E} Win32Proj - CPPEvalClient-CntkSln - CPPEvalClient-CntkSln + CPPEvalClientTest + CPPEvalClientTest @@ -52,7 +52,7 @@ false - CPPEvalClient-CntkSln + CPPEvalClientTest @@ -106,7 +106,7 @@ - + diff --git a/Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj.filters b/Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/CPPEvalClientTest.vcxproj.filters similarity index 100% rename from Tests/EvalClients/CPPEvalClient-CntkSln/CPPEvalClient-CntkSln.vcxproj.filters rename to Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/CPPEvalClientTest.vcxproj.filters diff --git a/Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/README.md b/Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/README.md new file mode 100644 index 000000000..19d1ca2e4 --- /dev/null +++ b/Tests/EndToEndTests/EvalClientTests/CPPEvalClientTest/README.md @@ -0,0 +1,2 @@ +This folder contains the VC++ project file for building CPPEvalClientTest.exe. +The C++ source code used by the project is in Examples\Evaluation\CPPEvalClient. \ No newline at end of file diff --git a/Tests/EvalClients/CSEvalClient-CntkSln/App.config b/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/App.config similarity index 100% rename from Tests/EvalClients/CSEvalClient-CntkSln/App.config rename to Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/App.config diff --git a/Tests/EvalClients/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj b/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/CSEvalClientTest.csproj similarity index 53% rename from Tests/EvalClients/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj rename to Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/CSEvalClientTest.csproj index 267e65be6..4eaecb750 100644 --- a/Tests/EvalClients/CSEvalClient-CntkSln/CSEvalClient-CntkSln.csproj +++ b/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/CSEvalClientTest.csproj @@ -5,48 +5,66 @@ Debug AnyCPU {1C6E6C53-1AA7-4B69-913E-B97BB5A872CF} + $(SolutionDir)\$(Platform)\.build\$(Configuration)\$(MSBuildProjectDirectory.Substring($(SolutionDir.Length)))\obj\ + $(SolutionDir)\$(Platform)\.build\$(Configuration)\$(MSBuildProjectDirectory.Substring($(SolutionDir.Length)))\obj\ + $(SolutionDir)\$(Platform)\$(Configuration)\ Exe Properties - Microsoft.MSR.CNTK.Extensibility.Managed.CSEvalClient-CntkSln - CSEvalClient-CntkSln + Microsoft.MSR.CNTK.Extensibility.Managed.CSEvalClientTest + CSEvalClientTest v4.5 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true - ..\..\..\x64\Debug\ DEBUG;TRACE full x64 prompt - MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + true true - ..\..\..\x64\Debug_CpuOnly\ DEBUG;TRACE full x64 prompt - MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + true - ..\..\..\x64\Release\ TRACE true pdbonly x64 prompt MinimumRecommendedRules.ruleset + true - ..\..\..\x64\Release_CpuOnly\ TRACE true pdbonly x64 prompt - MinimumRecommendedRules.ruleset + MinimumRecommendedRules.ruleset + true @@ -55,19 +73,36 @@ - - - + + + - + {ef766cae-9cb1-494c-9153-0030631a6340} EvalWrapper - - + + + False + Microsoft .NET Framework 4.5 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + + \ No newline at end of file diff --git a/Tests/EvalClients/CSEvalClient-CntkSln/Properties/AssemblyInfo.cs b/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/Properties/AssemblyInfo.cs similarity index 93% rename from Tests/EvalClients/CSEvalClient-CntkSln/Properties/AssemblyInfo.cs rename to Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/Properties/AssemblyInfo.cs index f49818457..4769f4c40 100644 --- a/Tests/EvalClients/CSEvalClient-CntkSln/Properties/AssemblyInfo.cs +++ b/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/Properties/AssemblyInfo.cs @@ -10,11 +10,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("CSEvalClient-CntkSln")] +[assembly: AssemblyTitle("CSEvalClient")] [assembly: AssemblyDescription("Managed client using managed wrapper for CNTK evaluation model")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("CSEvalClient-CntkSln")] +[assembly: AssemblyProduct("CSEvalClient")] [assembly: AssemblyCopyright("Copyright © 2016 Microsoft. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/README.md b/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/README.md new file mode 100644 index 000000000..09036e88a --- /dev/null +++ b/Tests/EndToEndTests/EvalClientTests/CSEvalClientTest/README.md @@ -0,0 +1,2 @@ +This folder contains the C# project file to build CSEvalClientTest.exe. +The C# source code used by the project is in Examples\Evaluation\CSEvalClient. \ No newline at end of file diff --git a/Tests/EvalClients/CPPEvalClient-CntkSln/README.md b/Tests/EvalClients/CPPEvalClient-CntkSln/README.md deleted file mode 100644 index ce962d830..000000000 --- a/Tests/EvalClients/CPPEvalClient-CntkSln/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This folder contains the VC++ project file used by cntk.sln to build CPPEvalClient-CntkSln.exe. -The C++ source code used by the project is available in Examples\Evaluation\CPPEvalClient. \ No newline at end of file diff --git a/Tests/EvalClients/CSEvalClient-CntkSln/README.md b/Tests/EvalClients/CSEvalClient-CntkSln/README.md deleted file mode 100644 index 2e1c6f22f..000000000 --- a/Tests/EvalClients/CSEvalClient-CntkSln/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This folder contains the C# project file used by cntk.sln to build CSEvalClient-CntkSln.exe. -The C# source code used by the project is available in Examples\Evaluation\CSEvalClient. \ No newline at end of file