Merge pull request #1077 from ionite34/backport/main/pr-1076

[dev to main] backport: Update GpuInfo parsing to include Compute Capability for nvidia GPUs … (1076)

Author: mohnjiles

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.14.2
+### Changed
+- Changed Nvidia GPU detection to use compute capability level instead of the GPU name for certain feature gates / torch indexes
+### Fixed
+- Fixed [#1268](https://github.com/LykosAI/StabilityMatrix/issues/1268) - wrong torch index used for Nvidia 1000-series GPUs and older
+- Fixed [#1269](https://github.com/LykosAI/StabilityMatrix/issues/1269), [#1257](https://github.com/LykosAI/StabilityMatrix/issues/1257), [#1234](https://github.com/LykosAI/StabilityMatrix/issues/1234) - "no such file or directory" errors when updating certain packages after folder migration
+
 ## v2.14.1
 ### Changed
 - Updated Inference Extra Networks (Lora / LyCORIS) base model filtering to consider SDXL variations (e.g., Noob AI / Illustrious) as compatible, unrecognized models or models with no base model will be considered compatible.

StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs

@@ -24,6 +24,7 @@
 using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Helper.Analytics;
+using StabilityMatrix.Core.Helper.HardwareInfo;
 using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Api.Lykos.Analytics;
 using StabilityMatrix.Core.Models.Settings;
@@ -80,7 +81,7 @@ public partial class MainWindowViewModel : ViewModelBase
             { Name: "pt-PT" } => 300,
             { Name: "pt-BR" } => 260,
             { Name: "ko-KR" } => 235,
-            _ => 200
+            _ => 200,
         };
 
     public MainWindowViewModel(
@@ -156,7 +157,7 @@ protected override async Task OnInitialLoadedAsync()
                 Content = Resources.Label_AnotherInstanceAlreadyRunning,
                 IsPrimaryButtonEnabled = true,
                 PrimaryButtonText = Resources.Action_Close,
-                DefaultButton = ContentDialogButton.Primary
+                DefaultButton = ContentDialogButton.Primary,
             };
             await dialog.ShowAsync();
             App.Shutdown();
@@ -262,6 +263,8 @@ settingsManager.Settings.Analytics.LastSeenConsentVersion is null
                 .SafeFireAndForget();
         }
 
+        Task.Run(AddComputeCapabilityIfNecessary).SafeFireAndForget();
+
         // Show what's new for updates
         if (settingsManager.Settings.UpdatingFromVersion is { } updatingFromVersion)
         {
@@ -294,15 +297,15 @@ settingsManager.Settings.Analytics.LaunchDataLastSentAt is null
                     {
                         Version = Compat.AppVersion.ToString(),
                         RuntimeIdentifier = RuntimeInformation.RuntimeIdentifier,
-                        OsDescription = RuntimeInformation.OSDescription
+                        OsDescription = RuntimeInformation.OSDescription,
                     }
                 )
                 .ContinueWith(task =>
                 {
                     if (!task.IsFaulted)
                     {
-                        settingsManager.Transaction(
-                            s => s.Analytics.LaunchDataLastSentAt = DateTimeOffset.UtcNow
+                        settingsManager.Transaction(s =>
+                            s.Analytics.LaunchDataLastSentAt = DateTimeOffset.UtcNow
                         );
                     }
                 })
@@ -467,7 +470,7 @@ private async Task<bool> ShowSelectDataDirectoryDialog()
             IsPrimaryButtonEnabled = false,
             IsSecondaryButtonEnabled = false,
             IsFooterVisible = false,
-            Content = new SelectDataDirectoryDialog { DataContext = viewModel }
+            Content = new SelectDataDirectoryDialog { DataContext = viewModel },
         };
 
         var result = await dialog.ShowAsync(App.TopLevel);
@@ -500,7 +503,7 @@ public async Task ShowUpdateDialog()
             IsPrimaryButtonEnabled = false,
             IsSecondaryButtonEnabled = false,
             IsFooterVisible = false,
