clear cudaDelayLoadedLibs since delayload is disabled (#5386)

This commit is contained in:
Tianlei Wu 2020-10-07 11:33:12 -07:00
parent 5de47affb1
commit 4e983634ff
3 changed files with 5 additions and 3 deletions

View file

@ -168,7 +168,7 @@ Nuget packages are created under <native_build_dir>\nuget-artifacts
ONNX Runtime can also be built with CUDA versions from 10.1 up to 11.0, and cuDNN versions from 7.6 up to 8.0.
* The path to the CUDA installation must be provided via the CUDA_PATH environment variable, or the `--cuda_home` parameter
* The path to the cuDNN installation (include the `cuda` folder in the path) must be provided via the cuDNN_PATH environment variable, or `--cudnn_home` parameter. The cuDNN path should contain `bin`, `include` and `lib` directories.
* The path to the cuDNN bin directory must be added to the PATH environment variable so that cudnn64_7.dll is found.
* The path to the cuDNN bin directory must be added to the PATH environment variable so that cudnn64_8.dll is found.
#### Build Instructions
##### Windows

View file

@ -1031,8 +1031,9 @@ if (onnxruntime_USE_CUDA)
link_directories(${onnxruntime_CUDNN_HOME}/lib/x64)
# delayload causes crash on exit, so disable for now
# please update cudaDelayLoadedLibs in Microsoft.ML.OnnxRuntime/SessionOptions.cs if you change delayload
#file(GLOB cuda_dll_paths "${onnxruntime_CUDA_HOME}/bin/cublas64_*" "${onnxruntime_CUDA_HOME}/bin/cudart64_*" "${onnxruntime_CUDA_HOME}/bin/curand64_*" "${onnxruntime_CUDA_HOME}/bin/cufft64_*")
#set(onnxruntime_DELAYLOAD_FLAGS "${onnxruntime_DELAYLOAD_FLAGS} /DELAYLOAD:cudnn64_7.dll")
#set(onnxruntime_DELAYLOAD_FLAGS "${onnxruntime_DELAYLOAD_FLAGS} /DELAYLOAD:cudnn64_8.dll")
#foreach(cuda_dll_path ${cuda_dll_paths})
# get_filename_component(cuda_dll_file_name ${cuda_dll_path} NAME)
# set(onnxruntime_DELAYLOAD_FLAGS "${onnxruntime_DELAYLOAD_FLAGS} /DELAYLOAD:${cuda_dll_file_name}")

View file

@ -36,7 +36,8 @@ namespace Microsoft.ML.OnnxRuntime
/// </summary>
public class SessionOptions : SafeHandle
{
private static string[] cudaDelayLoadedLibs = { "cublas64_10.dll", "cudnn64_7.dll", "curand64_10.dll" };
// Delayloaded CUDA or cuDNN DLLs. Currently, delayload is disabled. See cmake/CMakeLists.txt for more information.
private static string[] cudaDelayLoadedLibs = { };
#region Constructor and Factory methods