Merge pull request LykosAI#1085 from ionite34/fix-invoke

Fix invoke

Author: mohnjiles

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed [#1266](https://github.com/LykosAI/StabilityMatrix/issues/1266) - crash when moving or deleting Lora models in the Checkpoint Manager
 - 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
+- Fixed [#1274](https://github.com/LykosAI/StabilityMatrix/issues/1274), [#1276](https://github.com/LykosAI/StabilityMatrix/issues/1276) - incorrect torch installed when updating to InvokeAI v5.12+
 ### Supporters
 #### 🌟 Visionaries
 Our deepest gratitude to the brilliant Visionary-tier Patrons: **Waterclouds**, **bluepopsicle**, **Bob S**, **Ibixat**, and **Corey T**! Your incredible backing is instrumental in shaping the future of Stability Matrix and empowering us to deliver cutting-edge features. Thank you for believing in our vision! 🙏

StabilityMatrix.Core/Models/Packages/InvokeAI.cs

@@ -8,6 +8,7 @@
 using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Helper.HardwareInfo;
 using StabilityMatrix.Core.Models.Api.Invoke;
 using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Models.Progress;
@@ -63,14 +64,14 @@ IPrerequisiteHelper prerequisiteHelper
             [SharedFolderType.ControlNet] = [Path.Combine(RelativeRootPath, "autoimport", "controlnet")],
             [SharedFolderType.IpAdapters15] =
             [
-                Path.Combine(RelativeRootPath, "models", "sd-1", "ip_adapter")
+                Path.Combine(RelativeRootPath, "models", "sd-1", "ip_adapter"),
             ],
             [SharedFolderType.IpAdaptersXl] =
             [
-                Path.Combine(RelativeRootPath, "models", "sdxl", "ip_adapter")
+                Path.Combine(RelativeRootPath, "models", "sdxl", "ip_adapter"),
             ],
             [SharedFolderType.ClipVision] = [Path.Combine(RelativeRootPath, "models", "any", "clip_vision")],
-            [SharedFolderType.T2IAdapter] = [Path.Combine(RelativeRootPath, "autoimport", "t2i_adapter")]
+            [SharedFolderType.T2IAdapter] = [Path.Combine(RelativeRootPath, "autoimport", "t2i_adapter")],
         };
 
     public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
@@ -85,15 +86,15 @@ IPrerequisiteHelper prerequisiteHelper
             {
                 Name = "Root Directory",
                 Type = LaunchOptionType.String,
-                Options = ["--root"]
+                Options = ["--root"],
             },
             new()
             {
                 Name = "Config File",
                 Type = LaunchOptionType.String,
-                Options = ["--config"]
+                Options = ["--config"],
             },
-            LaunchOptionDefinition.Extras
+            LaunchOptionDefinition.Extras,
         ];
 
     public override IEnumerable<TorchIndex> AvailableTorchIndices =>
@@ -114,7 +115,7 @@ public override TorchIndex GetRecommendedTorchVersion()
             PackagePrerequisite.Python310,
             PackagePrerequisite.VcRedist,
             PackagePrerequisite.Git,
