diff --git a/Directory.Build.props b/Directory.Build.props index 014246eed..256170d0a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,7 +20,7 @@ $(RepoRoot)src/ $(RepoRoot)pkg/ - 2.4.0.0 + 2.5.1.0 2.2.2.0 @@ -86,7 +86,7 @@ - 2.4.0.0 + 2.5.1.0 2.2.2.0 false $(LibTorchPackageVersion) diff --git a/Directory.Build.targets b/Directory.Build.targets index 224f8a649..343c4cb2d 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -12,17 +12,15 @@ - - - + @@ -47,14 +45,12 @@ - - @@ -63,28 +59,10 @@ - - - - - - - - - - - - - - - - - - @@ -94,6 +72,7 @@ + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 31be3493d..a47a74195 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,7 @@ parameters: # push them to the artifacts feed of the Azure CI project - name: BuildLibTorchPackages type: boolean - default: false + default: true - name: PushPackagesToFeed type: boolean default: false diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 869bd78e3..edeb616cf 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,8 +1,8 @@ 0 - 104 + 105 0 - 0.103.1 + 0.104.0 \ No newline at end of file diff --git a/build/Dependencies.props b/build/Dependencies.props index 2d926b1ba..320a3ae05 100644 --- a/build/Dependencies.props +++ b/build/Dependencies.props @@ -7,7 +7,7 @@ - 2.4.0 + 2.5.1 2.2.2 12.1 121 diff --git a/linux_cuda.txt b/linux_cuda.txt index 795a749d0..073faa81d 100644 --- a/linux_cuda.txt +++ b/linux_cuda.txt @@ -1,30 +1,31 @@ - 293064 libbackend_with_compiler.so - 1126504 libc10.so - 1444824 libc10_cuda.so - 843617 libc10d_cuda_test.so - 22505 libcaffe2_nvrtc.so - 107496985 libcublas-37d11411.so.12 - 515090264 libcublasLt-f97bfc2c.so.12 - 695585 libcudart-9335f6a2.so.12 - 104664 libcudnn.so.9 - 240675313 libcudnn_adv.so.9 - 4700665 libcudnn_cnn.so.9 - 569612689 libcudnn_engines_precompiled.so.9 - 9562545 libcudnn_engines_runtime_compiled.so.9 - 3141321 libcudnn_graph.so.9 - 86313377 libcudnn_heuristic.so.9 - 108399185 libcudnn_ops.so.9 - 283265 libgomp-98b21ff3.so.1 - 253880 libjitbackend_test.so - 398408 libnnapi_backend.so - 43681 libnvToolsExt-847d78f2.so.1 - 56875329 libnvrtc-b51b459d.so.12 - 6846017 libnvrtc-builtins.so - 53625 libshm.so - 15704 libtorch.so - 503454193 libtorch_cpu.so -1487160249 libtorch_cuda.so - 401400273 libtorch_cuda_linalg.so - 20817 libtorch_global_deps.so - 29034321 libtorch_python.so - 967256 libtorchbind_test.so \ No newline at end of file + 331,816 libaoti_custom_ops.so + 288,672 libbackend_with_compiler.so + 1,215,456 libc10.so + 833,576 libc10d_cuda_test.so + 1,482,296 libc10_cuda.so + 22,545 libcaffe2_nvrtc.so + 107,496,985 libcublas-37d11411.so.12 + 515,090,264 libcublasLt-f97bfc2c.so.12 + 695,585 libcudart-9335f6a2.so.12 + 104,664 libcudnn.so.9 + 240,675,313 libcudnn_adv.so.9 + 4,700,665 libcudnn_cnn.so.9 + 569,612,689 libcudnn_engines_precompiled.so.9 + 9,562,545 libcudnn_engines_runtime_compiled.so.9 + 3,141,321 libcudnn_graph.so.9 + 86,313,377 libcudnn_heuristic.so.9 + 108,399,185 libcudnn_ops.so.9 + 283,265 libgomp-98b21ff3.so.1 + 244,496 libjitbackend_test.so + 390,312 libnnapi_backend.so + 56,875,329 libnvrtc-b51b459d.so.12 + 6,846,017 libnvrtc-builtins.so + 43,681 libnvToolsExt-847d78f2.so.1 + 53,625 libshm.so + 15,704 libtorch.so + 1,025,232 libtorchbind_test.so + 447,891,009 libtorch_cpu.so +1,490,739,561 libtorch_cuda.so + 389,644,088 libtorch_cuda_linalg.so + 16,881 libtorch_global_deps.so + 28,364,592 libtorch_python.so \ No newline at end of file diff --git a/src/Redist/libtorch-cpu/libtorch-cpu.proj b/src/Redist/libtorch-cpu/libtorch-cpu.proj index 4a11200b3..9c538dbe8 100644 --- a/src/Redist/libtorch-cpu/libtorch-cpu.proj +++ b/src/Redist/libtorch-cpu/libtorch-cpu.proj @@ -34,10 +34,8 @@ - - @@ -46,8 +44,6 @@ - - @@ -56,6 +52,7 @@ + diff --git a/src/Redist/libtorch-cpu/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcpu.zip.sha b/src/Redist/libtorch-cpu/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcpu.zip.sha new file mode 100644 index 000000000..77d538be0 --- /dev/null +++ b/src/Redist/libtorch-cpu/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcpu.zip.sha @@ -0,0 +1 @@ +618CA54EEF82A1DCA46FF1993D5807D9C0DEB0BAE147DA4974166A147CB562FA diff --git a/src/Redist/libtorch-cpu/libtorch-macos-arm64-2.5.1.zip.sha b/src/Redist/libtorch-cpu/libtorch-macos-arm64-2.5.1.zip.sha new file mode 100644 index 000000000..e7e1275d5 --- /dev/null +++ b/src/Redist/libtorch-cpu/libtorch-macos-arm64-2.5.1.zip.sha @@ -0,0 +1 @@ +0822824C1DF267159A649AD4701518217C60B8F75DE056A26AB43958D8AB1622 diff --git a/src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-2.5.1%2Bcpu.zip.sha b/src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-2.5.1%2Bcpu.zip.sha new file mode 100644 index 000000000..57b343e62 --- /dev/null +++ b/src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-2.5.1%2Bcpu.zip.sha @@ -0,0 +1 @@ +176F3C501E50694CEC2F23CA512CA36C0C268F523E90D91C8FCA57BED56A6A65 diff --git a/src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-debug-2.5.1%2Bcpu.zip.sha b/src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-debug-2.5.1%2Bcpu.zip.sha new file mode 100644 index 000000000..4cbd01a80 --- /dev/null +++ b/src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-debug-2.5.1%2Bcpu.zip.sha @@ -0,0 +1 @@ +4C1E40EA4D78F97207CC9188F39C8B57F4BB2A45A2E8787EF96B9C14F226410F diff --git a/src/Redist/libtorch-cuda-12.1/libtorch-cuda-12.1.proj b/src/Redist/libtorch-cuda-12.1/libtorch-cuda-12.1.proj index 639c72953..800bb14cd 100644 --- a/src/Redist/libtorch-cuda-12.1/libtorch-cuda-12.1.proj +++ b/src/Redist/libtorch-cuda-12.1/libtorch-cuda-12.1.proj @@ -38,7 +38,6 @@ - @@ -61,11 +60,10 @@ - - - + + @@ -82,6 +80,7 @@ + @@ -123,7 +122,6 @@ - diff --git a/src/Redist/libtorch-cuda-12.1/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu121.zip.sha b/src/Redist/libtorch-cuda-12.1/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu121.zip.sha new file mode 100644 index 000000000..6837f976c --- /dev/null +++ b/src/Redist/libtorch-cuda-12.1/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu121.zip.sha @@ -0,0 +1 @@ +4097D7D4869AFF57B6F2611907C8F46320FBEB5463D0561EA6BDE5AC6BEB8D35 diff --git a/src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-2.5.1%2Bcu121.zip.sha b/src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-2.5.1%2Bcu121.zip.sha new file mode 100644 index 000000000..70c31e6c9 --- /dev/null +++ b/src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-2.5.1%2Bcu121.zip.sha @@ -0,0 +1 @@ +4AF1F5C45F62AAE1C5F371DEE51918CDA310AD2F33DF39C8B2D3843C36164917 diff --git a/src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-debug-2.5.1%2Bcu121.zip.sha b/src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-debug-2.5.1%2Bcu121.zip.sha new file mode 100644 index 000000000..d087a8e29 --- /dev/null +++ b/src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-debug-2.5.1%2Bcu121.zip.sha @@ -0,0 +1 @@ +9AFF48C4CCD8A00957F49F9C0A9B9DDD47F0AC0C4AADBFF7C9DCA49D7C331491 diff --git a/src/TorchSharp/Torch.cs b/src/TorchSharp/Torch.cs index eba7e044b..728fa9ccd 100644 --- a/src/TorchSharp/Torch.cs +++ b/src/TorchSharp/Torch.cs @@ -20,8 +20,8 @@ public static partial class torch { #if LIBTORCH_2_2_2_0 const string libtorchPackageVersion = "2.2.2.0"; -#elif LIBTORCH_2_4_0_0 - const string libtorchPackageVersion = "2.4.0.0"; +#elif LIBTORCH_2_5_1_0 + const string libtorchPackageVersion = "2.5.1.0"; #else #error "Please update libtorchPackageVersion to match LibTorchPackageVersion" #endif diff --git a/windows_cuda.txt b/windows_cuda.txt index e2b3d13ac..5bd62158a 100644 --- a/windows_cuda.txt +++ b/windows_cuda.txt @@ -1,38 +1,36 @@ - 358912 asmjit.dll - 828416 c10.dll - 358400 c10_cuda.dll - 16384 caffe2_nvrtc.dll - 98058240 cublas64_12.dll -538818048 cublasLt64_12.dll - 527872 cudart64_12.dll - 438840 cudnn64_9.dll -241576488 cudnn_adv64_9.dll - 4019752 cudnn_cnn64_9.dll -588910632 cudnn_engines_precompiled64_9.dll - 8235560 cudnn_engines_runtime_compiled64_9.dll - 2160680 cudnn_graph64_9.dll - 85741608 cudnn_heuristic64_9.dll -107721256 cudnn_ops64_9.dll -190346752 cufft64_11.dll - 295936 cufftw64_11.dll - 4327424 cupti64_2023.1.1.dll - 63505408 curand64_10.dll -110190080 cusolver64_11.dll - 77008384 cusolverMg64_11.dll -262348288 cusparse64_12.dll - 4961280 fbgemm.dll - 344576 fbjni.dll - 2047000 libiomp5md.dll - 41496 libiompstubs5md.dll - 34385920 nvJitLink_120_0.dll - 48128 nvToolsExt64_1.dll - 7001600 nvrtc-builtins64_121.dll - 42161152 nvrtc64_120_0.dll - 192000 pytorch_jni.dll - 9728 torch.dll -238000640 torch_cpu.dll -923134464 torch_cuda.dll - 9728 torch_global_deps.dll - 195072 uv.dll - 89088 zlibwapi.dll + 358,912 asmjit.dll + 877,568 c10.dll + 379,392 c10_cuda.dll + 16,384 caffe2_nvrtc.dll + 98,058,240 cublas64_12.dll +538,818,048 cublasLt64_12.dll + 527,872 cudart64_12.dll + 438,840 cudnn64_9.dll +241,576,488 cudnn_adv64_9.dll + 4,019,752 cudnn_cnn64_9.dll +588,910,632 cudnn_engines_precompiled64_9.dll + 8,235,560 cudnn_engines_runtime_compiled64_9.dll + 2,160,680 cudnn_graph64_9.dll + 85,741,608 cudnn_heuristic64_9.dll +107,721,256 cudnn_ops64_9.dll +190,346,752 cufft64_11.dll + 295,936 cufftw64_11.dll + 4,327,424 cupti64_2023.1.1.dll + 63,505,408 curand64_10.dll +110,190,080 cusolver64_11.dll + 77,008,384 cusolverMg64_11.dll +262,348,288 cusparse64_12.dll + 4,961,280 fbgemm.dll + 1,250,312 libiomp5md.dll + 41,992 libiompstubs5md.dll + 34,385,920 nvJitLink_120_0.dll + 7,001,600 nvrtc-builtins64_121.dll + 42,161,152 nvrtc64_120_0.dll + 48,128 nvToolsExt64_1.dll + 9,728 torch.dll +249,325,056 torch_cpu.dll +927,949,824 torch_cuda.dll + 9,728 torch_global_deps.dll + 195,072 uv.dll + 89,088 zlibwapi.dll