Upgrade to libtorch 2.5.1

Directory.Build.props

@@ -20,7 +20,7 @@
     <SourceDir>$(RepoRoot)src/</SourceDir>
     <PkgDir>$(RepoRoot)pkg/</PkgDir>
 
-    <LibTorchPackageVersion>2.4.0.0</LibTorchPackageVersion>
+    <LibTorchPackageVersion>2.5.1.0</LibTorchPackageVersion>
     <LibTorchPackageVersion Condition="'$(TargetOS)' == 'mac' and '$(TargetArchitecture)' == 'x64'">2.2.2.0</LibTorchPackageVersion>
 
     <!-- when building on local machines the massive downloads get placed up one directory -->
@@ -86,7 +86,7 @@
   <!-- use stable versions for libtorch packages based on LibTorch version number scheme-->
   <!-- we manually update these -->
   <PropertyGroup Condition="'$(MSBuildProjectName.IndexOf(`libtorch-`))' != '-1'">
-    <LibTorchPackageVersion>2.4.0.0</LibTorchPackageVersion>
+    <LibTorchPackageVersion>2.5.1.0</LibTorchPackageVersion>
     <LibTorchPackageVersion Condition="'$(TargetOS)' == 'mac' and '$(TargetArchitecture)' == 'x64'">2.2.2.0</LibTorchPackageVersion>
     <EnablePackageValidation>false</EnablePackageValidation>
     <VersionPrefix>$(LibTorchPackageVersion)</VersionPrefix>

Directory.Build.targets

@@ -12,17 +12,15 @@
     <NativeAssemblyReference Include="asmjit" />
     <NativeAssemblyReference Include="c10" />
     <NativeAssemblyReference Include="fbgemm" />
-    <NativeAssemblyReference Include="fbjni" />
     <NativeAssemblyReference Include="libiomp5md" />
     <NativeAssemblyReference Include="libiompstubs5md" />
-    <NativeAssemblyReference Include="pytorch_jni" />
     <NativeAssemblyReference Include="torch" />
     <NativeAssemblyReference Include="torch_cpu" />
     <NativeAssemblyReference Include="torch_global_deps" />
     <NativeAssemblyReference Include="uv" />
   </ItemGroup>
 
-  <!-- Windows CUDA 11.3 libtorch binary list used for examples and testing -->
+  <!-- Windows CUDA 12.1 libtorch binary list used for examples and testing -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64' and '$(OS)' == 'Windows_NT' and '$(TestUsesLibTorch)' == 'true' and ('$(TestCuda)' == 'true' and '$(SkipCuda)' != 'true') and '$(SkipNative)' != 'true' ">
     <NativeAssemblyReference Include="asmjit" Variant="cuda\" />
     <NativeAssemblyReference Include="c10" Variant="cuda\" />
@@ -47,14 +45,12 @@
     <NativeAssemblyReference Include="cusolverMg64_11" Variant="cuda\" />
     <NativeAssemblyReference Include="cusparse64_12" Variant="cuda\" />
     <NativeAssemblyReference Include="fbgemm" Variant="cuda\" />
-    <NativeAssemblyReference Include="fbjni" Variant="cuda\" />
     <NativeAssemblyReference Include="libiomp5md" Variant="cuda\" />
     <NativeAssemblyReference Include="libiompstubs5md" Variant="cuda\" />
     <NativeAssemblyReference Include="nvJitLink_120_0" Variant="cuda\" />
     <NativeAssemblyReference Include="nvToolsExt64_1" Variant="cuda\" />
     <NativeAssemblyReference Include="nvrtc-builtins64_121" Variant="cuda\" />
     <NativeAssemblyReference Include="nvrtc64_120_0" Variant="cuda\" />
-    <NativeAssemblyReference Include="pytorch_jni" Variant="cuda\" />
     <NativeAssemblyReference Include="torch" Variant="cuda\" />
     <NativeAssemblyReference Include="torch_cpu" Variant="cuda\" />
     <NativeAssemblyReference Include="torch_cuda" Variant="cuda\" />
@@ -63,28 +59,10 @@
     <NativeAssemblyReference Include="zlibwapi" Variant="cuda\" />
   </ItemGroup>
 
-  <!-- Mac x64 libtorch binary list used for examples and testing -->
-  <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64' and $([MSBuild]::IsOSPlatform('osx')) and '$(TestUsesLibTorch)' == 'true'  and '$(SkipNative)' != 'true' ">
-    <NativeAssemblyReference Include="backend_with_compiler" />
-    <NativeAssemblyReference Include="c10" />
-    <NativeAssemblyReference Include="fbjni" />
-    <NativeAssemblyReference Include="iomp5" />
-    <NativeAssemblyReference Include="jitbackend_test" />
-    <NativeAssemblyReference Include="pytorch_jni" />
-    <NativeAssemblyReference Include="shm" />
-    <NativeAssemblyReference Include="torch" />
-    <NativeAssemblyReference Include="torch_cpu" />
-    <NativeAssemblyReference Include="torch_global_deps" />
-    <NativeAssemblyReference Include="torch_python" />
-    <NativeAssemblyReference Include="torchbind_test" />
-  </ItemGroup>
-
 	<!-- Mac arm64 libtorch binary list used for examples and testing -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'arm64'and $([MSBuild]::IsOSPlatform('osx')) and '$(TestUsesLibTorch)' == 'true'  and '$(SkipNative)' != 'true' ">
     <NativeAssemblyReference Include="c10" />
