diff --git a/CNTK.sln b/CNTK.sln index 6ba77b6751f2..97ae61f50f0e 100644 --- a/CNTK.sln +++ b/CNTK.sln @@ -14,11 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D45DF403 Tests\TestDriver.py = Tests\TestDriver.py EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MathPerformanceTests", "Math\MathPerformanceTests\MathPerformanceTests.vcxproj", "{668BEED5-AC07-4F35-B3AE-EE65A7F9C976}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - 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}" @@ -492,11 +487,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Math", "Source\Math\Math.vc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MathCUDA", "Source\Math\MathCUDA.vcxproj", "{B3DD765E-694E-4494-BAD7-37BBF2942517}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EvalTest", "Source\EvalDll\EvalTest\EvalTest.vcxproj", "{731312A8-6DA3-4841-AFCD-57520BA1BF8E}" - ProjectSection(ProjectDependencies) = postProject - {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSVMBinaryReader", "Source\Readers\LibSVMBinaryReader\LibSVMBinaryReader.vcxproj", "{D667AF32-028A-4A5D-BE19-F46776F0F6B2}" ProjectSection(ProjectDependencies) = postProject {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} @@ -542,6 +532,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageReader", "Source\Reade {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} = {60BDB847-D0C4-4FD3-A947-0C15C08BCDB5} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EvalTest", "Tests\UnitTests\EvalTest\EvalTest.vcxproj", "{731312A8-6DA3-4841-AFCD-57520BA1BF8E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MathPerformanceTests", "Tests\UnitTests\MathPerformanceTests\MathPerformanceTests.vcxproj", "{668BEED5-AC07-4F35-B3AE-EE65A7F9C976}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -552,10 +546,6 @@ Global {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 - {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 - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.Release|x64.Build.0 = Release|x64 {DBB3C106-B0B4-4059-8477-C89528CEC1B0}.Debug|x64.ActiveCfg = Debug|x64 {DBB3C106-B0B4-4059-8477-C89528CEC1B0}.Release|x64.ActiveCfg = Release|x64 {928ABD1B-4D3B-4017-AEF1-0FA1B4467513}.Debug|x64.ActiveCfg = Debug|x64 @@ -594,10 +584,6 @@ Global {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 - {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.Debug|x64.ActiveCfg = Debug|x64 - {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.Debug|x64.Build.0 = Debug|x64 - {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.Release|x64.ActiveCfg = Release|x64 - {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.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 @@ -634,13 +620,20 @@ Global {9BD0A746-0BBD-45B6-B81C-053F03C26CFB}.Debug|x64.Build.0 = Debug|x64 {9BD0A746-0BBD-45B6-B81C-053F03C26CFB}.Release|x64.ActiveCfg = Release|x64 {9BD0A746-0BBD-45B6-B81C-053F03C26CFB}.Release|x64.Build.0 = Release|x64 + {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.Debug|x64.ActiveCfg = Debug|x64 + {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.Debug|x64.Build.0 = Debug|x64 + {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.Release|x64.ActiveCfg = Release|x64 + {731312A8-6DA3-4841-AFCD-57520BA1BF8E}.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 + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976}.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} - {668BEED5-AC07-4F35-B3AE-EE65A7F9C976} = {D45DF403-6781-444E-B654-A96868C5BE68} {3ED0465D-23E7-4855-9694-F788717B6533} = {39E42C4B-A078-4CA4-9D92-B883D8129601} {065AF55D-AF02-448B-BFCD-52619FDA4BD0} = {39E42C4B-A078-4CA4-9D92-B883D8129601} {98D2C32B-0C1F-4E19-A626-65F7BA4600CF} = {065AF55D-AF02-448B-BFCD-52619FDA4BD0} @@ -696,7 +689,6 @@ Global {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} - {731312A8-6DA3-4841-AFCD-57520BA1BF8E} = {D45DF403-6781-444E-B654-A96868C5BE68} {D667AF32-028A-4A5D-BE19-F46776F0F6B2} = {33EBFE78-A1A8-4961-8938-92A271941F94} {1D5787D4-52E4-45DB-951B-82F220EE0C6A} = {33EBFE78-A1A8-4961-8938-92A271941F94} {014DA766-B37B-4581-BC26-963EA5507931} = {33EBFE78-A1A8-4961-8938-92A271941F94} @@ -706,5 +698,7 @@ Global {CE429AA2-3778-4619-8FD1-49BA3B81197B} = {33EBFE78-A1A8-4961-8938-92A271941F94} {E6646FFE-3588-4276-8A15-8D65C22711C1} = {33EBFE78-A1A8-4961-8938-92A271941F94} {9BD0A746-0BBD-45B6-B81C-053F03C26CFB} = {33EBFE78-A1A8-4961-8938-92A271941F94} + {731312A8-6DA3-4841-AFCD-57520BA1BF8E} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE} + {668BEED5-AC07-4F35-B3AE-EE65A7F9C976} = {6F19321A-65E7-4829-B00C-3886CD6C6EDE} EndGlobalSection EndGlobal diff --git a/Scripts/build-and-test b/Scripts/build-and-test index 2a4b36bbc6f0..afe977727c57 100755 --- a/Scripts/build-and-test +++ b/Scripts/build-and-test @@ -256,7 +256,7 @@ if [[ $RUN == 1 ]]; then # We have to use cygpath on Windows to modify the file paths into the format readable by cntk. time $BIN_PATH configFile="`cygpath -w $CONF_FILE`" OutputDir="`cygpath -w $OUTPUT_DIR`" &>$OUT_FILE || exit $? else - time $BIN_PATH configFile=$CONF_FILE &>$OUT_FILE || exit $? + time $BIN_PATH configFile=$CONF_FILE OutputDir="`cygpath -w $OUTPUT_DIR`" &>$OUT_FILE || exit $? fi chmod a+r $RUN_FILE.* diff --git a/Source/EvalDll/EvalTest/CNTKEvalTest.cpp b/Tests/UnitTests/EvalTest/CNTKEvalTest.cpp similarity index 100% rename from Source/EvalDll/EvalTest/CNTKEvalTest.cpp rename to Tests/UnitTests/EvalTest/CNTKEvalTest.cpp diff --git a/Source/EvalDll/EvalTest/EvalTest.vcxproj b/Tests/UnitTests/EvalTest/EvalTest.vcxproj similarity index 88% rename from Source/EvalDll/EvalTest/EvalTest.vcxproj rename to Tests/UnitTests/EvalTest/EvalTest.vcxproj index 1985403bfb16..dfad654c6466 100644 --- a/Source/EvalDll/EvalTest/EvalTest.vcxproj +++ b/Tests/UnitTests/EvalTest/EvalTest.vcxproj @@ -41,13 +41,13 @@ true - ..\..\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + ..\..\..\Source\Math;..\..\..\Source\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)\ false - ..\..\Math;..\..\Common\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + ..\..\..\Source\Math;..\..\..\Source\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)\ @@ -90,21 +90,21 @@ - + NotUsing NotUsing - - - + + + NotUsing NotUsing - + NotUsing NotUsing - + NotUsing NotUsing diff --git a/Source/EvalDll/EvalTest/stdafx.cpp b/Tests/UnitTests/EvalTest/stdafx.cpp similarity index 100% rename from Source/EvalDll/EvalTest/stdafx.cpp rename to Tests/UnitTests/EvalTest/stdafx.cpp diff --git a/Source/EvalDll/EvalTest/stdafx.h b/Tests/UnitTests/EvalTest/stdafx.h similarity index 100% rename from Source/EvalDll/EvalTest/stdafx.h rename to Tests/UnitTests/EvalTest/stdafx.h diff --git a/Source/EvalDll/EvalTest/targetver.h b/Tests/UnitTests/EvalTest/targetver.h similarity index 100% rename from Source/EvalDll/EvalTest/targetver.h rename to Tests/UnitTests/EvalTest/targetver.h diff --git a/Common/FileTest/FileTest.cpp b/Tests/UnitTests/FileTest/FileTest.cpp similarity index 100% rename from Common/FileTest/FileTest.cpp rename to Tests/UnitTests/FileTest/FileTest.cpp diff --git a/Common/FileTest/FileTest.h b/Tests/UnitTests/FileTest/FileTest.h similarity index 100% rename from Common/FileTest/FileTest.h rename to Tests/UnitTests/FileTest/FileTest.h diff --git a/Common/FileTest/FileTest.sln b/Tests/UnitTests/FileTest/FileTest.sln similarity index 100% rename from Common/FileTest/FileTest.sln rename to Tests/UnitTests/FileTest/FileTest.sln diff --git a/Common/FileTest/FileTest.vcxproj b/Tests/UnitTests/FileTest/FileTest.vcxproj similarity index 100% rename from Common/FileTest/FileTest.vcxproj rename to Tests/UnitTests/FileTest/FileTest.vcxproj diff --git a/Common/FileTest/stdafx.cpp b/Tests/UnitTests/FileTest/stdafx.cpp similarity index 100% rename from Common/FileTest/stdafx.cpp rename to Tests/UnitTests/FileTest/stdafx.cpp diff --git a/Common/FileTest/stdafx.h b/Tests/UnitTests/FileTest/stdafx.h similarity index 100% rename from Common/FileTest/stdafx.h rename to Tests/UnitTests/FileTest/stdafx.h diff --git a/Common/FileTest/targetver.h b/Tests/UnitTests/FileTest/targetver.h similarity index 100% rename from Common/FileTest/targetver.h rename to Tests/UnitTests/FileTest/targetver.h diff --git a/Math/MathPerformanceTests/MathPerformanceTests.cpp b/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.cpp similarity index 100% rename from Math/MathPerformanceTests/MathPerformanceTests.cpp rename to Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.cpp diff --git a/Math/MathPerformanceTests/MathPerformanceTests.vcxproj b/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj similarity index 89% rename from Math/MathPerformanceTests/MathPerformanceTests.vcxproj rename to Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj index 7dce344289e7..053cffc99aec 100644 --- a/Math/MathPerformanceTests/MathPerformanceTests.vcxproj +++ b/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj @@ -50,7 +50,7 @@ true - ..\..\Source\Common\include\;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); + ..\..\..\Source\Common\include\;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath); $(Platform)\$(Configuration)\$(ProjectName)\ @@ -65,7 +65,7 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - ..\..\Source\Math; ..\..\Source\Common\Include; $(CudaToolkitIncludeDir); %(AdditionalIncludeDirectories) + ..\..\..\Source\Math; ..\..\..\Source\Common\Include; $(CudaToolkitIncludeDir); %(AdditionalIncludeDirectories) Console @@ -88,7 +88,7 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - ..\..\Source\Math; ..\..\Source\Common\Include; $(CudaToolkitIncludeDir); %(AdditionalIncludeDirectories) + ..\..\..\Source\Math; ..\..\..\Source\Common\Include; $(CudaToolkitIncludeDir); %(AdditionalIncludeDirectories) true diff --git a/Math/MathPerformanceTests/stdafx.cpp b/Tests/UnitTests/MathPerformanceTests/stdafx.cpp similarity index 100% rename from Math/MathPerformanceTests/stdafx.cpp rename to Tests/UnitTests/MathPerformanceTests/stdafx.cpp diff --git a/Math/MathPerformanceTests/stdafx.h b/Tests/UnitTests/MathPerformanceTests/stdafx.h similarity index 100% rename from Math/MathPerformanceTests/stdafx.h rename to Tests/UnitTests/MathPerformanceTests/stdafx.h diff --git a/Math/MathPerformanceTests/targetver.h b/Tests/UnitTests/MathPerformanceTests/targetver.h similarity index 100% rename from Math/MathPerformanceTests/targetver.h rename to Tests/UnitTests/MathPerformanceTests/targetver.h