Skip to content

Commit 299304d

Browse files
NiklasGustafssonNiklasGustafsson
committed
Starting upgrade to 2.4.0
1 parent 871ff49 commit 299304d

File tree

15 files changed

+162
-60
lines changed

15 files changed

+162
-60
lines changed

‎DEVGUIDE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ version of PyTorch then quite a lot of careful work needs to be done.
179179
On Windows:
180180

181181
dotnet build src\Redist\libtorch-cpu\libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=linux /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
182-
dotnet build src\Redist\libtorch-cpu\libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=mac /p:TargetArchitecture=x64 /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
183182
dotnet build src\Redist\libtorch-cpu\libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=mac /p:TargetArchitecture=arm64 /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
184183
dotnet build src\Redist\libtorch-cpu\libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=windows /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
185184
dotnet build src\Redist\libtorch-cpu\libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=windows /p:Configuration=Debug /t:Build /p:IncludeLibTorchCpuPackages=true
@@ -191,7 +190,6 @@ On Windows:
191190
On Linux / Mac:
192191

193192
dotnet build src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=linux /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
194-
dotnet build src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=mac /p:TargetArchitecture=x64 /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
195193
dotnet build src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=mac /p:TargetArchitecture=arm64 /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
196194
dotnet build src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=windows /p:Configuration=Release /t:Build /p:IncludeLibTorchCpuPackages=true
197195
dotnet build src/Redist/libtorch-cpu/libtorch-cpu.proj /p:UpdateSHA=true /p:TargetOS=windows /p:Configuration=Debug /t:Build /p:IncludeLibTorchCpuPackages=true

‎Directory.Build.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,14 @@
8181
<!-- Mac arm64 libtorch binary list used for examples and testing -->
8282
<ItemGroup Condition="'$(NativeTargetArchitecture)' == 'arm64'and $([MSBuild]::IsOSPlatform('osx')) and '$(TestUsesLibTorch)' == 'true' and '$(SkipNative)' != 'true' ">
8383
<NativeAssemblyReference Include="c10" />
84+
<NativeAssemblyReference Include="fbjni" />
85+
<NativeAssemblyReference Include="omp" />
86+
<NativeAssemblyReference Include="pytorch_jni" />
8487
<NativeAssemblyReference Include="shm" />
8588
<NativeAssemblyReference Include="torch" />
8689
<NativeAssemblyReference Include="torch_cpu" />
8790
<NativeAssemblyReference Include="torch_global_deps" />
91+
<NativeAssemblyReference Include="torch_python" />
8892
</ItemGroup>
8993

9094
<!-- Linux CPU libtorch binary list used for examples and testing -->

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
<br/>
1212
Please check the [Release Notes](RELEASENOTES.md) file for news on what's been updated in each new release.
1313

14-
__TorchSharp is now in the .NET Foundation!__
1514

16-
If you are using TorchSharp from NuGet, you should be using a version >= 0.98.3 of TorchSharp, and >= 1.12.0 of the libtorch-xxx redistributable packages. We recommend using one of the 'bundled' packages: TorchSharp-cpu, TorchSharp-cuda-windows, or TorchSharp-cuda-linux. They will pull in the right LibTorch backends.
15+
__TorchSharp no longer supports MacOS on Intel hardware.__
16+
17+
With libtorch release 2.4.0, Intel HW support was deprecated for libtorch. This means that the last version of TorchSharp to work on Intel Macintosh hardware is 0.102.8. Starting with 0.103.0, only Macs based on Apple Silicon are supported.
1718

1819
__TorchSharp examples has their own home!__
1920

‎RELEASENOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
Releases, starting with 9/2/2021, are listed with the most recent release at the top.
44

5+
# NuGet Version 0.103.0
6+
7+
Move to libtorch 2.4.0.
8+
59
# NuGet Version 0.102.8
610

711
__Bug Fixes__:

