From 885f6651591ddaad22d54b24a0be2d1259285374 Mon Sep 17 00:00:00 2001 From: Mark Hillebrand Date: Thu, 7 Apr 2016 18:52:36 +0200 Subject: [PATCH] .vcxproj: clean up include and library path settings Closes #89. --- Source/ActionsLib/ActionsLib.vcxproj | 26 ++++++------ Source/CNTK/CNTK.vcxproj | 26 ++++++------ Source/Common/File.cpp | 8 ++-- .../ComputationNetworkLib.vcxproj | 26 ++++++------ Source/EvalDll/EvalDll.vcxproj | 30 +++++++------- .../EvalWrapper/EvalWrapper.vcxproj | 23 +++++------ Source/Math/Math.vcxproj | 30 ++++++++------ Source/Math/MathCUDA.vcxproj | 6 +-- .../Readers/BinaryReader/BinaryReader.vcxproj | 16 ++++---- .../CNTKTextFormatReader.vcxproj | 7 +--- Source/Readers/DSSMReader/DSSMReader.vcxproj | 23 +++++------ .../ExperimentalHTKMLFReader.vcxproj | 7 +--- .../Readers/HTKMLFReader/HTKMLFReader.vcxproj | 29 ++++++-------- .../Readers/ImageReader/ImageReader.vcxproj | 12 ++++-- .../LMSequenceReader/LMSequenceReader.vcxproj | 23 +++++------ .../LUSequenceReader/LUSequenceReader.vcxproj | 16 ++++---- .../LibSVMBinaryReader.vcxproj | 23 +++++------ Source/Readers/ReaderLib/ReaderLib.vcxproj | 2 +- .../SparsePCReader/SparsePCReader.vcxproj | 16 ++++---- .../UCIFastReader/UCIFastReader.vcxproj | 16 ++++---- Source/SGDLib/SGDLib.vcxproj | 39 ++++++++++-------- .../SequenceTrainingLib.vcxproj | 4 +- Tests/UnitTests/EvalTest/EvalTest.vcxproj | 31 +++++++------- Tests/UnitTests/FileTest/FileTest.vcxproj | 13 +++--- .../MathPerformanceTests.vcxproj | 22 +++++----- Tests/UnitTests/MathTests/MathTests.vcxproj | 27 +++++++++---- .../NetworkTests/NetworkTests.vcxproj | 40 +++++++------------ .../UnitTests/ReaderTests/ReaderTests.vcxproj | 12 ++++-- 28 files changed, 272 insertions(+), 281 deletions(-) diff --git a/Source/ActionsLib/ActionsLib.vcxproj b/Source/ActionsLib/ActionsLib.vcxproj index 5bb7f88d7..ffdf0fdd2 100644 --- a/Source/ActionsLib/ActionsLib.vcxproj +++ b/Source/ActionsLib/ActionsLib.vcxproj @@ -47,21 +47,21 @@ true - ..\SequenceTrainingLib;..\SGDLib;..\ComputationNetworkLib;..\CNTK;..\Math;..\Common\Include;..\CNTK\BrainScript;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath) - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64) false false - ..\SequenceTrainingLib;..\SGDLib;..\ComputationNetworkLib;..\CNTK;..\Math;..\Common\Include;..\CNTK\BrainScript;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath) - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64) $(ExecutablePath) false - - $(IncludePath);$(CudaInclude) - $(LibraryPath);$(CudaLibPath) - + + + $(SolutionDir)Source\SequenceTrainingLib;$(SolutionDir)Source\SGDLib;$(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\CNTK;$(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\CNTK\BrainScript;$(MSMPI_INC);$(NvmlInclude) + + + $(MSMPI_LIB64);$(OutDir);$(NvmlLibPath) + + @@ -73,13 +73,11 @@ true true /bigobj %(AdditionalOptions) - $(NvmlInclude) Console true Math.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) - $(NvmlLibPath) Math.dll; nvml.dll 100000000 @@ -97,7 +95,6 @@ Speed /d2Zi+ %(AdditionalOptions) true - $(NvmlInclude) Console @@ -107,7 +104,6 @@ Math.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) true Math.dll; nvml.dll - $(NvmlLibPath) @@ -119,6 +115,12 @@ + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) Copying NVidia GDK extension DLL to target folder diff --git a/Source/CNTK/CNTK.vcxproj b/Source/CNTK/CNTK.vcxproj index 5221a0798..992a842a2 100644 --- a/Source/CNTK/CNTK.vcxproj +++ b/Source/CNTK/CNTK.vcxproj @@ -47,19 +47,19 @@ true - ..\ActionsLib;..\SequenceTrainingLib;..\SGDLib;..\ComputationNetworkLib;..\Math;..\Common\Include;..\CNTK\BrainScript;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64) false - ..\ActionsLib;..\SequenceTrainingLib;..\SGDLib;..\ComputationNetworkLib;..\Math;..\Common\Include;..\CNTK\BrainScript;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64) $(ExecutablePath) - - $(IncludePath);$(CudaInclude) - $(LibraryPath);$(CudaLibPath) - + + + $(SolutionDir)Source\ActionsLib;$(SolutionDir)Source\SequenceTrainingLib;$(SolutionDir)Source\SGDLib;$(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\CNTK\BrainScript;$(MSMPI_INC);$(NvmlInclude) + + + $(MSMPI_LIB64);$(OutDir);$(NvmlLibPath) + + @@ -71,13 +71,11 @@ true true /bigobj %(AdditionalOptions) - $(NvmlInclude) Console true ActionsLib.lib; SGDLib.lib; ComputationNetworkLib.lib; Math.lib; kernel32.lib; user32.lib; shell32.lib; SequenceTrainingLib.lib; %(AdditionalDependencies) - $(NvmlLibPath) Math.dll; msmpi.dll; nvml.dll; $(CudaRuntimeDll) 100000000 @@ -98,7 +96,6 @@ Speed /d2Zi+ %(AdditionalOptions) true - $(NvmlInclude) Console @@ -108,7 +105,6 @@ ActionsLib.lib; SGDLib.lib; ComputationNetworkLib.lib; Math.lib; kernel32.lib; user32.lib; shell32.lib; SequenceTrainingLib.lib; %(AdditionalDependencies) true Math.dll; msmpi.dll; nvml.dll; $(CudaRuntimeDll) - $(NvmlLibPath) 100000000 @@ -132,6 +128,12 @@ + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + xcopy /I /D /Y $(ProjectDir)BrainScript\CNTKCoreLib\CNTK.core.bs $(TargetDir) && if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) Copying dependencies diff --git a/Source/Common/File.cpp b/Source/Common/File.cpp index f0249b713..f3e7c3bb1 100644 --- a/Source/Common/File.cpp +++ b/Source/Common/File.cpp @@ -148,7 +148,7 @@ void File::Init(const wchar_t* filename, int fileOptions) // (wstring only for now; feel free to make this a template if needed) /*static*/ wstring File::DirectoryPathOf(wstring path) { -#if WIN32 +#ifdef WIN32 if (IsWindows8OrGreater()) { typedef HRESULT(*PathCchRemoveFileSpecProc)(_Inout_updates_(_Inexpressible_(cchPath)) PWSTR, _In_ size_t); @@ -203,7 +203,7 @@ void File::Init(const wchar_t* filename, int fileOptions) // (wstring only for now; feel free to make this a template if needed) /*static*/ wstring File::FileNameOf(wstring path) { -#if WIN32 +#ifdef WIN32 static const wstring delim = L"\\:/"; #else static const wstring delim = L"/"; @@ -218,7 +218,7 @@ void File::Init(const wchar_t* filename, int fileOptions) // get path of current executable /*static*/ wstring File::GetExecutablePath() { -#if WIN32 +#ifdef WIN32 wchar_t path[33000]; if (GetModuleFileNameW(NULL, path, _countof(path)) == 0) LogicError("GetExecutablePath: GetModuleFileNameW() unexpectedly failed."); @@ -264,7 +264,7 @@ File::~File(void) { if (m_pcloseNeeded) { - // TODO: Check for error code and throw if !std::uncaught_exception() + // TODO: Check for error code and throw if !std::uncaught_exception() _pclose(m_file); } else if (m_file != stdin && m_file != stdout && m_file != stderr) diff --git a/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj b/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj index e01198ebc..05b7d9832 100644 --- a/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj +++ b/Source/ComputationNetworkLib/ComputationNetworkLib.vcxproj @@ -47,21 +47,21 @@ true - ..\SequenceTrainingLib;..\Math;..\Common\Include;..\CNTK\BrainScript;..\ActionsLib;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath) - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64) false false - ..\SequenceTrainingLib;..\Math;..\Common\Include;..\CNTK\BrainScript;..\ActionsLib;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath) - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64) $(ExecutablePath) false - - $(IncludePath);$(CudaInclude) - $(LibraryPath);$(CudaLibPath) - + + + $(SolutionDir)Source\SequenceTrainingLib;$(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\CNTK\BrainScript;$(SolutionDir)Source\ActionsLib;$(MSMPI_INC);$(NvmlInclude) + + + $(MSMPI_LIB64);$(OutDir);$(NvmlLib) + + @@ -73,13 +73,11 @@ true true /bigobj %(AdditionalOptions) - $(NvmlInclude) Console true Math.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) - $(NvmlLib) Math.dll; nvml.dll; $(CudaRuntimeDll) 100000000 @@ -97,7 +95,6 @@ Speed /d2Zi+ %(AdditionalOptions) true - $(NvmlInclude) Console @@ -107,7 +104,6 @@ Math.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) true Math.dll; nvml.dll; $(CudaRuntimeDll) - $(NvmlLibPath) @@ -119,6 +115,12 @@ + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) Copying NVidia GDK extension DLL to target folder diff --git a/Source/EvalDll/EvalDll.vcxproj b/Source/EvalDll/EvalDll.vcxproj index 3c051b8fd..177688218 100644 --- a/Source/EvalDll/EvalDll.vcxproj +++ b/Source/EvalDll/EvalDll.vcxproj @@ -48,20 +48,20 @@ true - ..\SGDLib;..\ComputationNetworkLib;..\SequenceTrainingLib;..\Math;..\Common\Include;..\CNTK\BrainScript;..\ActionsLib;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath) - ..\ComputationNetworkLib;..\Math;$(MSMPI_LIB64);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64);$(SolutionDir)$(Platform)\$(Configuration)\ EvalDll false - ..\SGDLib;..\ComputationNetworkLib;..\SequenceTrainingLib;..\Math;..\Common\Include;..\CNTK\BrainScript;..\ActionsLib;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath) - ..\ComputationNetworkLib;..\Math;$(MSMPI_LIB64);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64);$(SolutionDir)$(Platform)\$(Configuration)\ EvalDll - - $(IncludePath);$(CudaInclude) - $(LibraryPath);$(CudaLibPath) - + + + $(SolutionDir)Source\SGDLib;$(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\SequenceTrainingLib;$(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\CNTK\BrainScript;$(SolutionDir)Source\ActionsLib;$(MSMPI_INC);$(NvmlInclude) + + + $(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\Math;$(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(NvmlLibPath) + + NotUsing @@ -69,7 +69,6 @@ Disabled EVALDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - $(NvmlInclude) true /bigobj %(AdditionalOptions) @@ -77,7 +76,6 @@ Console true ComputationNetworkLib.lib; Math.lib; ActionsLib.lib; kernel32.lib; user32.lib; shell32.lib; SequenceTrainingLib.lib; %(AdditionalDependencies) - $(NvmlLibPath) Math.dll; nvml.dll; $(CudaRuntimeDll) @@ -90,7 +88,6 @@ true EVALDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - $(NvmlInclude) false /d2Zi+ /bigobj %(AdditionalOptions) MultiThreadedDLL @@ -103,7 +100,6 @@ true true ComputationNetworkLib.lib; Math.lib; ActionsLib.lib; kernel32.lib; user32.lib; shell32.lib; SequenceTrainingLib.lib; %(AdditionalDependencies) - $(NvmlLibPath) true Math.dll; nvml.dll; $(CudaRuntimeDll) @@ -111,16 +107,18 @@ CPUONLY;%(PreprocessorDefinitions) - - Math.dll - - + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) Copying NVidia GDK extension DLL to target folder diff --git a/Source/Extensibility/EvalWrapper/EvalWrapper.vcxproj b/Source/Extensibility/EvalWrapper/EvalWrapper.vcxproj index b9712b35b..0cff3c521 100644 --- a/Source/Extensibility/EvalWrapper/EvalWrapper.vcxproj +++ b/Source/Extensibility/EvalWrapper/EvalWrapper.vcxproj @@ -47,18 +47,17 @@ - - true - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)Source\Common\Include - .dll - $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) - - - false - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)Source\Common\Include - .dll - $(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath) + + $(DebugBuild) + + + $(SolutionDir)Source\Common\Include + + + $(OutDir) + + Level3 @@ -67,7 +66,6 @@ true - %(AdditionalDependencies) @@ -79,7 +77,6 @@ true - %(AdditionalDependencies) diff --git a/Source/Math/Math.vcxproj b/Source/Math/Math.vcxproj index 335ec7825..675d9da86 100644 --- a/Source/Math/Math.vcxproj +++ b/Source/Math/Math.vcxproj @@ -51,21 +51,22 @@ false - ..\Common\include;$(ACML_PATH)\include;$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration);$(ACML_PATH)\lib;$(LibraryPath) Math - - $(IncludePath);$(CudaInclude) - $(LibraryPath);$(CudaLibPath) - + + + $(ACML_PATH)\include;$(SolutionDir)Source\Common\include;%(AdditionalIncludeDirectories) + + + $(ACML_PATH)\lib;$(OutDir) + + NotUsing Level4 USE_ACML; NO_SYNC; WIN32; _DEBUG; _WINDOWS; _USRDLL; MATH_EXPORTS; %(PreprocessorDefinitions) true - ..\Common\include\;%(AdditionalIncludeDirectories) true Disabled Fast @@ -77,7 +78,6 @@ Console true libacml_mp_dll.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\$(Configuration)\ libacml_mp_dll.dll; $(CudaDlls); %(DelayLoadDLLs) true @@ -105,7 +105,6 @@ true USE_ACML; NO_SYNC; WIN32; NDEBUG; _WINDOWS; _USRDLL; MATH_EXPORTS; %(PreprocessorDefinitions) true - ..\Common\include\;%(AdditionalIncludeDirectories) true Fast true @@ -120,10 +119,9 @@ true true true - $(SolutionDir)$(Platform)\$(Configuration)\ libacml_mp_dll.lib;%(AdditionalDependencies) true - libacml_dll.dll; libacml_mp_dll.dll; $(CudaDlls); %(DelayLoadDLLs) + libacml_mp_dll.dll; $(CudaDlls); %(DelayLoadDLLs) xcopy /D /I /Y "$(ACML_PATH)\lib\*.dll" $(OutputPath) @@ -144,12 +142,20 @@ true + + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + + CPUONLY;%(PreprocessorDefinitions) - libacml_dll.dll; libacml_mp_dll.dll + libacml_mp_dll.dll diff --git a/Source/Math/MathCUDA.vcxproj b/Source/Math/MathCUDA.vcxproj index 341f58f27..8837a2ed2 100644 --- a/Source/Math/MathCUDA.vcxproj +++ b/Source/Math/MathCUDA.vcxproj @@ -49,8 +49,6 @@ $(CudaPath) - ..\Common\include;$(ACML_PATH)\include;$(CudaInclude);$(CUB_PATH);$(CuDnnIncPath);$(IncludePath) - $(SolutionDir)$(Platform)\$(Configuration);$(ACML_PATH)\lib;$(CudaLibPath);$(CuDnnLibPath);$(LibraryPath) $(IntDir)\MathCUDA\ @@ -76,7 +74,7 @@ Level4 NO_SYNC; WIN32; _WINDOWS; _USRDLL; MATH_EXPORTS; $(CuDnnDefine); %(PreprocessorDefinitions) true - ..\Common\include\;%(AdditionalIncludeDirectories) + $(SolutionDir)Source\Common\include;$(ACML_PATH)\include;$(CudaInclude);$(CUB_PATH);$(CuDnnIncPath) true Fast true @@ -90,7 +88,7 @@ $(CudaDlls);%(DelayLoadDLLs) - $(CuDnnLibPath);%(AdditionalLibraryDirectories) + $(OutDir);$(ACML_PATH)\lib;$(CudaLibPath);$(CuDnnLibPath) $(CuDnnLib) diff --git a/Source/Readers/BinaryReader/BinaryReader.vcxproj b/Source/Readers/BinaryReader/BinaryReader.vcxproj index 640d95347..8e201e696 100644 --- a/Source/Readers/BinaryReader/BinaryReader.vcxproj +++ b/Source/Readers/BinaryReader/BinaryReader.vcxproj @@ -47,14 +47,18 @@ true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); false - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + + $(OutDir) + + Use @@ -62,14 +66,12 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math true Console true Math.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)\ @@ -81,7 +83,6 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /d2Zi+ %(AdditionalOptions) true @@ -92,7 +93,6 @@ true true Math.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)\ true diff --git a/Source/Readers/CNTKTextFormatReader/CNTKTextFormatReader.vcxproj b/Source/Readers/CNTKTextFormatReader/CNTKTextFormatReader.vcxproj index c47e7afac..70a4fb3f4 100644 --- a/Source/Readers/CNTKTextFormatReader/CNTKTextFormatReader.vcxproj +++ b/Source/Readers/CNTKTextFormatReader/CNTKTextFormatReader.vcxproj @@ -43,10 +43,6 @@ - - ..\..\common\include;..\..\math;$(IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(LibraryPath); - true @@ -61,12 +57,13 @@ true true true - ../ReaderLib + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math;$(SolutionDir)Source\Readers\ReaderLib Windows true ReaderLib.lib;Math.lib;%(AdditionalDependencies) + $(OutDir) diff --git a/Source/Readers/DSSMReader/DSSMReader.vcxproj b/Source/Readers/DSSMReader/DSSMReader.vcxproj index 93f437140..0a6fbf74e 100644 --- a/Source/Readers/DSSMReader/DSSMReader.vcxproj +++ b/Source/Readers/DSSMReader/DSSMReader.vcxproj @@ -45,16 +45,17 @@ - - true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - $(MSMPI_INC);..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + $(DebugBuild) + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + + $(OutDir) + + NotUsing @@ -62,7 +63,6 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math true /bigobj %(AdditionalOptions) @@ -70,7 +70,6 @@ Console true Math.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)\ @@ -82,7 +81,6 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /d2Zi+ %(AdditionalOptions) true @@ -93,7 +91,6 @@ true true Math.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)\ true diff --git a/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj b/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj index 772b5ff87..8a0535a5a 100644 --- a/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj +++ b/Source/Readers/ExperimentalHTKMLFReader/ExperimentalHTKMLFReader.vcxproj @@ -39,10 +39,6 @@ - - $(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - $(DebugBuild) @@ -53,12 +49,13 @@ WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true - ..\..\Common\Include;..\..\Math;..\ReaderLib + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math;$(SolutionDir)Source\Readers\ReaderLib Console true ReaderLib.lib;Math.lib;kernel32.lib;user32.lib;%(AdditionalDependencies) + $(OutDir) diff --git a/Source/Readers/HTKMLFReader/HTKMLFReader.vcxproj b/Source/Readers/HTKMLFReader/HTKMLFReader.vcxproj index fc2a54af4..ee11c7045 100644 --- a/Source/Readers/HTKMLFReader/HTKMLFReader.vcxproj +++ b/Source/Readers/HTKMLFReader/HTKMLFReader.vcxproj @@ -45,16 +45,17 @@ - - true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + $(DebugBuild) + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + + $(OutDir) + + Use @@ -121,11 +122,8 @@ - false - - - false - + false + @@ -135,8 +133,7 @@ - Create - Create + Create diff --git a/Source/Readers/ImageReader/ImageReader.vcxproj b/Source/Readers/ImageReader/ImageReader.vcxproj index a4a0a742d..e0b9042a9 100644 --- a/Source/Readers/ImageReader/ImageReader.vcxproj +++ b/Source/Readers/ImageReader/ImageReader.vcxproj @@ -55,8 +55,6 @@ - ..\..\common\include;..\..\math;$(OPENCV_PATH)\include;$(ZipInclude);$(IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(OPENCV_PATH)\x64\vc12\lib;$(ZipLibPath);$(LibraryPath); opencv_world300.lib @@ -87,11 +85,18 @@ if "$(UseZip)" == "true" if exist "$(ZLIB_PATH)\bin\zlib1.dll" (xcopy /I /D /Y " Copying dependencies + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math;$(OPENCV_PATH)\include;$(ZipInclude);$(SolutionDir)Source\Readers\ReaderLib + + + $(OutDir);$(OPENCV_PATH)\x64\vc12\lib;$(ZipLibPath) + + Disabled _DEBUG;%(PreprocessorDefinitions) - ../ReaderLib @@ -101,7 +106,6 @@ if "$(UseZip)" == "true" if exist "$(ZLIB_PATH)\bin\zlib1.dll" (xcopy /I /D /Y " true NDEBUG;%(PreprocessorDefinitions) /d2Zi+ %(AdditionalOptions) - ../ReaderLib true diff --git a/Source/Readers/LMSequenceReader/LMSequenceReader.vcxproj b/Source/Readers/LMSequenceReader/LMSequenceReader.vcxproj index a2b17479e..725d188c2 100644 --- a/Source/Readers/LMSequenceReader/LMSequenceReader.vcxproj +++ b/Source/Readers/LMSequenceReader/LMSequenceReader.vcxproj @@ -46,16 +46,17 @@ - - true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + $(DebugBuild) + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + + $(OutDir) + + Use @@ -63,14 +64,12 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math true Console true Math.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)\ @@ -82,7 +81,6 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /d2Zi+ %(AdditionalOptions) true @@ -93,7 +91,6 @@ true true Math.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)\ true diff --git a/Source/Readers/LUSequenceReader/LUSequenceReader.vcxproj b/Source/Readers/LUSequenceReader/LUSequenceReader.vcxproj index a16fa4075..295a947d3 100644 --- a/Source/Readers/LUSequenceReader/LUSequenceReader.vcxproj +++ b/Source/Readers/LUSequenceReader/LUSequenceReader.vcxproj @@ -48,14 +48,18 @@ true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); false - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + + $(OutDir) + + Use @@ -63,14 +67,12 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math true Console true Math.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)\ @@ -82,7 +84,6 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /d2Zi+ %(AdditionalOptions) true @@ -93,7 +94,6 @@ true true Math.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)\ true diff --git a/Source/Readers/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj b/Source/Readers/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj index 78af33766..4c745a31c 100644 --- a/Source/Readers/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj +++ b/Source/Readers/LibSVMBinaryReader/LibSVMBinaryReader.vcxproj @@ -45,16 +45,17 @@ - - true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - $(MSMPI_INC);..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + $(DebugBuild) + + + $(SolutionDir)Source\common\include;$(SolutionDir)Source\Math + + + $(OutDir) + + Use @@ -62,7 +63,6 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /bigobj %(AdditionalOptions) @@ -70,7 +70,6 @@ Console true Math.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)\ @@ -82,7 +81,6 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /d2Zi+ %(AdditionalOptions) true @@ -93,7 +91,6 @@ true true Math.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)\ true diff --git a/Source/Readers/ReaderLib/ReaderLib.vcxproj b/Source/Readers/ReaderLib/ReaderLib.vcxproj index fbcda67b7..6c3c36422 100644 --- a/Source/Readers/ReaderLib/ReaderLib.vcxproj +++ b/Source/Readers/ReaderLib/ReaderLib.vcxproj @@ -48,7 +48,7 @@ Level4 true true - ..\..\common\include;..\..\math + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math true diff --git a/Source/Readers/SparsePCReader/SparsePCReader.vcxproj b/Source/Readers/SparsePCReader/SparsePCReader.vcxproj index 56dc8ad86..468a0fa5f 100644 --- a/Source/Readers/SparsePCReader/SparsePCReader.vcxproj +++ b/Source/Readers/SparsePCReader/SparsePCReader.vcxproj @@ -47,14 +47,18 @@ true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); false - $(MSMPI_INC);..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + + $(OutDir) + + NotUsing @@ -62,7 +66,6 @@ Disabled _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math true /bigobj %(AdditionalOptions) @@ -70,7 +73,6 @@ Console true Math.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)\ @@ -82,7 +84,6 @@ true _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /d2Zi+ %(AdditionalOptions) true @@ -93,7 +94,6 @@ true true Math.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)\ true diff --git a/Source/Readers/UCIFastReader/UCIFastReader.vcxproj b/Source/Readers/UCIFastReader/UCIFastReader.vcxproj index aadc1e0da..8462b1529 100644 --- a/Source/Readers/UCIFastReader/UCIFastReader.vcxproj +++ b/Source/Readers/UCIFastReader/UCIFastReader.vcxproj @@ -47,14 +47,18 @@ true - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); false - ..\..\common\include;..\..\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + + $(OutDir) + + Use @@ -62,14 +66,12 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math true Console true Math.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)\ @@ -81,7 +83,6 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - ..\..\common\include;..\..\Math false /d2Zi+ %(AdditionalOptions) true @@ -92,7 +93,6 @@ true true Math.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)\ true diff --git a/Source/SGDLib/SGDLib.vcxproj b/Source/SGDLib/SGDLib.vcxproj index 9bd423969..318e3290c 100644 --- a/Source/SGDLib/SGDLib.vcxproj +++ b/Source/SGDLib/SGDLib.vcxproj @@ -46,22 +46,25 @@ - ..\SequenceTrainingLib;..\ComputationNetworkLib;..\Math;..\Common\Include;..\CNTK\BrainScript;$(MSMPI_INC);$(VCInstallDir)include;$(WindowsSDK_IncludePath) - ..\1BitSGD;$(IncludePath) - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(WindowsSDK_LibraryPath_x64) false - - false - $(ExecutablePath) - - - true - - - $(IncludePath);$(CudaInclude) - $(LibraryPath);$(CudaLibPath) + + $(DebugBuild) + + + $(SolutionDir)Source\SequenceTrainingLib;$(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\CNTK\BrainScript;$(MSMPI_INC);$(NvmlInclude) + + + $(MSMPI_LIB64);$(OutDir);$(NvmlLibPath) + + + + + + $(SolutionDir)Source\1BitSGD;%(AdditionalIncludeDirectories) + + @@ -74,13 +77,11 @@ true true /bigobj %(AdditionalOptions) - $(NvmlInclude) Console true ComputationNetworkLib.lib; Math.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) - $(NvmlLibPath) Math.dll; nvml.dll; $(CudaRuntimeDll) 100000000 @@ -99,7 +100,6 @@ Speed /d2Zi+ %(AdditionalOptions) true - $(NvmlInclude) Console @@ -109,7 +109,6 @@ ComputationNetworkLib.lib; Math.lib; kernel32.lib; user32.lib; shell32.lib; %(AdditionalDependencies) true Math.dll; nvml.dll; cudart64_70.dll - $(NvmlLibPath) @@ -121,6 +120,12 @@ + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" $(TargetDir) Copying NVidia GDK extension DLL to target folder diff --git a/Source/SequenceTrainingLib/SequenceTrainingLib.vcxproj b/Source/SequenceTrainingLib/SequenceTrainingLib.vcxproj index ce0be259a..23c786615 100644 --- a/Source/SequenceTrainingLib/SequenceTrainingLib.vcxproj +++ b/Source/SequenceTrainingLib/SequenceTrainingLib.vcxproj @@ -42,15 +42,13 @@ - - $(VC_IncludePath);$(WindowsSDK_IncludePath);..\Common\Include;..\Math - Level4 true WIN32;_LIB;%(PreprocessorDefinitions) true + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math Console diff --git a/Tests/UnitTests/EvalTest/EvalTest.vcxproj b/Tests/UnitTests/EvalTest/EvalTest.vcxproj index f7e999cc9..eded60aaf 100644 --- a/Tests/UnitTests/EvalTest/EvalTest.vcxproj +++ b/Tests/UnitTests/EvalTest/EvalTest.vcxproj @@ -45,16 +45,17 @@ - - true - ..\..\..\Source\Math;..\..\..\Source\Common\include;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); - - - false - ..\..\..\Source\Math;..\..\..\Source\Common\include;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(SolutionDir)$(Platform)\$(Configuration);$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + $(DebugBuild) + + + $(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include + + + $(OutDir) + + Use @@ -100,24 +101,20 @@ - NotUsing - NotUsing + NotUsing - NotUsing - NotUsing + NotUsing - NotUsing - NotUsing + NotUsing - Create - Create + Create diff --git a/Tests/UnitTests/FileTest/FileTest.vcxproj b/Tests/UnitTests/FileTest/FileTest.vcxproj index d0c14df0d..a35c0a52f 100644 --- a/Tests/UnitTests/FileTest/FileTest.vcxproj +++ b/Tests/UnitTests/FileTest/FileTest.vcxproj @@ -72,17 +72,18 @@ true - ..\..\..\Source\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); false false - ..\..\..\Source\Math;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - $(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSDK_LibraryPath_x64); + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math + + NotUsing @@ -90,7 +91,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\..\Source\Common\include Console @@ -104,7 +104,6 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\..\Source\Common\include Console @@ -121,7 +120,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\..\Source\Common\include Console @@ -139,7 +137,6 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\..\Source\Common\include Console diff --git a/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj b/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj index 1093a55be..5c251155f 100644 --- a/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj +++ b/Tests/UnitTests/MathPerformanceTests/MathPerformanceTests.vcxproj @@ -43,13 +43,17 @@ - - true - ..\..\..\Source\Common\include\;$(VCInstallDir)include;$(WindowsSDK_IncludePath); - - - false + + $(DebugBuild) + + + $(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;%(AdditionalIncludeDirectories) + + + $(OutDir) + + Use @@ -58,13 +62,11 @@ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - ..\..\..\Source\Math; ..\..\..\Source\Common\Include; %(AdditionalIncludeDirectories) Console true Math.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) 64 @@ -81,7 +83,6 @@ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true true - ..\..\..\Source\Math; ..\..\..\Source\Common\Include; %(AdditionalIncludeDirectories) true @@ -89,7 +90,6 @@ true true true - $(OutDir);%(AdditionalLibraryDirectories) Math.lib;%(AdditionalDependencies) @@ -100,7 +100,7 @@ - $(CudaToolkitIncludeDir); %(AdditionalIncludeDirectories) + $(CudaToolkitIncludeDir);%(AdditionalIncludeDirectories) diff --git a/Tests/UnitTests/MathTests/MathTests.vcxproj b/Tests/UnitTests/MathTests/MathTests.vcxproj index e0e0cd4f0..f135d7910 100644 --- a/Tests/UnitTests/MathTests/MathTests.vcxproj +++ b/Tests/UnitTests/MathTests/MathTests.vcxproj @@ -61,17 +61,22 @@ - true - $(IncludePath) - $(LibraryPath) + $(DebugBuild) $(OutDir)\UnitTests\ + + + $(BOOST_INCLUDE_PATH);$(SolutionDir)Source\Common\Include + + + $(OutDir)..;$(BOOST_LIB_PATH) + + NotUsing Level4 Disabled - $(BOOST_INCLUDE_PATH);..\..\..\Source\Common\include\;%(AdditionalIncludeDirectories) WIN32;_DEBUG;%(PreprocessorDefinitions) true true @@ -80,7 +85,6 @@ Console true - $(OutDir)..\;$(BOOST_LIB_PATH);%(AdditionalLibraryDirectories) Math.lib;%(AdditionalDependencies) @@ -95,8 +99,6 @@ MaxSpeed true true - $(BOOST_INCLUDE_PATH);..\..\..\Source\Common\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;%(PreprocessorDefinitions) true true true @@ -108,10 +110,19 @@ true true true - $(OutDir)..\;$(BOOST_LIB_PATH);%(AdditionalLibraryDirectories) + WIN32;NDEBUG;%(PreprocessorDefinitions) Math.lib;%(AdditionalDependencies) + + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + %(DelayLoadDLLs);nvml.dll;$(CudaRuntimeDll) + + CPUONLY;%(PreprocessorDefinitions) diff --git a/Tests/UnitTests/NetworkTests/NetworkTests.vcxproj b/Tests/UnitTests/NetworkTests/NetworkTests.vcxproj index 8b0e9442c..9230642ba 100644 --- a/Tests/UnitTests/NetworkTests/NetworkTests.vcxproj +++ b/Tests/UnitTests/NetworkTests/NetworkTests.vcxproj @@ -36,20 +36,8 @@ Unicode false - - true - $(MSMPI_INC);$(WindowsSDK_IncludePath); - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(WindowsSDK_LibraryPath_x64) - - - false - true - $(MSMPI_INC);$(WindowsSDK_IncludePath); - $(MSMPI_LIB64);$(SolutionDir)$(Platform)\$(Configuration);$(WindowsSDK_LibraryPath_x64) - - - $(IncludePath);$(CudaInclude) - $(LibraryPath);$(CudaLibPath) + + $(DebugBuild) @@ -59,8 +47,6 @@ false - $(VC_IncludePath);$(WindowsSDK_IncludePath);..\..\..\Source\Common\include;..\..\..\Source\Math;..\..\..\Source\ActionsLib;..\..\..\Source\ComputationNetworkLib;..\..\..\Source\CNTK\BrainScript;$(IncludePath) - $(OutDir);$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(LibraryPath) $(OutDir)\UnitTests\ @@ -69,28 +55,24 @@ Level4 true WIN32;%(PreprocessorDefinitions) - $(BOOST_INCLUDE_PATH);%(AdditionalIncludeDirectories) true true + $(MSMPI_INC);$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math;$(SolutionDir)Source\ActionsLib;$(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\CNTK\BrainScript;$(BOOST_INCLUDE_PATH) Console true - $(BOOST_LIB_PATH);$(OutDir)..\; math.lib;actionslib.lib;computationnetworklib.lib;sequencetraininglib.lib;%(AdditionalDependencies) true + $(MSMPI_LIB64);$(OutDir)..;$(BOOST_LIB_PATH);$(NvmlLibPath) + math.dll;msmpi.dll Disabled _DEBUG;%(PreprocessorDefinitions) - $(BOOST_INCLUDE_PATH);$(NvmlInclude) - - math.dll;msmpi.dll; nvml.dll; $(CudaRuntimeDll) - $(BOOST_LIB_PATH);$(OutDir);$(NvmlLibPath) - @@ -100,12 +82,18 @@ NDEBUG;%(PreprocessorDefinitions) true /d2Zi+ %(AdditionalOptions) - $(BOOST_INCLUDE_PATH);$(NvmlInclude) true - math.dll;msmpi.dll; nvml.dll; $(CudaRuntimeDll) - $(BOOST_LIB_PATH);$(OutDir);$(NvmlLibPath) + + + + + %(AdditionalIncludeDirectories);$(CudaInclude) + + + %(AdditionalLibraryDirectories);$(CudaLibPath) + %(DelayLoadDLLs);nvml.dll;$(CudaRuntimeDll) diff --git a/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj b/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj index 811ec209f..f2aa4fe2b 100644 --- a/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj +++ b/Tests/UnitTests/ReaderTests/ReaderTests.vcxproj @@ -57,24 +57,28 @@ false - ..\..\..\Source\Common\include;..\..\..\Source\Math;$(IncludePath) - $(OutDir);$(LibraryPath) $(OutDir)\UnitTests\ + + + $(SolutionDir)Source\Common\Include;$(SolutionDir)Source\Math;$(SolutionDir)Source\Readers\ReaderLib;$(BOOST_INCLUDE_PATH) + + + $(OutDir);$(OutDir)..;$(BOOST_LIB_PATH) + + NotUsing Level4 true WIN32;$(ImageReaderDefine);$(ZipDefine);%(PreprocessorDefinitions) - ..\..\..\Source\Readers\ReaderLib;$(BOOST_INCLUDE_PATH);%(AdditionalIncludeDirectories) true true Console true - $(BOOST_LIB_PATH);$(OutDir)..\; htkmlfreader.lib;experimentalhtkmlfreader.lib;Math.lib;ReaderLib.lib;%(AdditionalDependencies) true