Skip to content

Commit ab70e9f

Browse files
updated standardizing version method calls
1 parent 1ec4b10 commit ab70e9f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/TorchSharp/Torch.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,16 @@ private static void LoadNativeBackend(bool useCudaBackend, out StringBuilder? tr
188188

189189
if (torchsharpLoc!.Contains("torchsharp") && torchsharpLoc.Contains("lib") && Directory.Exists(packagesDir) && Directory.Exists(torchsharpHome)) {
190190

191-
var assembly = typeof(torch).Assembly;
192-
var version = assembly.GetName().Version;
193-
var torchSharpVersion = (version != null) ? version.ToString() : Path.GetFileName(torchsharpHome);
191+
var torchSharpVersion = NormalizeNuGetVersion(Path.GetFileName(torchsharpHome));
192+
var normalizedLibtorchPackageVersion = NormalizeNuGetVersion(libtorchPackageVersion);
194193
if (useCudaBackend) {
195194
var consolidatedDir = Path.Combine(torchsharpLoc, $"cuda-{cudaVersion}");
196195

197196
trace.AppendLine($" Trying dynamic load for .NET/F# Interactive by consolidating native {cudaRootPackage}-* binaries to {consolidatedDir}...");
198197

199-
var cudaOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, $"{cudaRootPackage}-*", NormalizeNuGetVersion(libtorchPackageVersion), consolidatedDir, trace);
198+
var cudaOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, $"{cudaRootPackage}-*", normalizedLibtorchPackageVersion, consolidatedDir, trace);
200199
if (cudaOk) {
201-
cudaOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, "torchsharp", NormalizeNuGetVersion(torchSharpVersion), consolidatedDir, trace);
200+
cudaOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, "torchsharp", torchSharpVersion, consolidatedDir, trace);
202201
if (cudaOk) {
203202
var consolidated = Path.Combine(consolidatedDir, target);
204203
ok = TryLoadNativeLibraryFromFile(consolidated, trace);
@@ -214,9 +213,9 @@ private static void LoadNativeBackend(bool useCudaBackend, out StringBuilder? tr
214213

215214
trace.AppendLine($" Trying dynamic load for .NET/F# Interactive by consolidating native {cpuRootPackage}-* binaries to {consolidatedDir}...");
216215

217-
var cpuOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, cpuRootPackage, NormalizeNuGetVersion(libtorchPackageVersion), consolidatedDir, trace);
216+
var cpuOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, cpuRootPackage, normalizedLibtorchPackageVersion, consolidatedDir, trace);
218217
if (cpuOk) {
219-
cpuOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, "torchsharp", NormalizeNuGetVersion(torchSharpVersion), consolidatedDir, trace);
218+
cpuOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, "torchsharp", torchSharpVersion, consolidatedDir, trace);
220219
if (cpuOk) {
221220
var consolidated = Path.Combine(consolidatedDir, target);
222221
ok = TryLoadNativeLibraryFromFile(consolidated, trace);

0 commit comments

Comments
 (0)