-            PackagePrerequisite.Node
+            PackagePrerequisite.Node,
         ];
 
     public override async Task InstallPackage(
@@ -148,20 +149,29 @@ await SetupAndBuildInvokeFrontend(
         var pipCommandArgs = "-e . --use-pep517 --extra-index-url https://download.pytorch.org/whl/cpu";
 
         var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
+        var isLegacyNvidiaGpu =
+            torchVersion is TorchIndex.Cuda
+            && (
+                SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu()
+                ?? HardwareHelper.HasLegacyNvidiaGpu()
+            );
+
         var torchInstallArgs = new PipInstallArgs();
 
         switch (torchVersion)
         {
             case TorchIndex.Cuda:
+                var torchIndex = isLegacyNvidiaGpu ? "cu126" : "cu128";
                 torchInstallArgs = torchInstallArgs
-                    .WithTorch("==2.4.1")
-                    .WithTorchVision("==0.19.1")
-                    .WithXFormers("==0.0.28.post1")
-                    .WithTorchExtraIndex("cu124");
+                    .WithTorch("==2.7.0")
+                    .WithTorchVision("==0.22.0")
+                    .WithTorchAudio("==2.7.0")
+                    .WithXFormers("==0.0.30")
+                    .WithTorchExtraIndex(torchIndex);
 
                 Logger.Info("Starting InvokeAI install (CUDA)...");
                 pipCommandArgs =
-                    "-e .[xformers] --use-pep517 --extra-index-url https://download.pytorch.org/whl/cu124";
+                    $"-e .[xformers] --use-pep517 --extra-index-url https://download.pytorch.org/whl/{torchIndex}";
                 break;
 
             case TorchIndex.Rocm:
@@ -321,10 +331,10 @@ await SetupAndBuildInvokeFrontend(
         // above the minimum in invokeai.frontend.install.widgets
 
         var code = $"""
-                    import sys
-                    from {split[0]} import {split[1]}
-                    sys.exit({split[1]}())
-                    """;
+            import sys
+            from {split[0]} import {split[1]}
+            sys.exit({split[1]}())
+            """;
 
         if (runDetached)
         {
@@ -383,9 +393,15 @@ await SetupInvokeModelSharingConfig(onConsoleOutput, match, s)
     }
 
     // Invoke doing shared folders on startup instead
-    public override Task SetupModelFolders(DirectoryPath installDirectory, SharedFolderMethod sharedFolderMethod) => Task.CompletedTask;
+    public override Task SetupModelFolders(
+        DirectoryPath installDirectory,
+        SharedFolderMethod sharedFolderMethod
+    ) => Task.CompletedTask;
 
-    public override Task RemoveModelFolderLinks(DirectoryPath installDirectory, SharedFolderMethod sharedFolderMethod) => Task.CompletedTask;
+    public override Task RemoveModelFolderLinks(
+        DirectoryPath installDirectory,
+        SharedFolderMethod sharedFolderMethod
+    ) => Task.CompletedTask;
 
     private async Task<bool> SetupInvokeModelSharingConfig(
         Action<ProcessOutput>? onConsoleOutput,
@@ -405,7 +421,7 @@ ProcessOutput s
             {
                 ContentSerializer = new SystemTextJsonContentSerializer(
                     new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }
-                )
+                ),
             }
         );
 
@@ -422,7 +438,7 @@ await invokeAiApi
                     new InstallModelRequest
                     {
                         Name = Path.GetFileNameWithoutExtension(model.Path),
-                        Description = Path.GetFileName(model.Path)
+                        Description = Path.GetFileName(model.Path),
                     },
                     source: model.Path,
                     inplace: true
@@ -435,10 +451,9 @@ await invokeAiApi
         var installCheckCount = 0;
 
         while (
-            !installStatus.All(
-                x =>
-                    (x.Status != null && x.Status.Equals("completed", StringComparison.OrdinalIgnoreCase))
-                    || (x.Status != null && x.Status.Equals("error", StringComparison.OrdinalIgnoreCase))
+            !installStatus.All(x =>
+                (x.Status != null && x.Status.Equals("completed", StringComparison.OrdinalIgnoreCase))
+                || (x.Status != null && x.Status.Equals("error", StringComparison.OrdinalIgnoreCase))
             )
         )
         {
@@ -449,7 +464,7 @@ await invokeAiApi
                     new ProcessOutput
                     {
                         Text =
-                            "This may take awhile, feel free to use the web interface while the rest of your models are imported.\n"
+                            "This may take awhile, feel free to use the web interface while the rest of your models are imported.\n",
                     }
                 );
 
@@ -466,7 +481,7 @@ await invokeAiApi
                 {
                     Text =
                         $"\nWaiting for model import... ({installStatus.Count(x => (x.Status != null && !x.Status.Equals("completed",
-                        StringComparison.OrdinalIgnoreCase)) && !x.Status.Equals("error", StringComparison.OrdinalIgnoreCase))} remaining)\n"
+                        StringComparison.OrdinalIgnoreCase)) && !x.Status.Equals("error", StringComparison.OrdinalIgnoreCase))} remaining)\n",
                 }
             );
             await Task.Delay(5000).ConfigureAwait(false);