-            Content = new UpdateDialog { DataContext = viewModel }
+            Content = new UpdateDialog { DataContext = viewModel },
         };
 
         await viewModel.Preload();
@@ -518,4 +521,30 @@ private async Task ShowMigrationTipIfNecessaryAsync()
 
         settingsManager.Transaction(s => s.SeenTeachingTips.Add(TeachingTip.SharedFolderMigrationTip));
     }
+
+    private void AddComputeCapabilityIfNecessary()
+    {
+        try
+        {
+            if (settingsManager.Settings.PreferredGpu is not { IsNvidia: true, ComputeCapability: null })
+                return;
+
+            var newGpuInfos = HardwareHelper.IterGpuInfoNvidiaSmi();
+            var matchedGpuInfo = newGpuInfos?.FirstOrDefault(x =>
+                x.Name?.Equals(settingsManager.Settings.PreferredGpu.Name) ?? false
+            );
+
+            if (matchedGpuInfo is null)
+            {
+                return;
+            }
+
+            using var transaction = settingsManager.BeginTransaction();
+            transaction.Settings.PreferredGpu = matchedGpuInfo;
+        }
+        catch (Exception)
+        {
+            // ignored
+        }
+    }
 }

StabilityMatrix.Core/Helper/HardwareInfo/GpuInfo.cs

@@ -5,13 +5,22 @@ public record GpuInfo
     public int Index { get; set; }
     public string? Name { get; init; } = string.Empty;
     public ulong MemoryBytes { get; init; }
+    public string? ComputeCapability { get; init; }
+
+    /// <summary>
+    /// Gets the compute capability as a comparable decimal value (e.g. "8.6" becomes 8.6m)
+    /// Returns null if compute capability is not available
+    /// </summary>
+    public decimal? ComputeCapabilityValue =>
+        ComputeCapability != null && decimal.TryParse(ComputeCapability, out var value) ? value : null;
+
     public MemoryLevel? MemoryLevel =>
         MemoryBytes switch
         {
             <= 0 => HardwareInfo.MemoryLevel.Unknown,
             < 4 * Size.GiB => HardwareInfo.MemoryLevel.Low,
             < 8 * Size.GiB => HardwareInfo.MemoryLevel.Medium,
-            _ => HardwareInfo.MemoryLevel.High
+            _ => HardwareInfo.MemoryLevel.High,
         };
 
     public bool IsNvidia
@@ -29,26 +38,26 @@ public bool IsNvidia
 
     public bool IsBlackwellGpu()
     {
-        if (Name is null)
+        if (ComputeCapability is null)
             return false;
 
-        return IsNvidia
-            && Name.Contains("RTX 50", StringComparison.OrdinalIgnoreCase)
-            && !Name.Contains("RTX 5000", StringComparison.OrdinalIgnoreCase);
+        return ComputeCapabilityValue >= 12.0m;
     }
 
     public bool IsAmpereOrNewerGpu()
     {
-        if (Name is null)
+        if (ComputeCapability is null)
+            return false;
+
+        return ComputeCapabilityValue >= 8.6m;
+    }
+
+    public bool IsLegacyNvidiaGpu()
+    {
+        if (ComputeCapability is null)
             return false;
 
-        return IsNvidia
-            && Name.Contains("RTX", StringComparison.OrdinalIgnoreCase)
-            && !Name.Contains("RTX 20")
-            && !Name.Contains("RTX 4000")
-            && !Name.Contains("RTX 5000")
-            && !Name.Contains("RTX 6000")
-            && !Name.Contains("RTX 8000");
+        return ComputeCapabilityValue < 7.5m;
     }
 
     public bool IsAmd => Name?.Contains("amd", StringComparison.OrdinalIgnoreCase) ?? false;

StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs

@@ -17,8 +17,8 @@ public static partial class HardwareHelper
     private static IReadOnlyList<GpuInfo>? cachedGpuInfos;
     private static readonly object cachedGpuInfosLock = new();
 