-    <NativeAssemblyReference Include="fbjni" />
     <NativeAssemblyReference Include="omp" />
-    <NativeAssemblyReference Include="pytorch_jni" />
     <NativeAssemblyReference Include="shm" />
     <NativeAssemblyReference Include="torch" />
     <NativeAssemblyReference Include="torch_cpu" />
@@ -94,6 +72,7 @@
 
   <!-- Linux CPU libtorch binary list used for examples and testing -->
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'x64' and $([MSBuild]::IsOSPlatform('linux')) and '$(TestUsesLibTorch)' == 'true'  and '$(SkipNative)' != 'true' ">
+    <NativeAssemblyReference Include="aoti_custom_ops" />
     <NativeAssemblyReference Include="backend_with_compiler" />
     <NativeAssemblyReference Include="c10" />
     <NativeAssemblyReference Include="jitbackend_test" />

RELEASENOTES.md

@@ -2,6 +2,10 @@
 
 Releases, starting with 9/2/2021, are listed with the most recent release at the top.
 
+# NuGet Version 0.105.0
+
+Move to libtorch 2.5.1. As with the 2.4.0 release, MacOS / Intel is no longer supported by libtorch, so TorchSharp doesn, either.
+
 # NuGet Version 0.104.0
 
 This is a big change in implementation, but not as big in API surface area. Many of the builtin modules, but not all, were re-implemented in managed code calling into native code via the functional APIs. This has several advantages:

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

build/BranchInfo.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <MajorVersion>0</MajorVersion>
-    <MinorVersion>104</MinorVersion>
+    <MinorVersion>105</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PreviousPackageVersion>0.103.1</PreviousPackageVersion>
+    <PreviousPackageVersion>0.104.0</PreviousPackageVersion>
   </PropertyGroup>
 </Project>

build/Dependencies.props

@@ -7,7 +7,7 @@
 
   <!-- Other/Non-Core Product Dependencies -->
   <PropertyGroup>
-    <LibTorchVersion>2.4.0</LibTorchVersion>
+    <LibTorchVersion>2.5.1</LibTorchVersion>
     <LibTorchVersion Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetOS)' == 'mac'">2.2.2</LibTorchVersion>
     <CudaVersionDot>12.1</CudaVersionDot>
     <CudaVersionNoDot>121</CudaVersionNoDot>

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
+      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

src/Redist/libtorch-cpu/libtorch-cpu.proj

@@ -34,10 +34,8 @@
     <File Include="libtorch\lib\asmjit.dll" />
     <File Include="libtorch\lib\c10.dll" />
     <File Include="libtorch\lib\fbgemm.dll" />
-    <File Include="libtorch\lib\fbjni.dll" />
     <File Include="libtorch\lib\libiomp5md.dll" />
     <File Include="libtorch\lib\libiompstubs5md.dll" />
-    <File Include="libtorch\lib\pytorch_jni.dll" />
     <File Include="libtorch\lib\torch.dll" />
     <File Include="libtorch\lib\torch_cpu.dll" />
     <File Include="libtorch\lib\torch_global_deps.dll" />
@@ -46,8 +44,6 @@
   <ItemGroup Condition="'$(NativeTargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'mac'">
     <File Include="libtorch\lib\libc10.dylib" />
     <File Include="libtorch\lib\libshm.dylib" />
-    <File Include="libtorch\lib\libfbjni.dylib" />
-    <File Include="libtorch\lib\libpytorch_jni.dylib" />
     <!-- libomp.dylib is required for libtorch, but it is only bundled with libtorch 2.4.0 and above. -->
     <File Include="libtorch\lib\libomp.dylib"/>
     <File Include="libtorch\lib\libtorch.dylib" />
@@ -56,6 +52,7 @@
     <File Include="libtorch\lib\libtorch_python.dylib" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetOS)' == 'linux'">
+    <File Include= "libtorch\lib\libaoti_custom_ops.so" />
     <File Include="libtorch\lib\libbackend_with_compiler.so"/>
     <File Include="libtorch\lib\libc10.so"/>
     <File Include="libtorch\lib\libgomp-98b21ff3.so.1"/>

src/Redist/libtorch-cpu/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcpu.zip.sha