‎build/BranchInfo.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
33
<MajorVersion>0</MajorVersion>
4-
<MinorVersion>102</MinorVersion>
5-
<PatchVersion>8</PatchVersion>
6-
<PreviousPackageVersion>0.102.7</PreviousPackageVersion>
4+
<MinorVersion>103</MinorVersion>
5+
<PatchVersion>0</PatchVersion>
6+
<PreviousPackageVersion>0.102.8</PreviousPackageVersion>
77
</PropertyGroup>
88

99
</Project>

‎linux_cuda.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
293064 libbackend_with_compiler.so
2+
1126504 libc10.so
3+
1444824 libc10_cuda.so
4+
843617 libc10d_cuda_test.so
5+
22505 libcaffe2_nvrtc.so
6+
107496985 libcublas-37d11411.so.12
7+
515090264 libcublasLt-f97bfc2c.so.12
8+
695585 libcudart-9335f6a2.so.12
9+
104664 libcudnn.so.9
10+
240675313 libcudnn_adv.so.9
11+
4700665 libcudnn_cnn.so.9
12+
569612689 libcudnn_engines_precompiled.so.9
13+
9562545 libcudnn_engines_runtime_compiled.so.9
14+
3141321 libcudnn_graph.so.9
15+
86313377 libcudnn_heuristic.so.9
16+
108399185 libcudnn_ops.so.9
17+
283265 libgomp-98b21ff3.so.1
18+
253880 libjitbackend_test.so
19+
398408 libnnapi_backend.so
20+
43681 libnvToolsExt-847d78f2.so.1
21+
56875329 libnvrtc-b51b459d.so.12
22+
6846017 libnvrtc-builtins.so
23+
53625 libshm.so
24+
15704 libtorch.so
25+
503454193 libtorch_cpu.so
26+
1487160249 libtorch_cuda.so
27+
401400273 libtorch_cuda_linalg.so
28+
20817 libtorch_global_deps.so
29+
29034321 libtorch_python.so
30+
967256 libtorchbind_test.so

‎pkg/libtorch-cuda-12.1-win-x64-part10/libtorch-cuda-12.1-win-x64-part10.nupkgproj renamed to ‎pkg/libtorch-cuda-12.1-linux-x64-part3-fragment4/libtorch-cuda-12.1-linux-x64-part3-fragment4.nupkgproj

File renamed without changes.

‎pkg/libtorch-cuda-12.1-linux-x64-part7/libtorch-cuda-12.1-linux-x64-part7.nupkgproj renamed to ‎pkg/libtorch-cuda-12.1-linux-x64-part7-fragment1/libtorch-cuda-12.1-linux-x64-part7-fragment1.nupkgproj

File renamed without changes.

‎pkg/libtorch-cuda-12.1-linux-x64-part7-primary/libtorch-cuda-12.1-linux-x64-part7-primary.nupkgproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Pack">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
</PropertyGroup>
6+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
7+
</ItemGroup>
8+
9+
<ItemGroup>
10+
<Content Include="..\common\RestitchPackage.props" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).props" />
11+
<Content Include="..\common\RestitchPackage.targets" Pack="true" PackagePath="buildTransitive\netstandard2.0\$(MSBuildProjectName).targets" />
12+
<Content Include="..\empty.txt" Pack="true" PackagePath="lib\netstandard2.0\_._" />
13+
<Content Include="$(RepoRoot)\THIRD-PARTY-NOTICES.txt" Pack="true" PackagePath="LICENSE-LIBTORCH.txt" />
14+
</ItemGroup>
15+
</Project>

‎pkg/libtorch-cuda-12.1-linux-x64-part8/libtorch-cuda-12.1-linux-x64-part8.nupkgproj renamed to ‎pkg/libtorch-cuda-12.1-linux-x64-part8-fragment1/libtorch-cuda-12.1-linux-x64-part8-fragment1.nupkgproj

File renamed without changes.

0 commit comments

Comments
 (0)