Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Fix MacOs tutorial version error #1436

Closed
wants to merge 3 commits into from
Closed

WIP - Fix MacOs tutorial version error #1436

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa0f4ec
change version strings
alinpahontu2912 Jan 14, 2025
aa3507a
debug prints and updatde search for package version finding
alinpahontu2912 Mar 11, 2025
bf5102e
correctly search for packages
alinpahontu2912 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/TorchSharp/Torch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ private static void LoadNativeBackend(bool useCudaBackend, out StringBuilder? tr
trace.AppendLine($" packagesDir = {packagesDir}");
trace.AppendLine($" torchsharpHome = {torchsharpHome}");

Console.WriteLine($" torchsharpLoc = {torchsharpLoc}");
Console.WriteLine($" packagesDir = {packagesDir}");
Console.WriteLine($" torchsharpHome = {torchsharpHome}");

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

var torchSharpVersion = Path.GetFileName(torchsharpHome); // really GetDirectoryName
Expand All @@ -192,8 +196,11 @@ private static void LoadNativeBackend(bool useCudaBackend, out StringBuilder? tr
var consolidatedDir = Path.Combine(torchsharpLoc, $"cpu");

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

Console.WriteLine($" cpuRootPackage = {cpuRootPackage}");
Console.WriteLine($" consolidatedDir = {consolidatedDir}");
Console.WriteLine($" libtorchPackageVersion = {libtorchPackageVersion}");
var cpuOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, cpuRootPackage, libtorchPackageVersion, consolidatedDir, trace);

if (cpuOk) {
cpuOk = CopyNativeComponentsIntoSingleDirectory(packagesDir, "torchsharp", torchSharpVersion, consolidatedDir, trace);
if (cpuOk) {
Expand Down Expand Up @@ -238,11 +245,15 @@ private static bool CopyNativeComponentsIntoSingleDirectory(string packagesDir,
// these will be resolved in subsequent iterations.
trace.AppendLine($" Consolidating native binaries, packagesDir={packagesDir}, packagePattern={packagePattern}, packageVersion={packageVersion} to target={target}...");
if (Directory.Exists(packagesDir)) {
var versionParts = packageVersion.Split('.');
string majorMinorPatchVersion = $"{versionParts[0]}.{versionParts[1]}.{versionParts[2]}";
Console.WriteLine($" majorMinorPatchVersion = {majorMinorPatchVersion}");
var packages =
Directory.GetDirectories(packagesDir, packagePattern)
.Where(d => Directory.Exists(Path.Combine(d, packageVersion)))
.Where(d => Directory.Exists(Path.Combine(d, majorMinorPatchVersion)))
.ToArray();

Console.WriteLine($" Found {packages.Length} packages matching {packagePattern} in {packagesDir}");
packages.ToList().ForEach(Console.WriteLine);
if (packages.Length > 0) {
if (!Directory.Exists(target))
Directory.CreateDirectory(target);
Expand Down