@@ -0,0 +1 @@
+618CA54EEF82A1DCA46FF1993D5807D9C0DEB0BAE147DA4974166A147CB562FA

src/Redist/libtorch-cpu/libtorch-macos-arm64-2.5.1.zip.sha

@@ -0,0 +1 @@
+0822824C1DF267159A649AD4701518217C60B8F75DE056A26AB43958D8AB1622

src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-2.5.1%2Bcpu.zip.sha

@@ -0,0 +1 @@
+176F3C501E50694CEC2F23CA512CA36C0C268F523E90D91C8FCA57BED56A6A65

src/Redist/libtorch-cpu/libtorch-win-shared-with-deps-debug-2.5.1%2Bcpu.zip.sha

@@ -0,0 +1 @@
+4C1E40EA4D78F97207CC9188F39C8B57F4BB2A45A2E8787EF96B9C14F226410F

src/Redist/libtorch-cuda-12.1/libtorch-cuda-12.1.proj

@@ -38,7 +38,6 @@
     <File Include= "libtorch\lib\cudnn64_9.dll" PackageSuffix="part1" />
     <File Include= "libtorch\lib\cudnn_graph64_9.dll" PackageSuffix="part1" />
     <File Include= "libtorch\lib\cudnn_heuristic64_9.dll" PackageSuffix="part1" />
-    <File Include= "libtorch\lib\nvToolsExt64_1.dll" PackageSuffix="part6" />
     <File Include= "libtorch\lib\cudnn_engines_runtime_compiled64_9.dll" PackageSuffix="part1" />
     <File Include= "libtorch\lib\nvrtc64_120_0.dll" PackageSuffix="part1" />
 
@@ -61,11 +60,10 @@
     <File Include= "libtorch\lib\cusolverMg64_11.dll" PackageSuffix="part6" />
     <File Include= "libtorch\lib\curand64_10.dll" PackageSuffix="part6" />
     <File Include= "libtorch\lib\fbgemm.dll" PackageSuffix="part6" />
-    <File Include= "libtorch\lib\fbjni.dll" PackageSuffix="part6" />
     <File Include= "libtorch\lib\libiomp5md.dll" PackageSuffix="part6" />
     <File Include= "libtorch\lib\libiompstubs5md.dll" PackageSuffix="part6" />
-
-    <File Include= "libtorch\lib\pytorch_jni.dll" PackageSuffix="part7" />
+    <File Include= "libtorch\lib\nvToolsExt64_1.dll" PackageSuffix="part6" />
+
     <File Include= "libtorch\lib\cudnn_cnn64_9.dll" PackageSuffix="part7" />
     <File Include= "libtorch\lib\cusparse64_12.dll" PackageSuffix="part7" />
 
@@ -82,6 +80,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetOS)' == 'linux'">
+    <File Include= "libtorch\lib\libaoti_custom_ops.so" PackageSuffix="part1"  />
     <File Include= "libtorch\lib\libbackend_with_compiler.so"  PackageSuffix="part1"  />
     <File Include= "libtorch\lib\libc10.so"  PackageSuffix="part1"  />
     <File Include= "libtorch\lib\libc10_cuda.so"  PackageSuffix="part1"  />
@@ -123,7 +122,6 @@
     <File Include= "libtorch\lib\libcudnn_heuristic.so.9"  PackageSuffix="part6"  />
     <File Include= "libtorch\lib\libnvrtc-b51b459d.so.12" PackageSuffix="part6"  />
     <File Include= "libtorch\lib\libtorch_python.so" PackageSuffix="part6"  />
-    <File Include= "libtorch\lib\libnvrtc-b51b459d.so.12" PackageSuffix="part6"  />
 
     <File Include= "libtorch\lib\libtorch_cuda_linalg.so"  PackageSuffix="part7-primary" FileUnstitchIndex="0" FileUnstitchStart="0" FileUnstitchSize="200000000" />
     <File Include= "libtorch\lib\libtorch_cuda_linalg.so"  PackageSuffix="part7-fragment1" FileUnstitchIndex="1" FileUnstitchStart="200000000" FileUnstitchSize="-1" />

src/Redist/libtorch-cuda-12.1/libtorch-cxx11-abi-shared-with-deps-2.5.1%2Bcu121.zip.sha

@@ -0,0 +1 @@
+4097D7D4869AFF57B6F2611907C8F46320FBEB5463D0561EA6BDE5AC6BEB8D35

src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-2.5.1%2Bcu121.zip.sha

@@ -0,0 +1 @@
+4AF1F5C45F62AAE1C5F371DEE51918CDA310AD2F33DF39C8B2D3843C36164917

src/Redist/libtorch-cuda-12.1/libtorch-win-shared-with-deps-debug-2.5.1%2Bcu121.zip.sha

@@ -0,0 +1 @@
+9AFF48C4CCD8A00957F49F9C0A9B9DDD47F0AC0C4AADBFF7C9DCA49D7C331491

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

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