-    private static readonly Lazy<IHardwareInfo> HardwareInfoLazy =
-        new(() => new Hardware.Info.HardwareInfo());
+    private static readonly Lazy<IHardwareInfo> HardwareInfoLazy = new(() => new Hardware.Info.HardwareInfo()
+    );
 
     public static IHardwareInfo HardwareInfo => HardwareInfoLazy.Value;
 
@@ -27,7 +27,7 @@ private static string RunBashCommand(string command)
         var processInfo = new ProcessStartInfo("bash", "-c \"" + command + "\"")
         {
             UseShellExecute = false,
-            RedirectStandardOutput = true
+            RedirectStandardOutput = true,
         };
 
         var process = Process.Start(processInfo);
@@ -103,7 +103,7 @@ private static IEnumerable<GpuInfo> IterGpuInfoLinux()
             {
                 Index = gpuIndex++,
                 Name = name,
-                MemoryBytes = memoryBytes
+                MemoryBytes = memoryBytes,
             };
         }
     }
@@ -127,7 +127,7 @@ private static IEnumerable<GpuInfo> IterGpuInfoMacos()
             {
                 Index = i,
                 Name = videoController.Name,
-                MemoryBytes = gpuMemoryBytes
+                MemoryBytes = gpuMemoryBytes,
             };
         }
     }
@@ -168,7 +168,7 @@ public static IEnumerable<GpuInfo> IterGpuInfo(bool forceRefresh = false)
                                 {
                                     Name = gpu.Name,
                                     Index = index,
-                                    MemoryBytes = gpu.MemoryBytes
+                                    MemoryBytes = gpu.MemoryBytes,
                                 }
                         );
 
@@ -205,9 +205,9 @@ public static IEnumerable<GpuInfo> IterGpuInfo(bool forceRefresh = false)
         {
             FileName = "nvidia-smi",
             UseShellExecute = false,
-            Arguments = "--query-gpu name,memory.total --format=csv",
+            Arguments = "--query-gpu name,memory.total,compute_cap --format=csv",
             RedirectStandardOutput = true,
-            CreateNoWindow = true
+            CreateNoWindow = true,
         };
 
         var process = Process.Start(psi);
@@ -224,7 +224,7 @@ public static IEnumerable<GpuInfo> IterGpuInfo(bool forceRefresh = false)
         {
             var gpu = results[index];
             var datas = gpu.Split(',', StringSplitOptions.RemoveEmptyEntries);
-            if (datas is not { Length: 2 })
+            if (datas is not { Length: 3 })
                 continue;
 
             var memory = Regex.Replace(datas[1], @"([A-Z])\w+", "").Trim();
@@ -234,7 +234,8 @@ public static IEnumerable<GpuInfo> IterGpuInfo(bool forceRefresh = false)
                 {
                     Name = datas[0],
                     Index = index,
-                    MemoryBytes = Convert.ToUInt64(memory) * Size.MiB
+                    MemoryBytes = Convert.ToUInt64(memory) * Size.MiB,
+                    ComputeCapability = datas[2].Trim(),
                 }
             );
         }
@@ -253,12 +254,13 @@ public static bool HasNvidiaGpu()
     public static bool HasBlackwellGpu()
     {
         return IterGpuInfo()
-            .Any(
-                gpu =>
-                    gpu is { IsNvidia: true, Name: not null }
-                    && gpu.Name.Contains("RTX 50", StringComparison.OrdinalIgnoreCase)
-                    && !gpu.Name.Contains("RTX 5000", StringComparison.OrdinalIgnoreCase)
-            );
+            .Any(gpu => gpu is { IsNvidia: true, Name: not null, ComputeCapabilityValue: >= 12.0m });
+    }
+
+    public static bool HasLegacyNvidiaGpu()
+    {
+        return IterGpuInfo()
+            .Any(gpu => gpu is { IsNvidia: true, Name: not null, ComputeCapabilityValue: < 7.5m });
     }
 
     /// <summary>
@@ -322,7 +324,7 @@ private static MemoryInfo GetMemoryInfoImplWindows()
         {
             TotalInstalledBytes = (ulong)installedMemoryKb * 1024,
             TotalPhysicalBytes = memoryStatus.UllTotalPhys,
-            AvailablePhysicalBytes = memoryStatus.UllAvailPhys
+            AvailablePhysicalBytes = memoryStatus.UllAvailPhys,
         };
     }
 
@@ -336,15 +338,15 @@ private static MemoryInfo GetMemoryInfoImplGeneric()
             return new MemoryInfo
             {
                 TotalPhysicalBytes = HardwareInfo.MemoryStatus.TotalPhysical,
-                TotalInstalledBytes = HardwareInfo.MemoryStatus.TotalPhysical
+                TotalInstalledBytes = HardwareInfo.MemoryStatus.TotalPhysical,
             };
         }
 
         return new MemoryInfo
         {
             TotalPhysicalBytes = HardwareInfo.MemoryStatus.TotalPhysical,
             TotalInstalledBytes = HardwareInfo.MemoryStatus.TotalPhysical,
-            AvailablePhysicalBytes = HardwareInfo.MemoryStatus.AvailablePhysical
+            AvailablePhysicalBytes = HardwareInfo.MemoryStatus.AvailablePhysical,
         };
     }
 

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -439,6 +439,28 @@ await PrerequisiteHelper
                 .ConfigureAwait(false);
         }
 
+        var sharedFolderMethodToUse =
+            installedPackage.PreferredSharedFolderMethod ?? RecommendedSharedFolderMethod;
+        // Temporarily remove symlinks if using Symlink method
+        if (sharedFolderMethodToUse == SharedFolderMethod.Symlink)
+        {
+            if (SharedFolders is not null)
+            {
+                Helper.SharedFolders.RemoveLinksForPackage(
+                    SharedFolders,
+                    new DirectoryPath(installedPackage.FullPath!)
+                );
+            }
+
+            if (SharedOutputFolders is not null && installedPackage.UseSharedOutputFolder)
+            {
+                Helper.SharedFolders.RemoveLinksForPackage(
+                    SharedOutputFolders,
+                    new DirectoryPath(installedPackage.FullPath!)
+                );
+            }
+        }
+
         var versionOptions = options.VersionOptions;
 
         if (!string.IsNullOrWhiteSpace(versionOptions.VersionTag))

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -344,33 +344,34 @@ public override async Task InstallPackage(
         await venvRunner.PipInstall("--upgrade pip wheel", onConsoleOutput).ConfigureAwait(false);
 
         var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
+        var isLegacyNvidia =
+            torchVersion == TorchIndex.Cuda
+            && (
+                SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu()
+                ?? HardwareHelper.HasLegacyNvidiaGpu()
+            );
 
         var pipArgs = new PipInstallArgs();
 
         pipArgs = torchVersion switch
         {
             TorchIndex.DirectMl => pipArgs.WithTorchDirectML(),
-            _
-                => pipArgs
-                    .AddArg("--upgrade")
-                    .WithTorch()
-                    .WithTorchVision()
-                    .WithTorchAudio()
-                    .WithTorchExtraIndex(
-                        torchVersion switch
-                        {
-                            TorchIndex.Cpu => "cpu",
-                            TorchIndex.Cuda => "cu128",
-                            TorchIndex.Rocm => "rocm6.2.4",
-                            TorchIndex.Mps => "cpu",
-                            _
-                                => throw new ArgumentOutOfRangeException(
-                                    nameof(torchVersion),
-                                    torchVersion,
-                                    null
-                                )
-                        }
-                    )
+            _ => pipArgs
+                .AddArg("--upgrade")
+                .WithTorch()
+                .WithTorchVision()
+                .WithTorchAudio()
+                .WithTorchExtraIndex(
+                    torchVersion switch
+                    {
+                        TorchIndex.Cpu => "cpu",
+                        TorchIndex.Cuda when isLegacyNvidia => "cu126",
+                        TorchIndex.Cuda => "cu128",
+                        TorchIndex.Rocm => "rocm6.2.4",
+                        TorchIndex.Mps => "cpu",
+                        _ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null),
+                    }
+                ),
         };
 
         var requirements = new FilePath(installLocation, "requirements.txt");