From 1247b704c70d45c2fb728898632aa4d072f8f31f Mon Sep 17 00:00:00 2001 From: Frank Seide Date: Mon, 18 May 2015 18:51:20 -0700 Subject: [PATCH] various cleanups: renamed cn.exe to CNTK.exe on Windows and "cntk" (no more .exe!) on Linux; renamed 'cn' folder to 'CNTK'; moved CNTK.sln out from CNTKSolution folder, which now no longer needs to exist; removed Win32 build target from Visual Studio Solution and all Projects; added are documentation and Linux makefiles to the Visual Studio Solution for easy access; removed unused PTasks files --- CNTK.sln | 267 +++++++++++++++ CNTKSolution/CNTKSolution.sln | 154 --------- Common/BestGpu.cpp | 10 +- Common/{Include => trash}/nvml.h | 0 DataReader/BinaryReader/BinaryReader.vcxproj | 83 +---- DataReader/DSSMReader/DSSMReader.vcxproj | 79 +---- DataReader/HTKMLFReader/HTKMLFReader.vcxproj | 80 +---- .../LMSequenceReader/LMSequenceReader.vcxproj | 304 +++++++++--------- .../LUSequenceReader/LUSequenceReader.vcxproj | 2 + .../LibSVMBinaryReader.vcxproj | 85 +---- .../UCIFastReader/UCIFastReader.vcxproj | 82 +---- Documentation/Documentation.vcxproj | 117 +++++++ Documentation/Documentation.vcxproj.filters | 159 +++++++++ .../{ => Documents}/Configuration Files.docx | Bin .../External Buffer Behavior.docx | Bin .../Model Editing Language.docx | Bin .../Network Description Language.docx | Bin .../CNTK-Tutorial-ICASSP2015.pdf | Bin Linux/Linux.vcxproj | 76 +++++ Linux/Linux.vcxproj.filters | 10 + MachineLearning/{cn/cn.cpp => CNTK/CNTK.cpp} | 0 .../{cn/cn.vcxproj => CNTK/CNTK.vcxproj} | 106 ++---- .../CNTK.vcxproj.filters} | 16 +- .../CNTK.vcxproj.vspscc} | 0 .../{cn => CNTK}/CompositeComputationNode.h | 0 .../{cn => CNTK}/ComputationNetwork.cpp | 0 .../{cn => CNTK}/ComputationNetwork.h | 0 .../{cn => CNTK}/ComputationNetworkHelper.h | 0 .../{cn => CNTK}/ComputationNode.cpp | 0 .../{cn => CNTK}/ComputationNode.h | 0 .../{cn => CNTK}/DefaultMacros.txt | 0 .../{cn => CNTK}/EvaluationCriterionNode.h | 0 .../{cn => CNTK}/FullNetworkBuilder.h | 0 .../{cn => CNTK}/IComputationNetBuilder.h | 0 .../{cn => CNTK}/IExecutionEngine.h | 0 .../{cn => CNTK}/ModelEditLanguage.cpp | 0 .../{cn => CNTK}/ModelEditLanguage.h | 0 .../{cn => CNTK}/NDLNetworkBuilder.h | 0 MachineLearning/{cn => CNTK}/NDLUtil.h | 0 MachineLearning/{cn => CNTK}/NdlScript.txt | 0 .../NetworkDescriptionLanguage.cpp | 0 .../{cn => CNTK}/NetworkDescriptionLanguage.h | 0 MachineLearning/{cn => CNTK}/PTask.cpp | 0 MachineLearning/{cn => CNTK}/PTask.h | 0 .../{cn => CNTK}/PTaskComputationNetwork.h | 0 .../{cn => CNTK}/PTaskExecutionEngine.h | 0 .../{cn => CNTK}/PTaskGraphBuilder.cpp | 0 .../{cn => CNTK}/PTaskGraphBuilder.h | 0 .../{cn => CNTK}/RecurrentNetworkBuilder.h | 0 MachineLearning/{cn => CNTK}/SGD.h | 0 .../{cn => CNTK}/SimpleEvaluator.h | 0 .../{cn => CNTK}/SimpleNetworkBuilder.cpp | 0 .../{cn => CNTK}/SimpleNetworkBuilder.h | 0 .../{cn => CNTK}/SimpleOutputWriter.h | 0 .../SimpleRecurrentNetEvaluator.h | 0 .../{cn => CNTK}/SynchronousExecutionEngine.h | 0 .../{cn => CNTK}/TrainingCriterionNode.h | 0 MachineLearning/{cn => CNTK}/fileutil.cpp | 0 MachineLearning/{cn => CNTK}/modelEditor.txt | 0 .../{cn => CNTK}/modelEditorFromScratch.txt | 0 MachineLearning/{cn => CNTK}/prebuild.bat | 0 MachineLearning/{cn => CNTK}/stdafx.cpp | 0 MachineLearning/{cn => CNTK}/stdafx.h | 0 MachineLearning/{cn => CNTK}/targetver.h | 0 MachineLearning/{cn => CNTK}/tests.cpp | 0 MachineLearning/CNTKEval/CNTKEval.vcxproj | 37 ++- .../CNTKEval/CNTKEval.vcxproj.filters | 2 +- .../CNTKEvalTest/CNTKEvalTest.vcxproj | 67 +--- MachineLearning/PTaskHost/PTaskHost.cpp | 59 ---- MachineLearning/PTaskHost/PTaskHost.h | 31 -- MachineLearning/PTaskHost/PTaskHost.vcxproj | 174 ---------- MachineLearning/PTaskHost/dllmain.cpp | 19 -- MachineLearning/PTaskHost/stdafx.cpp | 8 - MachineLearning/PTaskHost/stdafx.h | 16 - MachineLearning/PTaskHost/targetver.h | 8 - Makefile.cpu | 14 +- Makefile.gpu | 12 +- Makefile_kaldi.cpu | 14 +- Makefile_kaldi.gpu | 12 +- Math/CNTKMathTest/CNTKMathTest.vcxproj | 73 +---- Math/Math.sln | 75 ----- Math/Math.vssscc | 10 - Math/Math/CNTKMathCUDA.vcxproj | 4 +- Math/Math/Math.vcxproj | 8 +- .../MathPerformanceTests.vcxproj | 68 +--- README | 2 + 86 files changed, 894 insertions(+), 1449 deletions(-) create mode 100644 CNTK.sln delete mode 100644 CNTKSolution/CNTKSolution.sln rename Common/{Include => trash}/nvml.h (100%) create mode 100644 Documentation/Documentation.vcxproj create mode 100644 Documentation/Documentation.vcxproj.filters rename Documentation/{ => Documents}/Configuration Files.docx (100%) rename Documentation/{ => Documents}/External Buffer Behavior.docx (100%) rename Documentation/{ => Documents}/Model Editing Language.docx (100%) rename Documentation/{ => Documents}/Network Description Language.docx (100%) rename Documentation/{ => Tutorial}/CNTK-Tutorial-ICASSP2015.pdf (100%) create mode 100644 Linux/Linux.vcxproj create mode 100644 Linux/Linux.vcxproj.filters rename MachineLearning/{cn/cn.cpp => CNTK/CNTK.cpp} (100%) rename MachineLearning/{cn/cn.vcxproj => CNTK/CNTK.vcxproj} (61%) rename MachineLearning/{cn/cn.vcxproj.filters => CNTK/CNTK.vcxproj.filters} (92%) rename MachineLearning/{cn/cn.vcxproj.vspscc => CNTK/CNTK.vcxproj.vspscc} (100%) rename MachineLearning/{cn => CNTK}/CompositeComputationNode.h (100%) rename MachineLearning/{cn => CNTK}/ComputationNetwork.cpp (100%) rename MachineLearning/{cn => CNTK}/ComputationNetwork.h (100%) rename MachineLearning/{cn => CNTK}/ComputationNetworkHelper.h (100%) rename MachineLearning/{cn => CNTK}/ComputationNode.cpp (100%) rename MachineLearning/{cn => CNTK}/ComputationNode.h (100%) rename MachineLearning/{cn => CNTK}/DefaultMacros.txt (100%) rename MachineLearning/{cn => CNTK}/EvaluationCriterionNode.h (100%) rename MachineLearning/{cn => CNTK}/FullNetworkBuilder.h (100%) rename MachineLearning/{cn => CNTK}/IComputationNetBuilder.h (100%) rename MachineLearning/{cn => CNTK}/IExecutionEngine.h (100%) rename MachineLearning/{cn => CNTK}/ModelEditLanguage.cpp (100%) rename MachineLearning/{cn => CNTK}/ModelEditLanguage.h (100%) rename MachineLearning/{cn => CNTK}/NDLNetworkBuilder.h (100%) rename MachineLearning/{cn => CNTK}/NDLUtil.h (100%) rename MachineLearning/{cn => CNTK}/NdlScript.txt (100%) rename MachineLearning/{cn => CNTK}/NetworkDescriptionLanguage.cpp (100%) rename MachineLearning/{cn => CNTK}/NetworkDescriptionLanguage.h (100%) rename MachineLearning/{cn => CNTK}/PTask.cpp (100%) rename MachineLearning/{cn => CNTK}/PTask.h (100%) rename MachineLearning/{cn => CNTK}/PTaskComputationNetwork.h (100%) rename MachineLearning/{cn => CNTK}/PTaskExecutionEngine.h (100%) rename MachineLearning/{cn => CNTK}/PTaskGraphBuilder.cpp (100%) rename MachineLearning/{cn => CNTK}/PTaskGraphBuilder.h (100%) rename MachineLearning/{cn => CNTK}/RecurrentNetworkBuilder.h (100%) rename MachineLearning/{cn => CNTK}/SGD.h (100%) rename MachineLearning/{cn => CNTK}/SimpleEvaluator.h (100%) rename MachineLearning/{cn => CNTK}/SimpleNetworkBuilder.cpp (100%) rename MachineLearning/{cn => CNTK}/SimpleNetworkBuilder.h (100%) rename MachineLearning/{cn => CNTK}/SimpleOutputWriter.h (100%) rename MachineLearning/{cn => CNTK}/SimpleRecurrentNetEvaluator.h (100%) rename MachineLearning/{cn => CNTK}/SynchronousExecutionEngine.h (100%) rename MachineLearning/{cn => CNTK}/TrainingCriterionNode.h (100%) rename MachineLearning/{cn => CNTK}/fileutil.cpp (100%) rename MachineLearning/{cn => CNTK}/modelEditor.txt (100%) rename MachineLearning/{cn => CNTK}/modelEditorFromScratch.txt (100%) rename MachineLearning/{cn => CNTK}/prebuild.bat (100%) rename MachineLearning/{cn => CNTK}/stdafx.cpp (100%) rename MachineLearning/{cn => CNTK}/stdafx.h (100%) rename MachineLearning/{cn => CNTK}/targetver.h (100%) rename MachineLearning/{cn => CNTK}/tests.cpp (100%) delete mode 100644 MachineLearning/PTaskHost/PTaskHost.cpp delete mode 100644 MachineLearning/PTaskHost/PTaskHost.h delete mode 100644 MachineLearning/PTaskHost/PTaskHost.vcxproj delete mode 100644 MachineLearning/PTaskHost/dllmain.cpp delete mode 100644 MachineLearning/PTaskHost/stdafx.cpp delete mode 100644 MachineLearning/PTaskHost/stdafx.h delete mode 100644 MachineLearning/PTaskHost/targetver.h delete mode 100644 Math/Math.sln delete mode 100644 Math/Math.vssscc diff --git a/CNTK.sln b/CNTK.sln new file mode 100644 index 000000000..3cd282cb6 --- /dev/null +++ b/CNTK.sln @@ -0,0 +1,267 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMath", "Math\Math\Math.vcxproj", "{60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}" + ProjectSection(ProjectDependencies) = postProject + {B3DD765E-694E-4494-BAD7-37BBF2942517} = {B3DD765E-694E-4494-BAD7-37BBF2942517} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTK", "MachineLearning\CNTK\CNTK.vcxproj", "{E6F26F9A-FF64-4F0A-B749-CD309EE357EE}" + ProjectSection(ProjectDependencies) = postProject + {33D2FD22-DEF2-4507-A58A-368F641AEBE5} = {33D2FD22-DEF2-4507-A58A-368F641AEBE5} + {9A2F2441-5972-4EA8-9215-4119FCE0FB68} = {9A2F2441-5972-4EA8-9215-4119FCE0FB68} + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + {B3DD765E-694E-4494-BAD7-37BBF2942517} = {B3DD765E-694E-4494-BAD7-37BBF2942517} + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6} = {62836DC1-DF77-4B98-BF2D-45C943B7DDC6} + {1D5787D4-52E4-45DB-951B-82F220EE0C6A} = {1D5787D4-52E4-45DB-951B-82F220EE0C6A} + {E6646FFE-3588-4276-8A15-8D65C22711C1} = {E6646FFE-3588-4276-8A15-8D65C22711C1} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests", "{D45DF403-6781-444E-B654-A96868C5BE68}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMathTest", "Math\CNTKMathTest\CNTKMathTest.vcxproj", "{6CEE834A-8104-46A8-8902-64C81BD7928F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTKMLFReader", "DataReader\HTKMLFReader\HTKMLFReader.vcxproj", "{33D2FD22-DEF2-4507-A58A-368F641AEBE5}" + ProjectSection(ProjectDependencies) = postProject + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MathPerformanceTests", "Math\MathPerformanceTests\MathPerformanceTests.vcxproj", "{668BEED5-AC07-4F35-B3AE-EE65A7F9C976}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UCIFastReader", "DataReader\UCIFastReader\UCIFastReader.vcxproj", "{E6646FFE-3588-4276-8A15-8D65C22711C1}" + ProjectSection(ProjectDependencies) = postProject + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + {1D5787D4-52E4-45DB-951B-82F220EE0C6A} = {1D5787D4-52E4-45DB-951B-82F220EE0C6A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryReader", "DataReader\BinaryReader\BinaryReader.vcxproj", "{1D5787D4-52E4-45DB-951B-82F220EE0C6A}" + ProjectSection(ProjectDependencies) = postProject + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUSequenceReader", "DataReader\LUSequenceReader\LUSequenceReader.vcxproj", "{62836DC1-DF77-4B98-BF2D-45C943B7DDC6}" + ProjectSection(ProjectDependencies) = postProject + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKEval", "MachineLearning\CNTKEval\CNTKEval.vcxproj", "{482999D1-B7E2-466E-9F8D-2119F93EAFD9}" + ProjectSection(ProjectDependencies) = postProject + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKEvalTest", "MachineLearning\CNTKEval\CNTKEvalTest\CNTKEvalTest.vcxproj", "{0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}" + ProjectSection(ProjectDependencies) = postProject + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + {482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {482999D1-B7E2-466E-9F8D-2119F93EAFD9} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reader Plugins", "Reader Plugins", "{33EBFE78-A1A8-4961-8938-92A271941F94}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CNTK Core", "CNTK Core", "{DD043083-71A4-409A-AA91-F9C548DCF7EC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMathCUDA", "Math\Math\CNTKMathCUDA.vcxproj", "{B3DD765E-694E-4494-BAD7-37BBF2942517}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LMSequenceReader", "DataReader\LMSequenceReader\LMSequenceReader.vcxproj", "{9A2F2441-5972-4EA8-9215-4119FCE0FB68}" + ProjectSection(ProjectDependencies) = postProject + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSSMReader", "DataReader\DSSMReader\DSSMReader.vcxproj", "{014DA766-B37B-4581-BC26-963EA5507931}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSVMBinaryReader", "DataReader\LibSVMBinaryReader\LibSVMBinaryReader.vcxproj", "{D667AF32-028A-4A5D-BE19-F46776F0F6B2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Documentation", "Documentation\Documentation.vcxproj", "{9216C53F-46EB-4669-B781-FF8503F27157}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Linux", "Linux\Linux.vcxproj", "{E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Mixed Platforms = Release|Mixed Platforms + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|Win32.ActiveCfg = Debug|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|x64.ActiveCfg = Debug|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|x64.Build.0 = Debug|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|Mixed Platforms.Build.0 = Release|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|Win32.ActiveCfg = Release|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|x64.ActiveCfg = Release|x64 + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|x64.Build.0 = Release|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Debug|Win32.ActiveCfg = Debug|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Debug|x64.ActiveCfg = Debug|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Debug|x64.Build.0 = Debug|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Release|Mixed Platforms.Build.0 = Release|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Release|Win32.ActiveCfg = Release|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Release|x64.ActiveCfg = Release|x64 + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Release|x64.Build.0 = Release|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|Win32.ActiveCfg = Debug|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|x64.ActiveCfg = Debug|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|x64.Build.0 = Debug|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|Mixed Platforms.Build.0 = Release|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|Win32.ActiveCfg = Release|x64 + {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|x64.ActiveCfg = Release|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Debug|Win32.ActiveCfg = Debug|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Debug|x64.ActiveCfg = Debug|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Debug|x64.Build.0 = Debug|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Release|Mixed Platforms.Build.0 = Release|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Release|Win32.ActiveCfg = Release|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Release|x64.ActiveCfg = Release|x64 + {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Release|x64.Build.0 = Release|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|Win32.ActiveCfg = Debug|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|x64.ActiveCfg = Debug|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|x64.Build.0 = Debug|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|Mixed Platforms.Build.0 = Release|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|Win32.ActiveCfg = Release|x64 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|x64.ActiveCfg = Release|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Debug|Win32.ActiveCfg = Debug|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Debug|x64.ActiveCfg = Debug|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Debug|x64.Build.0 = Debug|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Release|Mixed Platforms.Build.0 = Release|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Release|Win32.ActiveCfg = Release|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Release|x64.ActiveCfg = Release|x64 + {E6646FFE-3588-4276-8A15-8D65C22711C1}.Release|x64.Build.0 = Release|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Debug|Win32.ActiveCfg = Debug|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Debug|x64.ActiveCfg = Debug|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Debug|x64.Build.0 = Debug|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Release|Mixed Platforms.Build.0 = Release|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Release|Win32.ActiveCfg = Release|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Release|x64.ActiveCfg = Release|x64 + {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Release|x64.Build.0 = Release|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Debug|Win32.ActiveCfg = Debug|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Debug|x64.ActiveCfg = Debug|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Debug|x64.Build.0 = Debug|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Release|Mixed Platforms.Build.0 = Release|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Release|Win32.ActiveCfg = Release|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Release|x64.ActiveCfg = Release|x64 + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Release|x64.Build.0 = Release|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Debug|Win32.ActiveCfg = Debug|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Debug|x64.ActiveCfg = Debug|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Debug|x64.Build.0 = Debug|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Release|Mixed Platforms.Build.0 = Release|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Release|Win32.ActiveCfg = Release|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Release|x64.ActiveCfg = Release|x64 + {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Release|x64.Build.0 = Release|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Debug|Win32.ActiveCfg = Debug|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Debug|x64.ActiveCfg = Debug|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Debug|x64.Build.0 = Debug|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Release|Mixed Platforms.Build.0 = Release|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Release|Win32.ActiveCfg = Release|x64 + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Release|x64.ActiveCfg = Release|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Debug|Win32.ActiveCfg = Debug|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Debug|x64.ActiveCfg = Debug|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Debug|x64.Build.0 = Debug|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Release|Mixed Platforms.Build.0 = Release|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Release|Win32.ActiveCfg = Release|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Release|x64.ActiveCfg = Release|x64 + {B3DD765E-694E-4494-BAD7-37BBF2942517}.Release|x64.Build.0 = Release|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Debug|Win32.ActiveCfg = Debug|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Debug|x64.ActiveCfg = Debug|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Debug|x64.Build.0 = Debug|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Release|Mixed Platforms.Build.0 = Release|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Release|Win32.ActiveCfg = Release|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Release|x64.ActiveCfg = Release|x64 + {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Release|x64.Build.0 = Release|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Debug|Win32.ActiveCfg = Debug|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Debug|x64.ActiveCfg = Debug|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Debug|x64.Build.0 = Debug|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Release|Mixed Platforms.Build.0 = Release|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Release|Win32.ActiveCfg = Release|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Release|x64.ActiveCfg = Release|x64 + {014DA766-B37B-4581-BC26-963EA5507931}.Release|x64.Build.0 = Release|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Debug|Win32.ActiveCfg = Debug|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Debug|x64.ActiveCfg = Debug|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Debug|x64.Build.0 = Debug|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Release|Mixed Platforms.Build.0 = Release|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Release|Win32.ActiveCfg = Release|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Release|x64.ActiveCfg = Release|x64 + {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Release|x64.Build.0 = Release|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Debug|Win32.ActiveCfg = Debug|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Debug|x64.ActiveCfg = Debug|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Debug|x64.Build.0 = Debug|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Release|Mixed Platforms.Build.0 = Release|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Release|Win32.ActiveCfg = Release|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Release|x64.ActiveCfg = Release|x64 + {9216C53F-46EB-4669-B781-FF8503F27157}.Release|x64.Build.0 = Release|x64 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Debug|Win32.ActiveCfg = Debug|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Debug|Win32.Build.0 = Debug|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Debug|x64.ActiveCfg = Debug|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Release|Mixed Platforms.Build.0 = Release|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Release|Win32.ActiveCfg = Release|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Release|Win32.Build.0 = Release|Win32 + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF}.Release|x64.ActiveCfg = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {E6F26F9A-FF64-4F0A-B749-CD309EE357EE} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} + {482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} + {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} + {B3DD765E-694E-4494-BAD7-37BBF2942517} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} + {6CEE834A-8104-46A8-8902-64C81BD7928F} = {D45DF403-6781-444E-B654-A96868C5BE68} + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976} = {D45DF403-6781-444E-B654-A96868C5BE68} + {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC} = {D45DF403-6781-444E-B654-A96868C5BE68} + {E6646FFE-3588-4276-8A15-8D65C22711C1} = {33EBFE78-A1A8-4961-8938-92A271941F94} + {1D5787D4-52E4-45DB-951B-82F220EE0C6A} = {33EBFE78-A1A8-4961-8938-92A271941F94} + {62836DC1-DF77-4B98-BF2D-45C943B7DDC6} = {33EBFE78-A1A8-4961-8938-92A271941F94} + {33D2FD22-DEF2-4507-A58A-368F641AEBE5} = {33EBFE78-A1A8-4961-8938-92A271941F94} + {9A2F2441-5972-4EA8-9215-4119FCE0FB68} = {33EBFE78-A1A8-4961-8938-92A271941F94} + {014DA766-B37B-4581-BC26-963EA5507931} = {33EBFE78-A1A8-4961-8938-92A271941F94} + {D667AF32-028A-4A5D-BE19-F46776F0F6B2} = {33EBFE78-A1A8-4961-8938-92A271941F94} + EndGlobalSection +EndGlobal diff --git a/CNTKSolution/CNTKSolution.sln b/CNTKSolution/CNTKSolution.sln deleted file mode 100644 index 2fb8b01a1..000000000 --- a/CNTKSolution/CNTKSolution.sln +++ /dev/null @@ -1,154 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMath", "..\Math\Math\Math.vcxproj", "{60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}" - ProjectSection(ProjectDependencies) = postProject - {B3DD765E-694E-4494-BAD7-37BBF2942517} = {B3DD765E-694E-4494-BAD7-37BBF2942517} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cn", "..\MachineLearning\cn\cn.vcxproj", "{E6F26F9A-FF64-4F0A-B749-CD309EE357EE}" - ProjectSection(ProjectDependencies) = postProject - {33D2FD22-DEF2-4507-A58A-368F641AEBE5} = {33D2FD22-DEF2-4507-A58A-368F641AEBE5} - {9A2F2441-5972-4EA8-9215-4119FCE0FB68} = {9A2F2441-5972-4EA8-9215-4119FCE0FB68} - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - {B3DD765E-694E-4494-BAD7-37BBF2942517} = {B3DD765E-694E-4494-BAD7-37BBF2942517} - {62836DC1-DF77-4B98-BF2D-45C943B7DDC6} = {62836DC1-DF77-4B98-BF2D-45C943B7DDC6} - {1D5787D4-52E4-45DB-951B-82F220EE0C6A} = {1D5787D4-52E4-45DB-951B-82F220EE0C6A} - {E6646FFE-3588-4276-8A15-8D65C22711C1} = {E6646FFE-3588-4276-8A15-8D65C22711C1} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Tests", "Unit Tests", "{D45DF403-6781-444E-B654-A96868C5BE68}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMathTest", "..\Math\CNTKMathTest\CNTKMathTest.vcxproj", "{6CEE834A-8104-46A8-8902-64C81BD7928F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTKMLFReader", "..\DataReader\HTKMLFReader\HTKMLFReader.vcxproj", "{33D2FD22-DEF2-4507-A58A-368F641AEBE5}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MathPerformanceTests", "..\Math\MathPerformanceTests\MathPerformanceTests.vcxproj", "{668BEED5-AC07-4F35-B3AE-EE65A7F9C976}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UCIFastReader", "..\DataReader\UCIFastReader\UCIFastReader.vcxproj", "{E6646FFE-3588-4276-8A15-8D65C22711C1}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - {1D5787D4-52E4-45DB-951B-82F220EE0C6A} = {1D5787D4-52E4-45DB-951B-82F220EE0C6A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryReader", "..\DataReader\BinaryReader\BinaryReader.vcxproj", "{1D5787D4-52E4-45DB-951B-82F220EE0C6A}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUSequenceReader", "..\DataReader\LUSequenceReader\LUSequenceReader.vcxproj", "{62836DC1-DF77-4B98-BF2D-45C943B7DDC6}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKEval", "..\MachineLearning\CNTKEval\CNTKEval.vcxproj", "{482999D1-B7E2-466E-9F8D-2119F93EAFD9}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKEvalTest", "..\MachineLearning\CNTKEval\CNTKEvalTest\CNTKEvalTest.vcxproj", "{0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - {482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {482999D1-B7E2-466E-9F8D-2119F93EAFD9} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reader Plugins", "Reader Plugins", "{33EBFE78-A1A8-4961-8938-92A271941F94}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CNTK", "CNTK", "{DD043083-71A4-409A-AA91-F9C548DCF7EC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMathCUDA", "..\Math\Math\CNTKMathCUDA.vcxproj", "{B3DD765E-694E-4494-BAD7-37BBF2942517}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LMSequenceReader", "..\DataReader\LMSequenceReader\LMSequenceReader.vcxproj", "{9A2F2441-5972-4EA8-9215-4119FCE0FB68}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSSMReader", "..\DataReader\DSSMReader\DSSMReader.vcxproj", "{014DA766-B37B-4581-BC26-963EA5507931}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSVMBinaryReader", "..\DataReader\LibSVMBinaryReader\LibSVMBinaryReader.vcxproj", "{D667AF32-028A-4A5D-BE19-F46776F0F6B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|x64.ActiveCfg = Debug|x64 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|x64.Build.0 = Debug|x64 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|x64.ActiveCfg = Release|x64 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|x64.Build.0 = Release|x64 - {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Debug|x64.ActiveCfg = Debug|x64 - {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Debug|x64.Build.0 = Debug|x64 - {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Release|x64.ActiveCfg = Release|x64 - {E6F26F9A-FF64-4F0A-B749-CD309EE357EE}.Release|x64.Build.0 = Release|x64 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|x64.ActiveCfg = Debug|x64 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|x64.Build.0 = Debug|x64 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|x64.ActiveCfg = Release|x64 - {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Debug|x64.ActiveCfg = Debug|x64 - {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Debug|x64.Build.0 = Debug|x64 - {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Release|x64.ActiveCfg = Release|x64 - {33D2FD22-DEF2-4507-A58A-368F641AEBE5}.Release|x64.Build.0 = Release|x64 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|x64.ActiveCfg = Debug|x64 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|x64.Build.0 = Debug|x64 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|x64.ActiveCfg = Release|x64 - {E6646FFE-3588-4276-8A15-8D65C22711C1}.Debug|x64.ActiveCfg = Debug|x64 - {E6646FFE-3588-4276-8A15-8D65C22711C1}.Debug|x64.Build.0 = Debug|x64 - {E6646FFE-3588-4276-8A15-8D65C22711C1}.Release|x64.ActiveCfg = Release|x64 - {E6646FFE-3588-4276-8A15-8D65C22711C1}.Release|x64.Build.0 = Release|x64 - {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Debug|x64.ActiveCfg = Debug|x64 - {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Debug|x64.Build.0 = Debug|x64 - {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Release|x64.ActiveCfg = Release|x64 - {1D5787D4-52E4-45DB-951B-82F220EE0C6A}.Release|x64.Build.0 = Release|x64 - {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Debug|x64.ActiveCfg = Debug|x64 - {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Debug|x64.Build.0 = Debug|x64 - {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Release|x64.ActiveCfg = Release|x64 - {62836DC1-DF77-4B98-BF2D-45C943B7DDC6}.Release|x64.Build.0 = Release|x64 - {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Debug|x64.ActiveCfg = Debug|x64 - {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Debug|x64.Build.0 = Debug|x64 - {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Release|x64.ActiveCfg = Release|x64 - {482999D1-B7E2-466E-9F8D-2119F93EAFD9}.Release|x64.Build.0 = Release|x64 - {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Debug|x64.ActiveCfg = Debug|x64 - {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Debug|x64.Build.0 = Debug|x64 - {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC}.Release|x64.ActiveCfg = Release|x64 - {B3DD765E-694E-4494-BAD7-37BBF2942517}.Debug|x64.ActiveCfg = Debug|x64 - {B3DD765E-694E-4494-BAD7-37BBF2942517}.Debug|x64.Build.0 = Debug|x64 - {B3DD765E-694E-4494-BAD7-37BBF2942517}.Release|x64.ActiveCfg = Release|x64 - {B3DD765E-694E-4494-BAD7-37BBF2942517}.Release|x64.Build.0 = Release|x64 - {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Debug|x64.ActiveCfg = Debug|x64 - {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Debug|x64.Build.0 = Debug|x64 - {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Release|x64.ActiveCfg = Release|x64 - {9A2F2441-5972-4EA8-9215-4119FCE0FB68}.Release|x64.Build.0 = Release|x64 - {014DA766-B37B-4581-BC26-963EA5507931}.Debug|x64.ActiveCfg = Debug|x64 - {014DA766-B37B-4581-BC26-963EA5507931}.Debug|x64.Build.0 = Debug|x64 - {014DA766-B37B-4581-BC26-963EA5507931}.Release|x64.ActiveCfg = Release|x64 - {014DA766-B37B-4581-BC26-963EA5507931}.Release|x64.Build.0 = Release|x64 - {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Debug|x64.ActiveCfg = Debug|x64 - {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Debug|x64.Build.0 = Debug|x64 - {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Release|x64.ActiveCfg = Release|x64 - {D667AF32-028A-4A5D-BE19-F46776F0F6B2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {E6F26F9A-FF64-4F0A-B749-CD309EE357EE} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} - {482999D1-B7E2-466E-9F8D-2119F93EAFD9} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} - {B3DD765E-694E-4494-BAD7-37BBF2942517} = {DD043083-71A4-409A-AA91-F9C548DCF7EC} - {6CEE834A-8104-46A8-8902-64C81BD7928F} = {D45DF403-6781-444E-B654-A96868C5BE68} - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976} = {D45DF403-6781-444E-B654-A96868C5BE68} - {0F30EBCF-09F3-4EED-BF54-4214BCE53FEC} = {D45DF403-6781-444E-B654-A96868C5BE68} - {E6646FFE-3588-4276-8A15-8D65C22711C1} = {33EBFE78-A1A8-4961-8938-92A271941F94} - {1D5787D4-52E4-45DB-951B-82F220EE0C6A} = {33EBFE78-A1A8-4961-8938-92A271941F94} - {62836DC1-DF77-4B98-BF2D-45C943B7DDC6} = {33EBFE78-A1A8-4961-8938-92A271941F94} - {33D2FD22-DEF2-4507-A58A-368F641AEBE5} = {33EBFE78-A1A8-4961-8938-92A271941F94} - {9A2F2441-5972-4EA8-9215-4119FCE0FB68} = {33EBFE78-A1A8-4961-8938-92A271941F94} - {014DA766-B37B-4581-BC26-963EA5507931} = {33EBFE78-A1A8-4961-8938-92A271941F94} - {D667AF32-028A-4A5D-BE19-F46776F0F6B2} = {33EBFE78-A1A8-4961-8938-92A271941F94} - EndGlobalSection -EndGlobal diff --git a/Common/BestGpu.cpp b/Common/BestGpu.cpp index cc3676d5f..286dd75e5 100644 --- a/Common/BestGpu.cpp +++ b/Common/BestGpu.cpp @@ -4,15 +4,21 @@ // // +// This file requires the NVML library. Unfortunately, this library does not install an environment variable for locating it. +// On Windows, the SDK gets installed to "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml" (/include, /lib). +// From the SDK documentation: +// "The NVML library can be found at: %ProgramW6432%\"NVIDIA Corporation"\NVSMI\ on Windows, but will not be added to the path. To dynamically link to NVML, add this path to the PATH environmental variable. To dynamically load NVML, call LoadLibrary with this path." +// "On Linux the NVML library will be found on the standard library path. For 64-bit Linux, both the 32-bit and 64-bit NVML libraries will be installed." + #define _CRT_SECURE_NO_WARNINGS // "secure" CRT not available on all platforms --add this at the top of all CPP files that give "function or variable may be unsafe" warnings #include "Platform.h" #include "BestGpu.h" #include "commandArgUtil.h" // for ConfigParameters #ifndef CPUONLY #pragma comment (lib, "cudart.lib") -#pragma comment (lib, "nvml.lib") #include -#include +#include // note: expected at "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\include" (Windows) +#pragma comment (lib, "nvml.lib") // note: expected at "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib" (Windows) #include #endif #include "CommonMatrix.h" // for CPUDEVICE and AUTOPLACEMATRIX diff --git a/Common/Include/nvml.h b/Common/trash/nvml.h similarity index 100% rename from Common/Include/nvml.h rename to Common/trash/nvml.h diff --git a/DataReader/BinaryReader/BinaryReader.vcxproj b/DataReader/BinaryReader/BinaryReader.vcxproj index 40f1aa78f..626ee37b3 100644 --- a/DataReader/BinaryReader/BinaryReader.vcxproj +++ b/DataReader/BinaryReader/BinaryReader.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -32,25 +24,12 @@ UCIReader - - DynamicLibrary - true - v120 - Unicode - DynamicLibrary true v120 Unicode - - DynamicLibrary - false - v120 - true - Unicode - DynamicLibrary false @@ -61,54 +40,25 @@ - - - - - - - - true - ..\..\Math\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); - true ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\Math\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + $(Platform)\$(Configuration)\$(ProjectName)\ false ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - Use @@ -126,26 +76,6 @@ $(SolutionDir)$(Platform)\$(Configuration)\;..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - true - - Level4 @@ -194,30 +124,21 @@ NotUsing NotUsing - NotUsing - false false - - - false false - - - Create Create - Create Create diff --git a/DataReader/DSSMReader/DSSMReader.vcxproj b/DataReader/DSSMReader/DSSMReader.vcxproj index 9e4d94bcd..f9767b093 100644 --- a/DataReader/DSSMReader/DSSMReader.vcxproj +++ b/DataReader/DSSMReader/DSSMReader.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -32,25 +24,12 @@ DSSMReader - - DynamicLibrary - true - v120 - Unicode - DynamicLibrary true v120 Unicode - - DynamicLibrary - false - v120 - true - Unicode - DynamicLibrary false @@ -61,55 +40,26 @@ - - - - - - - - true - ..\..\Math\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); - true ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ false c:\Program Files\Microsoft MPI\Inc;..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); c:\Program Files\Microsoft MPI\Lib\amd64;$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;DSSMREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - NotUsing @@ -128,26 +78,6 @@ $(SolutionDir)$(Platform)\$(Configuration)\;..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - - Level3 - Use - MaxSpeed - true - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSSMREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\$(Configuration)\ - true - - Level4 @@ -179,7 +109,6 @@ false - false false @@ -194,7 +123,6 @@ NotUsing NotUsing - NotUsing @@ -203,13 +131,10 @@ NotUsing NotUsing - NotUsing NotUsing NotUsing - NotUsing - true diff --git a/DataReader/HTKMLFReader/HTKMLFReader.vcxproj b/DataReader/HTKMLFReader/HTKMLFReader.vcxproj index 9f380a385..cc2f97c0b 100644 --- a/DataReader/HTKMLFReader/HTKMLFReader.vcxproj +++ b/DataReader/HTKMLFReader/HTKMLFReader.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -32,25 +24,12 @@ - - DynamicLibrary - true - v120 - Unicode - DynamicLibrary true v120 Unicode - - DynamicLibrary - false - v120 - true - Unicode - DynamicLibrary false @@ -61,53 +40,25 @@ - - - - - - - - true - ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); - true ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + $(Platform)\$(Configuration)\$(ProjectName)\ false ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTKMLFREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - CNTKMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - Use @@ -123,25 +74,6 @@ CNTKMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTKMLFREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - CNTKMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - Level4 @@ -199,16 +131,10 @@ - false false - - - false false - - @@ -217,9 +143,7 @@ - Create Create - Create Create diff --git a/DataReader/LMSequenceReader/LMSequenceReader.vcxproj b/DataReader/LMSequenceReader/LMSequenceReader.vcxproj index c447d4dbe..5f24889a9 100644 --- a/DataReader/LMSequenceReader/LMSequenceReader.vcxproj +++ b/DataReader/LMSequenceReader/LMSequenceReader.vcxproj @@ -1,152 +1,154 @@ - - - - - Debug - x64 - - - Release - x64 - - - - {9A2F2441-5972-4EA8-9215-4119FCE0FB68} - - - - - - - - - Win32Proj - UCIReader - LMSequenceReader - - - - DynamicLibrary - true - v120 - Unicode - - - DynamicLibrary - false - v120 - true - Unicode - - - - - - - - - - - - - true - ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - - Use - Level4 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) - true - ..\..\common\include;..\..\math\math - true - - - Windows - true - CNTKMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\;..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - - - - Level4 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) - true - ..\..\common\include;..\..\math\math - false - /d2Zi+ %(AdditionalOptions) - true - - - Windows - true - true - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\$(Configuration)\ - true - - - - - - - - - - - - - - - - - NotUsing - NotUsing - - - - - NotUsing - NotUsing - - - NotUsing - NotUsing - - - - false - - - false - - - - - Create - Create - - - - - - - - - - - + + + + + Debug + x64 + + + Release + x64 + + + + {9A2F2441-5972-4EA8-9215-4119FCE0FB68} + + + + + + + + + Win32Proj + UCIReader + LMSequenceReader + + + + DynamicLibrary + true + v120 + Unicode + + + DynamicLibrary + false + v120 + true + Unicode + + + + + + + + + + + + + true + ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ + + + false + ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ + + + + Use + Level4 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) + true + ..\..\common\include;..\..\math\math + true + + + Windows + true + CNTKMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)$(Platform)\$(Configuration)\;..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) + + + + + Level4 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) + true + ..\..\common\include;..\..\math\math + false + /d2Zi+ %(AdditionalOptions) + true + + + Windows + true + true + true + CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\math\$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\$(Configuration)\ + true + + + + + + + + + + + + + + + + + NotUsing + NotUsing + + + + + NotUsing + NotUsing + + + NotUsing + NotUsing + + + + false + + + false + + + + + Create + Create + + + + + + + + + + + \ No newline at end of file diff --git a/DataReader/LUSequenceReader/LUSequenceReader.vcxproj b/DataReader/LUSequenceReader/LUSequenceReader.vcxproj index ad0bc7613..c6ffe7350 100644 --- a/DataReader/LUSequenceReader/LUSequenceReader.vcxproj +++ b/DataReader/LUSequenceReader/LUSequenceReader.vcxproj @@ -52,11 +52,13 @@ true ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ false ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ diff --git a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj index 9e9adddf4..8f81f06ae 100644 --- a/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj +++ b/DataReader/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -32,25 +24,12 @@ LibSVMBinaryReader - - DynamicLibrary - true - v120 - Unicode - DynamicLibrary true v120 Unicode - - DynamicLibrary - false - v120 - true - Unicode - DynamicLibrary false @@ -61,55 +40,26 @@ - - - - - - - - true - ..\..\Math\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); - true ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - ..\..\math\math;$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ false c:\Program Files\Microsoft MPI\Inc;..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); c:\Program Files\Microsoft MPI\Lib\amd64;$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSVMBINARYREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - Use @@ -128,26 +78,6 @@ $(SolutionDir)$(Platform)\$(Configuration)\;..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - - Level3 - Use - MaxSpeed - true - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;DSSMREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\$(Configuration)\ - true - - Level4 @@ -176,9 +106,7 @@ - - false - + @@ -189,8 +117,6 @@ NotUsing NotUsing - NotUsing - NotUsing NotUsing @@ -201,15 +127,10 @@ NotUsing NotUsing - NotUsing - NotUsing NotUsing NotUsing - NotUsing - true - NotUsing NotUsing diff --git a/DataReader/UCIFastReader/UCIFastReader.vcxproj b/DataReader/UCIFastReader/UCIFastReader.vcxproj index 9bb579937..7588216b2 100644 --- a/DataReader/UCIFastReader/UCIFastReader.vcxproj +++ b/DataReader/UCIFastReader/UCIFastReader.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -32,25 +24,12 @@ UCIReader - - DynamicLibrary - true - v120 - Unicode - DynamicLibrary true v120 Unicode - - DynamicLibrary - false - v120 - true - Unicode - DynamicLibrary false @@ -61,54 +40,25 @@ - - - - - - - - true - ..\..\Math\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); - true ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\Math\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + $(Platform)\$(Configuration)\$(ProjectName)\ false ..\..\common\include;..\..\math\math;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - Use @@ -126,26 +76,6 @@ $(SolutionDir)$(Platform)\$(Configuration)\;..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - CNTKmath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - true - - Level4 @@ -199,23 +129,15 @@ - false false - - - false false - - - Create Create - Create Create diff --git a/Documentation/Documentation.vcxproj b/Documentation/Documentation.vcxproj new file mode 100644 index 000000000..ebf2b88a3 --- /dev/null +++ b/Documentation/Documentation.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {9216C53F-46EB-4669-B781-FF8503F27157} + Documentation + + + + Application + true + v120 + MultiByte + + + Application + false + v120 + true + MultiByte + + + + + + + + + + + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Documentation/Documentation.vcxproj.filters b/Documentation/Documentation.vcxproj.filters new file mode 100644 index 000000000..a1d222203 --- /dev/null +++ b/Documentation/Documentation.vcxproj.filters @@ -0,0 +1,159 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {d9322d02-0567-44ed-9be7-c0807d14b1a5} + + + {6bbb6aeb-9101-4c9a-9c8a-f21c128368d6} + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Tutorial + + + Documents + + + Documents + + + Documents + + + Documents + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\lyx + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + CNTK-TechReport\figures + + + \ No newline at end of file diff --git a/Documentation/Configuration Files.docx b/Documentation/Documents/Configuration Files.docx similarity index 100% rename from Documentation/Configuration Files.docx rename to Documentation/Documents/Configuration Files.docx diff --git a/Documentation/External Buffer Behavior.docx b/Documentation/Documents/External Buffer Behavior.docx similarity index 100% rename from Documentation/External Buffer Behavior.docx rename to Documentation/Documents/External Buffer Behavior.docx diff --git a/Documentation/Model Editing Language.docx b/Documentation/Documents/Model Editing Language.docx similarity index 100% rename from Documentation/Model Editing Language.docx rename to Documentation/Documents/Model Editing Language.docx diff --git a/Documentation/Network Description Language.docx b/Documentation/Documents/Network Description Language.docx similarity index 100% rename from Documentation/Network Description Language.docx rename to Documentation/Documents/Network Description Language.docx diff --git a/Documentation/CNTK-Tutorial-ICASSP2015.pdf b/Documentation/Tutorial/CNTK-Tutorial-ICASSP2015.pdf similarity index 100% rename from Documentation/CNTK-Tutorial-ICASSP2015.pdf rename to Documentation/Tutorial/CNTK-Tutorial-ICASSP2015.pdf diff --git a/Linux/Linux.vcxproj b/Linux/Linux.vcxproj new file mode 100644 index 000000000..d33be25ef --- /dev/null +++ b/Linux/Linux.vcxproj @@ -0,0 +1,76 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E7AD9034-C010-4FC7-9768-E7EE4EE94FFF} + Linux + + + + Application + true + v120 + MultiByte + + + Application + false + v120 + true + MultiByte + + + + + + + + + + + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/Linux/Linux.vcxproj.filters b/Linux/Linux.vcxproj.filters new file mode 100644 index 000000000..662801080 --- /dev/null +++ b/Linux/Linux.vcxproj.filters @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/MachineLearning/cn/cn.cpp b/MachineLearning/CNTK/CNTK.cpp similarity index 100% rename from MachineLearning/cn/cn.cpp rename to MachineLearning/CNTK/CNTK.cpp diff --git a/MachineLearning/cn/cn.vcxproj b/MachineLearning/CNTK/CNTK.vcxproj similarity index 61% rename from MachineLearning/cn/cn.vcxproj rename to MachineLearning/CNTK/CNTK.vcxproj index aa01c1d8b..bc8774852 100644 --- a/MachineLearning/cn/cn.vcxproj +++ b/MachineLearning/CNTK/CNTK.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -29,28 +21,16 @@ Win32Proj - cn + CNTK + CNTK - - Application - true - v120 - Unicode - Application true v120 Unicode - - Application - false - v120 - true - Unicode - Application false @@ -60,52 +40,28 @@ - - - - - - - - true - true - c:\Program Files\Microsoft MPI\Inc;..\..\Math\Math;..\..\Common\;..\..\Common\include;..\..\Common\PTask\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(CUDA_PATH)\include;$(WindowsSDK_IncludePath); - c:\Program Files\Microsoft MPI\Lib\amd64;$(SolutionDir)$(Platform)\$(Configuration);$(SolutionDir)..\Common\lib;$(SolutionDir)..\Common\PTask\lib\$(Configuration)\;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(CUDA_PATH)\lib\$(Platform) + c:\Program Files\Microsoft MPI\Inc;..\..\Math\Math;..\..\Common\;..\..\Common\include;$(VCInstallDir)include;$(CUDA_PATH)\include;$(WindowsSDK_IncludePath); + c:\Program Files\Microsoft MPI\Lib\amd64;$(SolutionDir)$(Platform)\$(Configuration);$(SolutionDir)..\Common\lib;$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64);$(CUDA_PATH)\lib\$(Platform) Build - - - false + $(Platform)\$(Configuration)\$(ProjectName)\ false - c:\Program Files\Microsoft MPI\Inc;..\..\Math\Math;..\..\Common\;..\..\Common\include;..\..\Common\PTask\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(CUDA_PATH)\include;$(WindowsSDK_IncludePath); - c:\Program Files\Microsoft MPI\Lib\amd64;$(SolutionDir)$(Platform)\$(Configuration);$(SolutionDir)..\Common\lib;$(SolutionDir)..\Common\PTask\lib\$(Configuration)\;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(CUDA_PATH)\lib\$(Platform) + c:\Program Files\Microsoft MPI\Inc;..\..\Math\Math;..\..\Common\;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(CUDA_PATH)\include;$(WindowsSDK_IncludePath); + c:\Program Files\Microsoft MPI\Lib\amd64;$(SolutionDir)$(Platform)\$(Configuration);$(SolutionDir)..\Common\lib;$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64);$(CUDA_PATH)\lib\$(Platform) Build - $(SolutionDir)..\Common\PTask\bin\;$(ExecutablePath) + $(ExecutablePath) + $(Platform)\$(Configuration)\$(ProjectName)\ - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - @@ -117,19 +73,18 @@ true true /bigobj %(AdditionalOptions) + "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\include" Console true - Delayimp.lib;nvml.lib;cntkMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\ - CNTKMath.dll;nvml.dll;nvcuda.dll + CNTKMath.lib; nvml.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) + "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib" + CNTKMath.dll; nvml.dll; cudart64_70.dll - - - - + XCOPY /I /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) + Copying NVidia GDK extension DLL to target folder @@ -144,25 +99,6 @@ prebuild.bat - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - true - - Level4 @@ -176,19 +112,21 @@ Speed /d2Zi+ %(AdditionalOptions) true + "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\include" Console true true true - Delayimp.lib;nvml.lib;cntkMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + CNTKMath.lib; nvml.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) true - CNTKMath.dll;nvml.dll;nvcuda.dll + CNTKMath.dll; nvml.dll; cudart64_70.dll + "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib" - copy $(SolutionDir)..\Common\PTask\bin\*.dll $(TargetDir) - Copy over the NVidia tools extention DLL + XCOPY /I /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) + Copying NVidia GDK extension DLL to target folder @@ -256,7 +194,7 @@ NotUsing - + diff --git a/MachineLearning/cn/cn.vcxproj.filters b/MachineLearning/CNTK/CNTK.vcxproj.filters similarity index 92% rename from MachineLearning/cn/cn.vcxproj.filters rename to MachineLearning/CNTK/CNTK.vcxproj.filters index 8c07d0ef4..897a06e88 100644 --- a/MachineLearning/cn/cn.vcxproj.filters +++ b/MachineLearning/CNTK/CNTK.vcxproj.filters @@ -28,14 +28,11 @@ Network - - Main - - Main + Misc - Main + Misc Network @@ -43,6 +40,7 @@ Common + @@ -124,10 +122,10 @@ Nodes - Main + Misc - Main + Misc Common\Include @@ -144,7 +142,7 @@ Model Editing - Main + Misc @@ -166,7 +164,7 @@ {0b366814-48b2-4619-bf92-85ee24e3cbc1} - + {3c119a92-ffb2-4850-adae-01778324974d} diff --git a/MachineLearning/cn/cn.vcxproj.vspscc b/MachineLearning/CNTK/CNTK.vcxproj.vspscc similarity index 100% rename from MachineLearning/cn/cn.vcxproj.vspscc rename to MachineLearning/CNTK/CNTK.vcxproj.vspscc diff --git a/MachineLearning/cn/CompositeComputationNode.h b/MachineLearning/CNTK/CompositeComputationNode.h similarity index 100% rename from MachineLearning/cn/CompositeComputationNode.h rename to MachineLearning/CNTK/CompositeComputationNode.h diff --git a/MachineLearning/cn/ComputationNetwork.cpp b/MachineLearning/CNTK/ComputationNetwork.cpp similarity index 100% rename from MachineLearning/cn/ComputationNetwork.cpp rename to MachineLearning/CNTK/ComputationNetwork.cpp diff --git a/MachineLearning/cn/ComputationNetwork.h b/MachineLearning/CNTK/ComputationNetwork.h similarity index 100% rename from MachineLearning/cn/ComputationNetwork.h rename to MachineLearning/CNTK/ComputationNetwork.h diff --git a/MachineLearning/cn/ComputationNetworkHelper.h b/MachineLearning/CNTK/ComputationNetworkHelper.h similarity index 100% rename from MachineLearning/cn/ComputationNetworkHelper.h rename to MachineLearning/CNTK/ComputationNetworkHelper.h diff --git a/MachineLearning/cn/ComputationNode.cpp b/MachineLearning/CNTK/ComputationNode.cpp similarity index 100% rename from MachineLearning/cn/ComputationNode.cpp rename to MachineLearning/CNTK/ComputationNode.cpp diff --git a/MachineLearning/cn/ComputationNode.h b/MachineLearning/CNTK/ComputationNode.h similarity index 100% rename from MachineLearning/cn/ComputationNode.h rename to MachineLearning/CNTK/ComputationNode.h diff --git a/MachineLearning/cn/DefaultMacros.txt b/MachineLearning/CNTK/DefaultMacros.txt similarity index 100% rename from MachineLearning/cn/DefaultMacros.txt rename to MachineLearning/CNTK/DefaultMacros.txt diff --git a/MachineLearning/cn/EvaluationCriterionNode.h b/MachineLearning/CNTK/EvaluationCriterionNode.h similarity index 100% rename from MachineLearning/cn/EvaluationCriterionNode.h rename to MachineLearning/CNTK/EvaluationCriterionNode.h diff --git a/MachineLearning/cn/FullNetworkBuilder.h b/MachineLearning/CNTK/FullNetworkBuilder.h similarity index 100% rename from MachineLearning/cn/FullNetworkBuilder.h rename to MachineLearning/CNTK/FullNetworkBuilder.h diff --git a/MachineLearning/cn/IComputationNetBuilder.h b/MachineLearning/CNTK/IComputationNetBuilder.h similarity index 100% rename from MachineLearning/cn/IComputationNetBuilder.h rename to MachineLearning/CNTK/IComputationNetBuilder.h diff --git a/MachineLearning/cn/IExecutionEngine.h b/MachineLearning/CNTK/IExecutionEngine.h similarity index 100% rename from MachineLearning/cn/IExecutionEngine.h rename to MachineLearning/CNTK/IExecutionEngine.h diff --git a/MachineLearning/cn/ModelEditLanguage.cpp b/MachineLearning/CNTK/ModelEditLanguage.cpp similarity index 100% rename from MachineLearning/cn/ModelEditLanguage.cpp rename to MachineLearning/CNTK/ModelEditLanguage.cpp diff --git a/MachineLearning/cn/ModelEditLanguage.h b/MachineLearning/CNTK/ModelEditLanguage.h similarity index 100% rename from MachineLearning/cn/ModelEditLanguage.h rename to MachineLearning/CNTK/ModelEditLanguage.h diff --git a/MachineLearning/cn/NDLNetworkBuilder.h b/MachineLearning/CNTK/NDLNetworkBuilder.h similarity index 100% rename from MachineLearning/cn/NDLNetworkBuilder.h rename to MachineLearning/CNTK/NDLNetworkBuilder.h diff --git a/MachineLearning/cn/NDLUtil.h b/MachineLearning/CNTK/NDLUtil.h similarity index 100% rename from MachineLearning/cn/NDLUtil.h rename to MachineLearning/CNTK/NDLUtil.h diff --git a/MachineLearning/cn/NdlScript.txt b/MachineLearning/CNTK/NdlScript.txt similarity index 100% rename from MachineLearning/cn/NdlScript.txt rename to MachineLearning/CNTK/NdlScript.txt diff --git a/MachineLearning/cn/NetworkDescriptionLanguage.cpp b/MachineLearning/CNTK/NetworkDescriptionLanguage.cpp similarity index 100% rename from MachineLearning/cn/NetworkDescriptionLanguage.cpp rename to MachineLearning/CNTK/NetworkDescriptionLanguage.cpp diff --git a/MachineLearning/cn/NetworkDescriptionLanguage.h b/MachineLearning/CNTK/NetworkDescriptionLanguage.h similarity index 100% rename from MachineLearning/cn/NetworkDescriptionLanguage.h rename to MachineLearning/CNTK/NetworkDescriptionLanguage.h diff --git a/MachineLearning/cn/PTask.cpp b/MachineLearning/CNTK/PTask.cpp similarity index 100% rename from MachineLearning/cn/PTask.cpp rename to MachineLearning/CNTK/PTask.cpp diff --git a/MachineLearning/cn/PTask.h b/MachineLearning/CNTK/PTask.h similarity index 100% rename from MachineLearning/cn/PTask.h rename to MachineLearning/CNTK/PTask.h diff --git a/MachineLearning/cn/PTaskComputationNetwork.h b/MachineLearning/CNTK/PTaskComputationNetwork.h similarity index 100% rename from MachineLearning/cn/PTaskComputationNetwork.h rename to MachineLearning/CNTK/PTaskComputationNetwork.h diff --git a/MachineLearning/cn/PTaskExecutionEngine.h b/MachineLearning/CNTK/PTaskExecutionEngine.h similarity index 100% rename from MachineLearning/cn/PTaskExecutionEngine.h rename to MachineLearning/CNTK/PTaskExecutionEngine.h diff --git a/MachineLearning/cn/PTaskGraphBuilder.cpp b/MachineLearning/CNTK/PTaskGraphBuilder.cpp similarity index 100% rename from MachineLearning/cn/PTaskGraphBuilder.cpp rename to MachineLearning/CNTK/PTaskGraphBuilder.cpp diff --git a/MachineLearning/cn/PTaskGraphBuilder.h b/MachineLearning/CNTK/PTaskGraphBuilder.h similarity index 100% rename from MachineLearning/cn/PTaskGraphBuilder.h rename to MachineLearning/CNTK/PTaskGraphBuilder.h diff --git a/MachineLearning/cn/RecurrentNetworkBuilder.h b/MachineLearning/CNTK/RecurrentNetworkBuilder.h similarity index 100% rename from MachineLearning/cn/RecurrentNetworkBuilder.h rename to MachineLearning/CNTK/RecurrentNetworkBuilder.h diff --git a/MachineLearning/cn/SGD.h b/MachineLearning/CNTK/SGD.h similarity index 100% rename from MachineLearning/cn/SGD.h rename to MachineLearning/CNTK/SGD.h diff --git a/MachineLearning/cn/SimpleEvaluator.h b/MachineLearning/CNTK/SimpleEvaluator.h similarity index 100% rename from MachineLearning/cn/SimpleEvaluator.h rename to MachineLearning/CNTK/SimpleEvaluator.h diff --git a/MachineLearning/cn/SimpleNetworkBuilder.cpp b/MachineLearning/CNTK/SimpleNetworkBuilder.cpp similarity index 100% rename from MachineLearning/cn/SimpleNetworkBuilder.cpp rename to MachineLearning/CNTK/SimpleNetworkBuilder.cpp diff --git a/MachineLearning/cn/SimpleNetworkBuilder.h b/MachineLearning/CNTK/SimpleNetworkBuilder.h similarity index 100% rename from MachineLearning/cn/SimpleNetworkBuilder.h rename to MachineLearning/CNTK/SimpleNetworkBuilder.h diff --git a/MachineLearning/cn/SimpleOutputWriter.h b/MachineLearning/CNTK/SimpleOutputWriter.h similarity index 100% rename from MachineLearning/cn/SimpleOutputWriter.h rename to MachineLearning/CNTK/SimpleOutputWriter.h diff --git a/MachineLearning/cn/SimpleRecurrentNetEvaluator.h b/MachineLearning/CNTK/SimpleRecurrentNetEvaluator.h similarity index 100% rename from MachineLearning/cn/SimpleRecurrentNetEvaluator.h rename to MachineLearning/CNTK/SimpleRecurrentNetEvaluator.h diff --git a/MachineLearning/cn/SynchronousExecutionEngine.h b/MachineLearning/CNTK/SynchronousExecutionEngine.h similarity index 100% rename from MachineLearning/cn/SynchronousExecutionEngine.h rename to MachineLearning/CNTK/SynchronousExecutionEngine.h diff --git a/MachineLearning/cn/TrainingCriterionNode.h b/MachineLearning/CNTK/TrainingCriterionNode.h similarity index 100% rename from MachineLearning/cn/TrainingCriterionNode.h rename to MachineLearning/CNTK/TrainingCriterionNode.h diff --git a/MachineLearning/cn/fileutil.cpp b/MachineLearning/CNTK/fileutil.cpp similarity index 100% rename from MachineLearning/cn/fileutil.cpp rename to MachineLearning/CNTK/fileutil.cpp diff --git a/MachineLearning/cn/modelEditor.txt b/MachineLearning/CNTK/modelEditor.txt similarity index 100% rename from MachineLearning/cn/modelEditor.txt rename to MachineLearning/CNTK/modelEditor.txt diff --git a/MachineLearning/cn/modelEditorFromScratch.txt b/MachineLearning/CNTK/modelEditorFromScratch.txt similarity index 100% rename from MachineLearning/cn/modelEditorFromScratch.txt rename to MachineLearning/CNTK/modelEditorFromScratch.txt diff --git a/MachineLearning/cn/prebuild.bat b/MachineLearning/CNTK/prebuild.bat similarity index 100% rename from MachineLearning/cn/prebuild.bat rename to MachineLearning/CNTK/prebuild.bat diff --git a/MachineLearning/cn/stdafx.cpp b/MachineLearning/CNTK/stdafx.cpp similarity index 100% rename from MachineLearning/cn/stdafx.cpp rename to MachineLearning/CNTK/stdafx.cpp diff --git a/MachineLearning/cn/stdafx.h b/MachineLearning/CNTK/stdafx.h similarity index 100% rename from MachineLearning/cn/stdafx.h rename to MachineLearning/CNTK/stdafx.h diff --git a/MachineLearning/cn/targetver.h b/MachineLearning/CNTK/targetver.h similarity index 100% rename from MachineLearning/cn/targetver.h rename to MachineLearning/CNTK/targetver.h diff --git a/MachineLearning/cn/tests.cpp b/MachineLearning/CNTK/tests.cpp similarity index 100% rename from MachineLearning/cn/tests.cpp rename to MachineLearning/CNTK/tests.cpp diff --git a/MachineLearning/CNTKEval/CNTKEval.vcxproj b/MachineLearning/CNTKEval/CNTKEval.vcxproj index 2e179069d..baab9935c 100644 --- a/MachineLearning/CNTKEval/CNTKEval.vcxproj +++ b/MachineLearning/CNTKEval/CNTKEval.vcxproj @@ -50,13 +50,15 @@ true - ..\cn;..\..\common\include;..\..\math\math;$(CUDA_PATH)\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) + ..\CNTK;..\..\common\include;..\..\math\math;$(CUDA_PATH)\include;$(VCInstallDir)include;$(WindowsSDK_IncludePath) $(CUDA_PATH)\lib\$(Platform);$(SolutionDir)$(Platform)\;$(Configuration);$(SolutionDir)..\Common\lib;$(SolutionDir)..\CNTK\Common\lib;$(Configuration)\;$(SolutionDir)..\..\cntk\Common\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64);$(CUDA_PATH)\lib\;$(Platform) + $(Platform)\$(Configuration)\$(ProjectName)\ false - ..\cn;..\..\common\include;..\..\math\math;..\..\common\Ptask\include;$(CUDA_PATH)\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath) + ..\CNTK;..\..\common\include;..\..\math\math;$(CUDA_PATH)\include;$(VCInstallDir)include;$(WindowsSDK_IncludePath) $(CUDA_PATH)\lib\$(Platform);$(SolutionDir)$(Platform)\;$(Configuration);$(SolutionDir)..\Common\lib;$(SolutionDir)..\CNTK\Common\lib;$(Configuration)\;$(SolutionDir)..\..\cntk\Common\lib;$(Configuration)\;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64) + $(Platform)\$(Configuration)\$(ProjectName)\ @@ -65,16 +67,20 @@ Disabled EVALDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\math\math + ..\Common\include;..\Math\Math;"c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\include" true Windows true - Delayimp.lib;cntkMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\;..\..\math\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration) - CNTKMath.dll;nvml.dll + CNTKMath.lib; nvml.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) + $(SolutionDir)$(Platform)\$(Configuration)\; "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib" + CNTKMath.dll; nvml.dll; cudart64_70.dll + + XCOPY /I /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) + Copying NVidia GDK extension DLL to target folder + @@ -85,7 +91,7 @@ true EVALDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;UCIREADER_EXPORTS;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\math\math + ..\Common\include; ..\Math\Math; "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\include" false /d2Zi+ %(AdditionalOptions) MultiThreadedDLL @@ -96,11 +102,15 @@ true true true - Delayimp.lib;cntkMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\math\$(Platform)\$(Configuration);$(SolutionDir)$(Platform)\$(Configuration)\ + CNTKMath.lib; nvml.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) + $(SolutionDir)$(Platform)\$(Configuration)\; "c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib" true - CNTKMath.dll;nvml.dll; cudart64_70.dll + CNTKMath.dll; nvml.dll; cudart64_70.dll + + XCOPY /I /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) + Copying NVidia GDK extension DLL to target folder + @@ -129,7 +139,7 @@ NotUsing - + NotUsing @@ -142,11 +152,6 @@ - - - {60bdb847-d0c4-4fd3-a947-0c15c08bcdb5} - - diff --git a/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters b/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters index fa82e0233..df2805694 100644 --- a/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters +++ b/MachineLearning/CNTKEval/CNTKEval.vcxproj.filters @@ -2,7 +2,6 @@ - @@ -21,6 +20,7 @@ Common + diff --git a/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj b/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj index bf78bc036..d99bd6ae4 100644 --- a/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj +++ b/MachineLearning/CNTKEval/CNTKEvalTest/CNTKEvalTest.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -24,25 +16,12 @@ CNTKEvalTest - - Application - true - v120 - Unicode - Application true v120 Unicode - - Application - false - v120 - true - Unicode - Application false @@ -53,48 +32,25 @@ - - - - - - - - true - true ..\..\..\Math\Math;..\..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false + $(Platform)\$(Configuration)\$(ProjectName)\ false ..\..\..\Math\Math;..\..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - Use @@ -110,23 +66,6 @@ cntkMath.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - Level4 @@ -170,9 +109,7 @@ - Create Create - Create Create diff --git a/MachineLearning/PTaskHost/PTaskHost.cpp b/MachineLearning/PTaskHost/PTaskHost.cpp deleted file mode 100644 index d56f63d12..000000000 --- a/MachineLearning/PTaskHost/PTaskHost.cpp +++ /dev/null @@ -1,59 +0,0 @@ - -#include "stdafx.h" -#include "PTaskHost.h" - -#ifdef USE_PTASK - -PTASKHOST_API void __stdcall -HostTask(LPDEPENDENTCONTEXT depContext) -{ - printf("Host task called...\n"); - - /* - assert(depContext->nArguments == 4 || depContext->nArguments == 5); // some versions pass a sync variable too - assert(depContext->ppArguments != NULL); - - if(depContext->pbIsDependentBinding[0]) { - - void * pvStream = depContext->pStreams[0]; - cudaStream_t hStream = reinterpret_cast(pvStream); - size_t device = reinterpret_cast(depContext->pDependentDevices[0]); - onstream override(hStream); - onptaskdevice overridedev(device); - - // in this case the depContext->ppArguments[*] are device pointers - GEMM_PARAMS * pParams = (GEMM_PARAMS*) depContext->ppArguments[depContext->nArguments-1]; - MARKRANGEENTER(L"SGemm-A,B,C ctors"); - cudamatrixops A(pParams->ADim.rows, pParams->ADim.cols, pParams->ADim.colstride, (float *)depContext->ppArguments[0], "GEMM-A"); - cudamatrixops B(pParams->BDim.rows, pParams->BDim.cols, pParams->BDim.colstride, (float *)depContext->ppArguments[1], "GEMM-B"); - cudamatrixops C(pParams->CDim.rows, pParams->CDim.cols, pParams->CDim.colstride, (float *)depContext->ppArguments[2]); - MARKRANGEEXIT(); - if (pParams->scale < 1e-12 && pParams->scale != 0.0f) { - fprintf(stderr, "!!Scale small, but not equal to zero in GEMM!!\n"); - pParams->scale = 0.0f; - } - else - { - DEPMATRIX3NANCHECK(depContext, SGemm, A, B, C); - } - MARKRANGEENTER(L"gemm"); - C.gemm(pParams->scale, A, pParams->Aistransposed, B, pParams->Bistransposed, pParams->ABweight); - MARKRANGEEXIT(); - // TODO: check that ABweight and thisscale can be parameters to the function and don't need to be available when the function actually runs on GPU - //cublasDestroy(handle); - } else { - // in this case the depContext->ppArguments[*] are host pointers - // call host version if it exists - assert(false); // no native version - } - */ -} - -#else -#include -PTASKHOST_API void __stdcall -DummyTask() -{ - printf("This should never be called.\n"); -} -#endif diff --git a/MachineLearning/PTaskHost/PTaskHost.h b/MachineLearning/PTaskHost/PTaskHost.h deleted file mode 100644 index 7846a1d9c..000000000 --- a/MachineLearning/PTaskHost/PTaskHost.h +++ /dev/null @@ -1,31 +0,0 @@ -// The following ifdef block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the PTASKHOST_EXPORTS -// symbol defined on the command line. This symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// PTASKHOST_API functions as being imported from a DLL, whereas this DLL sees symbols -// defined with this macro as being exported. -#ifdef _WIN32 -#ifdef PTASKHOST_EXPORTS -#define PTASKHOST_API __declspec(dllexport) -#else -#define PTASKHOST_API __declspec(dllimport) -#endif -#else -#define PTASKHOST_API -#endif - -#include "PTask.h" - -#ifdef USE_PTASK -extern "C" { - -PTASKHOST_API void __stdcall HostTask(LPDEPENDENTCONTEXT depContext); - -} -#else -extern "C" { - -PTASKHOST_API void __stdcall DummyFunction(); - -} -#endif diff --git a/MachineLearning/PTaskHost/PTaskHost.vcxproj b/MachineLearning/PTaskHost/PTaskHost.vcxproj deleted file mode 100644 index 47dc08fd1..000000000 --- a/MachineLearning/PTaskHost/PTaskHost.vcxproj +++ /dev/null @@ -1,174 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {6CFF031C-445E-4C55-826B-FA4DF2EEF44B} - Win32Proj - PTaskHost - - - - DynamicLibrary - true - v110 - Unicode - - - DynamicLibrary - true - v110 - Unicode - - - DynamicLibrary - false - v110 - true - Unicode - - - DynamicLibrary - false - v110 - true - Unicode - - - - - - - - - - - - - - - - - - - true - - - true - ..\..\Common\PTask\include;$(IncludePath) - - - false - - - false - ..\..\Common\PTask\include;$(IncludePath) - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PTASKHOST_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PTASKHOST_EXPORTS;%(PreprocessorDefinitions) - $(ProjectDir)\..\cn;%(AdditionalIncludeDirectories) - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;PTASKHOST_EXPORTS;%(PreprocessorDefinitions) - - - Windows - true - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;PTASKHOST_EXPORTS;%(PreprocessorDefinitions) - $(ProjectDir)\..\cn;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - true - - - - - - - - - - false - false - - - - - false - false - - - - - - - - Create - Create - Create - Create - - - - - - \ No newline at end of file diff --git a/MachineLearning/PTaskHost/dllmain.cpp b/MachineLearning/PTaskHost/dllmain.cpp deleted file mode 100644 index 465ae722c..000000000 --- a/MachineLearning/PTaskHost/dllmain.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// dllmain.cpp : Defines the entry point for the DLL application. -#include "stdafx.h" - -BOOL APIENTRY DllMain( HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - diff --git a/MachineLearning/PTaskHost/stdafx.cpp b/MachineLearning/PTaskHost/stdafx.cpp deleted file mode 100644 index 9fe3fd3b0..000000000 --- a/MachineLearning/PTaskHost/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// PTaskHost.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/MachineLearning/PTaskHost/stdafx.h b/MachineLearning/PTaskHost/stdafx.h deleted file mode 100644 index f3a07375c..000000000 --- a/MachineLearning/PTaskHost/stdafx.h +++ /dev/null @@ -1,16 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#include "targetver.h" - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -// Windows Header Files: -#include - - - -// TODO: reference additional headers your program requires here diff --git a/MachineLearning/PTaskHost/targetver.h b/MachineLearning/PTaskHost/targetver.h deleted file mode 100644 index 87c0086de..000000000 --- a/MachineLearning/PTaskHost/targetver.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -// Including SDKDDKVer.h defines the highest available Windows platform. - -// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and -// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. - -#include diff --git a/Makefile.cpu b/Makefile.cpu index 0d9ef8e7f..5e7ee5db5 100644 --- a/Makefile.cpu +++ b/Makefile.cpu @@ -59,7 +59,7 @@ else MATHLIB_DEFINE = -DUSE_ACML endif -INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/cn -I $(MATHLIB_INCLUDE) +INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/CNTK -I $(MATHLIB_INCLUDE) CFLAGS = -msse3 -std=c++0x -std=c++11 -DCPUONLY -D_POSIX_SOURCE -D_XOPEN_SOURCE=600 -D__USE_XOPEN2K $(MATHLIB_DEFINE) -fopenmp -fpermissive -fPIC @@ -67,9 +67,9 @@ COMMON_SRC = Common/fileutil.cpp Common/DataWriter.cpp Common/ConfigFile.cpp Com Common/Eval.cpp Common/File.cpp Common/BestGpu.cpp Common/TimerUtility.cpp MATH_SRC = Math/Math/Matrix.cpp Math/Math/CPUMatrix.cpp Math/Math/CPUSparseMatrix.cpp Math/Math/NoGPU.cpp -CN_SRC = MachineLearning/cn/NetworkDescriptionLanguage.cpp MachineLearning/cn/cn.cpp MachineLearning/cn/ComputationNode.cpp \ - MachineLearning/cn/ModelEditLanguage.cpp MachineLearning/cn/PTaskGraphBuilder.cpp \ - MachineLearning/cn/SimpleNetworkBuilder.cpp MachineLearning/cn/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp +CN_SRC = MachineLearning/CNTK/NetworkDescriptionLanguage.cpp MachineLearning/CNTK/CNTK.cpp MachineLearning/CNTK/ComputationNode.cpp \ + MachineLearning/CNTK/ModelEditLanguage.cpp MachineLearning/CNTK/PTaskGraphBuilder.cpp \ + MachineLearning/CNTK/SimpleNetworkBuilder.cpp MachineLearning/CNTK/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp BINARYREADER_SRC = DataReader/BinaryReader/BinaryWriter.cpp DataReader/BinaryReader/BinaryReader.cpp DataReader/BinaryReader/BinaryFile.cpp HTKMLFREADER_SRC = DataReader/HTKMLFReader_linux/HTKMLFWriter.cpp DataReader/HTKMLFReader_linux/DataWriter.cpp DataReader/HTKMLFReader_linux/DataReader.cpp DataReader/HTKMLFReader_linux/HTKMLFReader.cpp SEQUENCEREADER_SRC = DataReader/SequenceReader/SequenceReader.cpp DataReader/SequenceReader/SequenceParser.cpp DataReader/SequenceReader/Exports.cpp @@ -92,8 +92,8 @@ DEP := $(patsubst %.o, %.d, $(OBJ)) SEPARATOR = "=-----------------------------------------------------------=" -#all: $(BINDIR)/cn.exe $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/BinaryReader.so -all: $(BINDIR)/cn.exe $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so +#all: $(BINDIR)/cntk $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/BinaryReader.so +all: $(BINDIR)/cntk $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so ln -sf $(CURDIR)/$(BINDIR)/* bin @@ -117,7 +117,7 @@ $(BINDIR)/BinaryReader.so: $(BINARYREADER_OBJ) $(CORE_OBJ) @echo $(SEPARATOR) $(CC) $(BUILDTYPE_OPT) -fPIC -shared -o $@ $^ -$(BINDIR)/cn.exe: $(CORE_OBJ) +$(BINDIR)/cntk: $(CORE_OBJ) @echo $(SEPARATOR) @mkdir -p $(dir $@) @echo building output for $(ARCH) with build type $(BUILDTYPE) ... diff --git a/Makefile.gpu b/Makefile.gpu index da7cbfbb9..028eaf039 100644 --- a/Makefile.gpu +++ b/Makefile.gpu @@ -66,7 +66,7 @@ CUDA_PATH = /usr/local/cuda-7.0 CUDA_INCLUDE = $(CUDA_PATH)/include CUDA_LIB = -L$(CUDA_PATH)/lib64 -lcublas -lcudart -lcuda -lcurand -lcusparse -lnvidia-ml -INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/cn -I $(CUDA_INCLUDE) -I $(MATHLIB_INCLUDE) +INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/CNTK -I $(CUDA_INCLUDE) -I $(MATHLIB_INCLUDE) CFLAGS = -msse3 -std=c++0x -std=c++11 -D_POSIX_SOURCE -D_XOPEN_SOURCE=600 -D__USE_XOPEN2K $(MATHLIB_DEFINE) -fopenmp -fpermissive @@ -76,9 +76,9 @@ COMMON_SRC = Common/fileutil.cpp Common/DataWriter.cpp Common/ConfigFile.cpp Com Common/Eval.cpp Common/File.cpp Common/BestGpu.cpp Common/TimerUtility.cpp MATH_SRC = Math/Math/Matrix.cpp Math/Math/GPUMatrix.cu Math/Math/GPUMatrixCUDAKernels.cu Math/Math/GPUSparseMatrix.cu Math/Math/GPUWatcher.cu \ Math/Math/CPUMatrix.cpp Math/Math/CPUSparseMatrix.cpp #Math/Math/InstantiateTemplates.cu -CN_SRC = MachineLearning/cn/NetworkDescriptionLanguage.cpp MachineLearning/cn/cn.cpp MachineLearning/cn/ComputationNode.cpp \ - MachineLearning/cn/ModelEditLanguage.cpp MachineLearning/cn/PTaskGraphBuilder.cpp \ - MachineLearning/cn/SimpleNetworkBuilder.cpp MachineLearning/cn/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp +CN_SRC = MachineLearning/CNTK/NetworkDescriptionLanguage.cpp MachineLearning/CNTK/CNTK.cpp MachineLearning/CNTK/ComputationNode.cpp \ + MachineLearning/CNTK/ModelEditLanguage.cpp MachineLearning/CNTK/PTaskGraphBuilder.cpp \ + MachineLearning/CNTK/SimpleNetworkBuilder.cpp MachineLearning/CNTK/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp BINARYREADER_SRC = #DataReader/BinaryReader/BinaryWriter.cpp DataReader/BinaryReader/BinaryReader.cpp DataReader/BinaryReader/BinaryFile.cpp HTKMLFREADER_SRC = DataReader/HTKMLFReader_linux/HTKMLFWriter.cpp DataReader/HTKMLFReader_linux/DataWriter.cpp DataReader/HTKMLFReader_linux/DataReader.cpp DataReader/HTKMLFReader_linux/HTKMLFReader.cpp SEQUENCEREADER_SRC = DataReader/SequenceReader/SequenceReader.cpp DataReader/SequenceReader/SequenceParser.cpp DataReader/SequenceReader/Exports.cpp @@ -102,7 +102,7 @@ DEP := $(patsubst %.o, %.d, $(OBJ)) SEPARATOR = "=-----------------------------------------------------------=" -all: $(BINDIR)/cn.exe $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so +all: $(BINDIR)/cntk $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so ln -sf $(CURDIR)/$(BINDIR)/* bin $(BINDIR)/UCIFastReader.so: $(UCIFASTREADER_OBJ) $(CORE_OBJ) @@ -128,7 +128,7 @@ $(BINDIR)/HTKMLFReader.so: $(HTKMLFREADER_OBJ) $(CORE_OBJ) #BinaryReader: ${BINARYREADER_SRC:.cpp=.o} ${COMMON_SRC:.cpp=.o} # $(CC) -o $(addsuffix .so, $@) $^ -fPIC -shared -$(BINDIR)/cn.exe: $(CORE_OBJ) +$(BINDIR)/cntk: $(CORE_OBJ) @echo $(SEPARATOR) @mkdir -p $(dir $@) @echo building output for $(ARCH) with build type $(BUILDTYPE) diff --git a/Makefile_kaldi.cpu b/Makefile_kaldi.cpu index 2d01f61f9..145dbbd48 100644 --- a/Makefile_kaldi.cpu +++ b/Makefile_kaldi.cpu @@ -63,7 +63,7 @@ else endif KALDI_LIB = -LDataReader/KaldiReader/base/kaldi-base -INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/cn -I $(MATHLIB_INCLUDE) -I DataReader/KaldiReader +INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/CNTK -I $(MATHLIB_INCLUDE) -I DataReader/KaldiReader CFLAGS = -msse3 -std=c++0x -std=c++11 -DCPUONLY -D_POSIX_SOURCE -D_XOPEN_SOURCE=600 -D__USE_XOPEN2K -DHAVE_POSIX_MEMALIGN ${KALDI_DEFINE} $(MATHLIB_DEFINE) -fopenmp -fpermissive -fPIC @@ -72,9 +72,9 @@ COMMON_SRC = Common/fileutil.cpp Common/DataWriter.cpp Common/ConfigFile.cpp Com Common/Eval.cpp Common/File.cpp Common/BestGpu.cpp Common/TimerUtility.cpp MATH_SRC = Math/Math/Matrix.cpp Math/Math/CPUMatrix.cpp Math/Math/CPUSparseMatrix.cpp Math/Math/NoGPU.cpp -CN_SRC = MachineLearning/cn/NetworkDescriptionLanguage.cpp MachineLearning/cn/cn.cpp MachineLearning/cn/ComputationNode.cpp \ - MachineLearning/cn/ModelEditLanguage.cpp MachineLearning/cn/PTaskGraphBuilder.cpp \ - MachineLearning/cn/SimpleNetworkBuilder.cpp MachineLearning/cn/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp +CN_SRC = MachineLearning/CNTK/NetworkDescriptionLanguage.cpp MachineLearning/CNTK/CNTK.cpp MachineLearning/CNTK/ComputationNode.cpp \ + MachineLearning/CNTK/ModelEditLanguage.cpp MachineLearning/CNTK/PTaskGraphBuilder.cpp \ + MachineLearning/CNTK/SimpleNetworkBuilder.cpp MachineLearning/CNTK/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp BINARYREADER_SRC = DataReader/BinaryReader/BinaryWriter.cpp DataReader/BinaryReader/BinaryReader.cpp DataReader/BinaryReader/BinaryFile.cpp HTKMLFREADER_SRC = DataReader/HTKMLFReader_linux/HTKMLFWriter.cpp DataReader/HTKMLFReader_linux/DataWriter.cpp DataReader/HTKMLFReader_linux/DataReader.cpp DataReader/HTKMLFReader_linux/HTKMLFReader.cpp KALDIREADER_SRC = DataReader/KaldiReader/HTKMLFWriter.cpp DataReader/KaldiReader/DataWriter.cpp DataReader/KaldiReader/DataReader.cpp DataReader/KaldiReader/HTKMLFReader.cpp @@ -108,8 +108,8 @@ DEP := $(patsubst %.o, %.d, $(OBJ)) SEPARATOR = "=-----------------------------------------------------------=" -#all: $(BINDIR)/cn.exe $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/BinaryReader.so -all: $(BINDIR)/cn.exe $(BINDIR)/UCIFastReader.so $(BINDIR)/LMSequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/KaldiReader.so +#all: $(BINDIR)/cntk $(BINDIR)/UCIFastReader.so $(BINDIR)/SequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/BinaryReader.so +all: $(BINDIR)/cntk $(BINDIR)/UCIFastReader.so $(BINDIR)/LMSequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/KaldiReader.so ln -sf $(CURDIR)/$(BINDIR)/* bin @@ -138,7 +138,7 @@ $(BINDIR)/KaldiReader.so: $(KALDIREADER_OBJ) $(CORE_OBJ) $(KALDI_OBJ) $(CC) $(BUILDTYPE_OPT) -fPIC -shared -o $@ $^ -$(BINDIR)/cn.exe: $(CORE_OBJ) +$(BINDIR)/cntk: $(CORE_OBJ) @echo $(SEPARATOR) @mkdir -p $(dir $@) @echo building output for $(ARCH) with build type $(BUILDTYPE) ... diff --git a/Makefile_kaldi.gpu b/Makefile_kaldi.gpu index 480341540..7b4fe76ef 100644 --- a/Makefile_kaldi.gpu +++ b/Makefile_kaldi.gpu @@ -69,7 +69,7 @@ CUDA_PATH = /usr/local/cuda-7.0 CUDA_INCLUDE = $(CUDA_PATH)/include CUDA_LIB = -L$(CUDA_PATH)/lib64 -lcublas -lcudart -lcuda -lcurand -lcusparse -lnvidia-ml -INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/cn -I $(CUDA_INCLUDE) -I $(MATHLIB_INCLUDE) -I DataReader/KaldiReader +INCFLAGS = -I Common/Include -I Math/Math -I MachineLearning/CNTK -I $(CUDA_INCLUDE) -I $(MATHLIB_INCLUDE) -I DataReader/KaldiReader CFLAGS = -msse3 -std=c++0x -std=c++11 -D_POSIX_SOURCE -D_XOPEN_SOURCE=600 -D__USE_XOPEN2K -DHAVE_POSIX_MEMALIGN ${KALDI_DEFINE} $(MATHLIB_DEFINE) -fopenmp -fpermissive @@ -79,9 +79,9 @@ COMMON_SRC = Common/fileutil.cpp Common/DataWriter.cpp Common/ConfigFile.cpp Com Common/Eval.cpp Common/File.cpp Common/BestGpu.cpp Common/TimerUtility.cpp MATH_SRC = Math/Math/Matrix.cpp Math/Math/GPUMatrix.cu Math/Math/GPUMatrixCUDAKernels.cu Math/Math/GPUSparseMatrix.cu Math/Math/GPUWatcher.cu \ Math/Math/CPUMatrix.cpp Math/Math/CPUSparseMatrix.cpp #Math/Math/InstantiateTemplates.cu -CN_SRC = MachineLearning/cn/NetworkDescriptionLanguage.cpp MachineLearning/cn/cn.cpp MachineLearning/cn/ComputationNode.cpp \ - MachineLearning/cn/ModelEditLanguage.cpp MachineLearning/cn/PTaskGraphBuilder.cpp \ - MachineLearning/cn/SimpleNetworkBuilder.cpp MachineLearning/cn/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp +CN_SRC = MachineLearning/CNTK/NetworkDescriptionLanguage.cpp MachineLearning/CNTK/CNTK.cpp MachineLearning/CNTK/ComputationNode.cpp \ + MachineLearning/CNTK/ModelEditLanguage.cpp MachineLearning/CNTK/PTaskGraphBuilder.cpp \ + MachineLearning/CNTK/SimpleNetworkBuilder.cpp MachineLearning/CNTK/tests.cpp MachineLearning/CNTKEval/CNTKEval.cpp BINARYREADER_SRC = #DataReader/BinaryReader/BinaryWriter.cpp DataReader/BinaryReader/BinaryReader.cpp DataReader/BinaryReader/BinaryFile.cpp HTKMLFREADER_SRC = DataReader/HTKMLFReader_linux/HTKMLFWriter.cpp DataReader/HTKMLFReader_linux/DataWriter.cpp DataReader/HTKMLFReader_linux/DataReader.cpp DataReader/HTKMLFReader_linux/HTKMLFReader.cpp KALDIREADER_SRC = DataReader/KaldiReader/HTKMLFWriter.cpp DataReader/KaldiReader/DataWriter.cpp DataReader/KaldiReader/DataReader.cpp DataReader/KaldiReader/HTKMLFReader.cpp @@ -118,7 +118,7 @@ DEP := $(patsubst %.o, %.d, $(OBJ)) SEPARATOR = "=-----------------------------------------------------------=" -all: $(BINDIR)/cn.exe $(BINDIR)/UCIFastReader.so $(BINDIR)/LMSequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/KaldiReader.so $(BINDIR)/KaldiWriter.so +all: $(BINDIR)/cntk $(BINDIR)/UCIFastReader.so $(BINDIR)/LMSequenceReader.so $(BINDIR)/LUSequenceReader.so $(BINDIR)/HTKMLFReader.so $(BINDIR)/KaldiReader.so $(BINDIR)/KaldiWriter.so ln -sf $(CURDIR)/$(BINDIR)/* bin @@ -154,7 +154,7 @@ $(BINDIR)/KaldiWriter.so: $(KALDIREADER_OBJ) $(CORE_OBJ) #BinaryReader: ${BINARYREADER_SRC:.cpp=.o} ${COMMON_SRC:.cpp=.o} # $(CC) -o $(addsuffix .so, $@) $^ -fPIC -shared -$(BINDIR)/cn.exe: $(CORE_OBJ) +$(BINDIR)/cntk: $(CORE_OBJ) @echo $(SEPARATOR) @mkdir -p $(dir $@) @echo building output for $(ARCH) with build type $(BUILDTYPE) diff --git a/Math/CNTKMathTest/CNTKMathTest.vcxproj b/Math/CNTKMathTest/CNTKMathTest.vcxproj index 28f5b7fc0..d40fc7bb4 100644 --- a/Math/CNTKMathTest/CNTKMathTest.vcxproj +++ b/Math/CNTKMathTest/CNTKMathTest.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -32,13 +24,6 @@ CNTKMathTest - - DynamicLibrary - true - v120 - Unicode - false - DynamicLibrary true @@ -46,14 +31,6 @@ Unicode false - - DynamicLibrary - false - v120 - true - Unicode - false - DynamicLibrary false @@ -66,48 +43,23 @@ - - - - - - - - true - true ..\..\common\include\;$(IncludePath) - - - true + $(Platform)\$(Configuration)\$(ProjectName)\ true ..\..\common\include\;$(IncludePath);$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) - true - - - Windows - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - NotUsing @@ -129,25 +81,6 @@ compute_20,sm_20;compute_30,sm_30;%(CodeGeneration) - - - Level3 - Use - MaxSpeed - true - true - $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories) - - Level4 @@ -186,9 +119,7 @@ - Create Create - Create Create diff --git a/Math/Math.sln b/Math/Math.sln deleted file mode 100644 index e0712ce00..000000000 --- a/Math/Math.sln +++ /dev/null @@ -1,75 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMath", "Math\Math.vcxproj", "{60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CNTKMathTest", "CNTKMathTest\CNTKMathTest.vcxproj", "{6CEE834A-8104-46A8-8902-64C81BD7928F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MathPerformanceTests", "MathPerformanceTests\MathPerformanceTests.vcxproj", "{668BEED5-AC07-4F35-B3AE-EE65A7F9C976}" -EndProject -Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 4 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://vstfcodebox:8080/tfs/kappa - SccLocalPath0 = . - SccProjectUniqueName1 = Math\\Math.vcxproj - SccProjectName1 = Math - SccLocalPath1 = Math - SccProjectUniqueName2 = CNTKMathTest\\CNTKMathTest.vcxproj - SccProjectName2 = CNTKMathTest - SccLocalPath2 = CNTKMathTest - SccProjectUniqueName3 = MathPerformanceTests\\MathPerformanceTests.vcxproj - SccProjectName3 = MathPerformanceTests - SccLocalPath3 = MathPerformanceTests - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|Win32.ActiveCfg = Debug|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|Win32.Build.0 = Debug|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|x64.ActiveCfg = Debug|x64 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Debug|x64.Build.0 = Debug|x64 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|Mixed Platforms.Build.0 = Release|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|Win32.ActiveCfg = Release|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|Win32.Build.0 = Release|Win32 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|x64.ActiveCfg = Release|x64 - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5}.Release|x64.Build.0 = Release|x64 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|Win32.ActiveCfg = Debug|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|Win32.Build.0 = Debug|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|x64.ActiveCfg = Debug|x64 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Debug|x64.Build.0 = Debug|x64 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|Mixed Platforms.Build.0 = Release|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|Win32.ActiveCfg = Release|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|Win32.Build.0 = Release|Win32 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|x64.ActiveCfg = Release|x64 - {6CEE834A-8104-46A8-8902-64C81BD7928F}.Release|x64.Build.0 = Release|x64 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|Win32.ActiveCfg = Debug|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|Win32.Build.0 = Debug|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|x64.ActiveCfg = Debug|x64 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Debug|x64.Build.0 = Debug|x64 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|Mixed Platforms.Build.0 = Release|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|Win32.ActiveCfg = Release|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|Win32.Build.0 = Release|Win32 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|x64.ActiveCfg = Release|x64 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Math/Math.vssscc b/Math/Math.vssscc deleted file mode 100644 index 6cb031bcf..000000000 --- a/Math/Math.vssscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" -} diff --git a/Math/Math/CNTKMathCUDA.vcxproj b/Math/Math/CNTKMathCUDA.vcxproj index 7fe728c60..feb45bd70 100644 --- a/Math/Math/CNTKMathCUDA.vcxproj +++ b/Math/Math/CNTKMathCUDA.vcxproj @@ -54,13 +54,13 @@ true ..\..\common\include;$(ACML_PATH)\include;$(CUDA_PATH)\include;$(IncludePath) $(SolutionDir)$(Platform)\$(Configuration);$(ACML_PATH)\lib;$(CUDA_PATH)\lib\$(Platform);$(LibraryPath) - $(Platform)\$(Configuration)\CUDA\ + $(Platform)\$(Configuration)\$(ProjectName)\ false ..\..\common\include;$(CUDA_PATH)\include;$(ACML_PATH)\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(SolutionDir)$(Platform)\$(Configuration);$(ACML_PATH)\lib;$(CUDA_PATH)\lib\$(Platform);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - $(Platform)\$(Configuration)\CUDA\ + $(Platform)\$(Configuration)\$(ProjectName)\ diff --git a/Math/Math/Math.vcxproj b/Math/Math/Math.vcxproj index d6813ecfb..660bb2cd4 100644 --- a/Math/Math/Math.vcxproj +++ b/Math/Math/Math.vcxproj @@ -54,11 +54,13 @@ true ..\..\common\include;$(ACML_PATH)\include;$(CUDA_PATH)\include;$(IncludePath) $(SolutionDir)$(Platform)\$(Configuration);$(ACML_PATH)\lib;$(CUDA_PATH)\lib\$(Platform);$(LibraryPath) + $(Platform)\$(Configuration)\$(ProjectName)\ false ..\..\common\include;$(CUDA_PATH)\include;$(ACML_PATH)\include;$(IncludePath) $(SolutionDir)$(Platform)\$(Configuration);$(ACML_PATH)\lib;$(CUDA_PATH)\lib\$(Platform);$(LibraryPath) + $(Platform)\$(Configuration)\$(ProjectName)\ @@ -78,8 +80,7 @@ Windows true libacml_mp_dll.lib;%(AdditionalDependencies) - - + $(SolutionDir)$(Platform)\$(Configuration)\ cublas64_70.dll;cusparse64_70.dll;curand64_70.dll;cudart64_70.dll;libacml_dll.dll;libacml_mp_dll.dll;nvcuda.dll;%(DelayLoadDLLs) true @@ -128,8 +129,7 @@ true true true - - + $(SolutionDir)$(Platform)\$(Configuration)\ libacml_mp_dll.lib;%(AdditionalDependencies) true cublas64_70.dll;cusparse64_70.dll;curand64_70.dll;cudart64_70.dll;libacml_dll.dll;libacml_mp_dll.dll;nvcuda.dll;%(DelayLoadDLLs) diff --git a/Math/MathPerformanceTests/MathPerformanceTests.vcxproj b/Math/MathPerformanceTests/MathPerformanceTests.vcxproj index dd54a2c80..a21a60247 100644 --- a/Math/MathPerformanceTests/MathPerformanceTests.vcxproj +++ b/Math/MathPerformanceTests/MathPerformanceTests.vcxproj @@ -1,18 +1,10 @@  - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -32,25 +24,12 @@ MathPerformanceTests - - Application - true - v120 - Unicode - Application true v120 Unicode - - Application - false - v120 - true - Unicode - Application false @@ -62,46 +41,22 @@ - - - - - - - - true - true ..\..\common\include\;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); - - - false + $(Platform)\$(Configuration)\$(ProjectName)\ false + $(Platform)\$(Configuration)\$(ProjectName)\ - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - winmm.lib;%(AdditionalDependencies) - - Use @@ -121,23 +76,6 @@ compute_20,sm_20;compute_30,sm_30;%(CodeGeneration) - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - Level4 @@ -168,9 +106,7 @@ - Create Create - Create Create diff --git a/README b/README index 335a6b36b..95f7002e1 100644 --- a/README +++ b/README @@ -25,6 +25,8 @@ You can modify the path CUDA_PATH in makefile.cpu to change your cuda path We use cuda-7.0 as default. Then add ${CUDA_PATH}/lib, ${CUDA_PATH}/lib64 to your ${LD_LIBRARY_PATH} to make sure the program links to the library correctly. +... TODO: add documentation on nvml lib + == Build == To build the cpu version, run make -f Makefile.cpu