on build machine use the nvml.dll from the c:\local\bindrop if the directory exists
This commit is contained in:
Родитель
77f65d8975
Коммит
1d84628c64
|
@ -14,6 +14,9 @@
|
||||||
<NvmlLibPath Condition="'$(CudaVersion)' == '7.5'">"c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib"</NvmlLibPath>
|
<NvmlLibPath Condition="'$(CudaVersion)' == '7.5'">"c:\Program Files\NVIDIA Corporation\GDK\gdk_win7_amd64_release\nvml\lib"</NvmlLibPath>
|
||||||
<NvmlLibPath Condition="'$(CudaVersion)' == '8.0'" />
|
<NvmlLibPath Condition="'$(CudaVersion)' == '8.0'" />
|
||||||
|
|
||||||
|
<NvmlDllPath>"%ProgramW6432%\NVIDIA Corporation\NVSMI"</NvmlDllPath>
|
||||||
|
<NvmlDllPath Condition="Exists('c:\local\bindrop\NVSMI')">"c:\local\bindrop\NVSMI"</NvmlDllPath>
|
||||||
|
|
||||||
<HasOpenCv>false</HasOpenCv>
|
<HasOpenCv>false</HasOpenCv>
|
||||||
<HasOpenCv Condition="Exists('$(OPENCV_PATH)') Or Exists('$(OPENCV_PATH_V31)')">true</HasOpenCv>
|
<HasOpenCv Condition="Exists('$(OPENCV_PATH)') Or Exists('$(OPENCV_PATH_V31)')">true</HasOpenCv>
|
||||||
|
|
||||||
|
@ -31,7 +34,6 @@
|
||||||
|
|
||||||
<!-- If an executable links Cntk.Reader-$(CntkComponentVersion).lib, it has dependency on Cntk.Common.dll, Cntk.Math.dll and Cntk.PerformanceProfiler.dll -->
|
<!-- If an executable links Cntk.Reader-$(CntkComponentVersion).lib, it has dependency on Cntk.Common.dll, Cntk.Math.dll and Cntk.PerformanceProfiler.dll -->
|
||||||
<ReaderLibs>Cntk.Reader-$(CntkComponentVersion).lib;Cntk.Common-$(CntkComponentVersion).lib;Cntk.Math-$(CntkComponentVersion).lib;Cntk.PerformanceProfiler-$(CntkComponentVersion).lib</ReaderLibs>
|
<ReaderLibs>Cntk.Reader-$(CntkComponentVersion).lib;Cntk.Common-$(CntkComponentVersion).lib;Cntk.Math-$(CntkComponentVersion).lib;Cntk.PerformanceProfiler-$(CntkComponentVersion).lib</ReaderLibs>
|
||||||
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -93,7 +93,7 @@
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs);nvml.dll</DelayLoadDLLs>
|
<DelayLoadDLLs>%(DelayLoadDLLs);nvml.dll</DelayLoadDLLs>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" "$(TargetDir)"</Command>
|
<Command>if exist "$(NvmlDllPath)" xcopy /I /D /Y "$(NvmlDllPath)\nvml.dll" "$(TargetDir)"</Command>
|
||||||
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
@ -138,7 +138,7 @@
|
||||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(CudaLibPath)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(CudaLibPath)</AdditionalLibraryDirectories>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>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)"</Command>
|
<Command>xcopy /I /D /Y "$(ProjectDir)BrainScript\CNTKCoreLib\CNTK.core.bs" "$(TargetDir)" && if exist "$(NvmlDllPath)" xcopy /I /D /Y "$(NvmlDllPath)\nvml.dll" "$(TargetDir)"</Command>
|
||||||
<Message>Copying dependencies</Message>
|
<Message>Copying dependencies</Message>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
@ -117,7 +117,7 @@
|
||||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(CudaLibPath)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(CudaLibPath)</AdditionalLibraryDirectories>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" "$(TargetDir)"</Command>
|
<Command>if exist "$(NvmlDllPath)" xcopy /I /D /Y "$(NvmlDllPath)\nvml.dll" "$(TargetDir)"</Command>
|
||||||
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
@ -81,7 +81,7 @@
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs);nvml.dll;$(CudaRuntimeDll)</DelayLoadDLLs>
|
<DelayLoadDLLs>%(DelayLoadDLLs);nvml.dll;$(CudaRuntimeDll)</DelayLoadDLLs>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" "$(TargetDir)"</Command>
|
<Command>if exist "$(NvmlDllPath)" xcopy /I /D /Y "$(NvmlDllPath)\nvml.dll" "$(TargetDir)"</Command>
|
||||||
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(CudaLibPath)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(CudaLibPath)</AdditionalLibraryDirectories>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" "$(TargetDir)"</Command>
|
<Command>if exist "$(NvmlDllPath)" xcopy /I /D /Y "$(NvmlDllPath)\nvml.dll" "$(TargetDir)"</Command>
|
||||||
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
<DelayLoadDLLs>%(DelayLoadDLLs);nvml.dll;$(CudaRuntimeDll)</DelayLoadDLLs>
|
<DelayLoadDLLs>%(DelayLoadDLLs);nvml.dll;$(CudaRuntimeDll)</DelayLoadDLLs>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>if exist "%ProgramW6432%\NVIDIA Corporation\NVSMI" xcopy /I /D /Y "%ProgramW6432%\NVIDIA Corporation\NVSMI\nvml*.dll" "$(TargetDir)"</Command>
|
<Command>if exist "$(NvmlDllPath)" xcopy /I /D /Y "$(NvmlDllPath)\nvml.dll" "$(TargetDir)"</Command>
|
||||||
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
<Message>Copying NVidia GDK extension DLL to target folder</Message>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче