Skip to content

Commit 4676ec4

Browse files
author
Niklas Gustafsson
committed
Corrected a few items related to the CUDA backends.
1 parent 7a20358 commit 4676ec4

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

Directory.Build.targets

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,36 @@
2424

2525
<!-- Windows CUDA 11.3 libtorch binary list used for examples and testing -->
2626
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64' and '$(OS)' == 'Windows_NT' and '$(TestUsesLibTorch)' == 'true' and ('$(TestCuda)' == 'true' and '$(SkipCuda)' != 'true') and '$(SkipNative)' != 'true' ">
27-
<NativeAssemblyReference Include="c10" Variant="cuda\" />
2827
<NativeAssemblyReference Include="asmjit" Variant="cuda\" />
28+
<NativeAssemblyReference Include="c10" Variant="cuda\" />
2929
<NativeAssemblyReference Include="c10_cuda" Variant="cuda\" />
3030
<NativeAssemblyReference Include="caffe2_nvrtc" Variant="cuda\" />
3131
<NativeAssemblyReference Include="cublas64_12" Variant="cuda\" />
3232
<NativeAssemblyReference Include="cublasLt64_12" Variant="cuda\" />
3333
<NativeAssemblyReference Include="cudart64_12" Variant="cuda\" />
34-
<NativeAssemblyReference Include="cudnn_adv_infer64_8" Variant="cuda\" />
35-
<NativeAssemblyReference Include="cudnn_adv_train64_8" Variant="cuda\" />
36-
<NativeAssemblyReference Include="cudnn_cnn_infer64_8" Variant="cuda\" />
37-
<NativeAssemblyReference Include="cudnn_cnn_train64_8" Variant="cuda\" />
38-
<NativeAssemblyReference Include="cudnn_ops_infer64_8" Variant="cuda\" />
39-
<NativeAssemblyReference Include="cudnn_ops_train64_8" Variant="cuda\" />
40-
<NativeAssemblyReference Include="cudnn64_8" Variant="cuda\" />
34+
<NativeAssemblyReference Include="cudnn64_9" Variant="cuda\" />
35+
<NativeAssemblyReference Include="cudnn_adv64_9" Variant="cuda\" />
36+
<NativeAssemblyReference Include="cudnn_cnn64_9" Variant="cuda\" />
37+
<NativeAssemblyReference Include="cudnn_engines_precompiled64_9" Variant="cuda\" />
38+
<NativeAssemblyReference Include="cudnn_engines_runtime_compiled64_9" Variant="cuda\" />
39+
<NativeAssemblyReference Include="cudnn_graph64_9" Variant="cuda\" />
40+
<NativeAssemblyReference Include="cudnn_heuristic64_9" Variant="cuda\" />
41+
<NativeAssemblyReference Include="cudnn_ops64_9" Variant="cuda\" />
4142
<NativeAssemblyReference Include="cufft64_11" Variant="cuda\" />
4243
<NativeAssemblyReference Include="cufftw64_11" Variant="cuda\" />
43-
<NativeAssemblyReference Include="curand64_10" Variant="cuda\" />
4444
<NativeAssemblyReference Include="cupti64_2023.1.1" Variant="cuda\" />
45+
<NativeAssemblyReference Include="curand64_10" Variant="cuda\" />
4546
<NativeAssemblyReference Include="cusolver64_11" Variant="cuda\" />
4647
<NativeAssemblyReference Include="cusolverMg64_11" Variant="cuda\" />
4748
<NativeAssemblyReference Include="cusparse64_12" Variant="cuda\" />
4849
<NativeAssemblyReference Include="fbgemm" Variant="cuda\" />
4950
<NativeAssemblyReference Include="fbjni" Variant="cuda\" />
5051
<NativeAssemblyReference Include="libiomp5md" Variant="cuda\" />
5152
<NativeAssemblyReference Include="libiompstubs5md" Variant="cuda\" />
52-
<NativeAssemblyReference Include="nvrtc64_120_0" Variant="cuda\" />
53-
<NativeAssemblyReference Include="nvrtc-builtins64_121" Variant="cuda\" />
54-
<NativeAssemblyReference Include="nvToolsExt64_1" Variant="cuda\" />
5553
<NativeAssemblyReference Include="nvJitLink_120_0" Variant="cuda\" />
54+
<NativeAssemblyReference Include="nvToolsExt64_1" Variant="cuda\" />
55+
<NativeAssemblyReference Include="nvrtc-builtins64_121" Variant="cuda\" />
56+
<NativeAssemblyReference Include="nvrtc64_120_0" Variant="cuda\" />
5657
<NativeAssemblyReference Include="pytorch_jni" Variant="cuda\" />
5758
<NativeAssemblyReference Include="torch" Variant="cuda\" />
5859
<NativeAssemblyReference Include="torch_cpu" Variant="cuda\" />

src/TorchSharp/Torch.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,9 @@ private static void LoadNativeBackend(bool useCudaBackend, out StringBuilder? tr
111111
// Preloading these DLLs on windows seems to iron out problems where one native DLL
112112
// requests a load of another through dynamic linking techniques.
113113
//
114-
ok = TryLoadNativeLibraryByName("cudnn_adv_infer64_8", typeof(torch).Assembly, trace);
115-
ok = TryLoadNativeLibraryByName("cudnn_adv_train64_8", typeof(torch).Assembly, trace);
116-
ok = TryLoadNativeLibraryByName("cudnn_cnn_infer64_8", typeof(torch).Assembly, trace);
117-
ok = TryLoadNativeLibraryByName("cudnn_cnn_train64_8", typeof(torch).Assembly, trace);
118-
ok = TryLoadNativeLibraryByName("cudnn_ops_infer64_8", typeof(torch).Assembly, trace);
119-
ok = TryLoadNativeLibraryByName("cudnn_ops_train64_8", typeof(torch).Assembly, trace);
114+
ok = TryLoadNativeLibraryByName("cudnn_adv64_9", typeof(torch).Assembly, trace);
115+
ok = TryLoadNativeLibraryByName("cudnn_cnn64_9", typeof(torch).Assembly, trace);
116+
ok = TryLoadNativeLibraryByName("cudnn_ops64_9", typeof(torch).Assembly, trace);
120117
ok = TryLoadNativeLibraryByName("nvrtc-builtins64_121", typeof(torch).Assembly, trace);
121118
ok = TryLoadNativeLibraryByName("caffe2_nvrtc", typeof(torch).Assembly, trace);
122119
ok = TryLoadNativeLibraryByName("nvrtc64_120_0", typeof(torch).Assembly, trace);

0 commit comments

Comments
 (0)