Merge branch 'main' into backport/main/pr-1189

Author: mohnjiles

StabilityMatrix.Avalonia/ViewModels/Dialogs/UpdateViewModel.cs

@@ -162,6 +162,68 @@ await updateHelper.DownloadUpdate(
             );
         }
 
+        // Handle Linux AppImage update
+        if (Compat.IsLinux && Environment.GetEnvironmentVariable("APPIMAGE") is { } appImage)
+        {
+            try
+            {
+                var updateScriptPath = UpdateHelper.UpdateFolder.JoinFile("update_script.sh").FullPath;
+                var newAppImage = UpdateHelper.ExecutablePath.FullPath;
+
+                var scriptContent = """
+#!/bin/bash
+set -e
+
+# Wait for the process to exit
+while kill -0 "$PID" 2>/dev/null; do
+    sleep 0.5
+done
+
+# Move the new AppImage over the old one
+mv -f "$NEW_APPIMAGE" "$OLD_APPIMAGE"
+chmod +x "$OLD_APPIMAGE"
+
+# Launch the new AppImage detached
+"$OLD_APPIMAGE" > /dev/null 2>&1 &
+disown
+""";
+                await File.WriteAllTextAsync(updateScriptPath, scriptContent);
+
+                File.SetUnixFileMode(
+                    updateScriptPath,
+                    UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute
+                );
+
+                var startInfo = new System.Diagnostics.ProcessStartInfo
+                {
+                    FileName = "/usr/bin/env",
+                    Arguments = $"bash \"{updateScriptPath}\"",
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                };
+
+                startInfo.EnvironmentVariables["PID"] = Environment.ProcessId.ToString();
+                startInfo.EnvironmentVariables["NEW_APPIMAGE"] = newAppImage;
+                startInfo.EnvironmentVariables["OLD_APPIMAGE"] = appImage;
+
+                System.Diagnostics.Process.Start(startInfo);
+
+                App.Shutdown();
+                return;
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed to execute AppImage update script");
+
+                var dialog = DialogHelper.CreateMarkdownDialog(
+                    "AppImage update script failed. \nCould not replace old AppImage with new version. Please check directory permissions. \nFalling back to standard update process. User intervention required: \nAfter program closes, \nplease move the new AppImage extracted in the '.StabilityMatrixUpdate' hidden directory to the old AppImage overwriting it. \n\nClose this dialog to continue with standard update process.",
+                    Resources.Label_UnexpectedErrorOccurred
+                );
+
+                await dialog.ShowAsync();
+            }
+        }
+
         // Set current version for update messages
         settingsManager.Transaction(
             s => s.UpdatingFromVersion = Compat.AppVersion,

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -382,7 +382,7 @@ await StandardPipInstallProcessAsync(
             var indexUrl = gfxArch switch
             {
                 "gfx1151" => "https://rocm.nightlies.amd.com/v2/gfx1151",
-                _ when gfxArch.StartsWith("gfx110") => "https://rocm.nightlies.amd.com/v2/gfx110X-dgpu",
+                _ when gfxArch.StartsWith("gfx110") => "https://rocm.nightlies.amd.com/v2/gfx110X-all",
                 _ when gfxArch.StartsWith("gfx120") => "https://rocm.nightlies.amd.com/v2/gfx120X-all",
                 _ => throw new ArgumentOutOfRangeException(
                     nameof(gfxArch),
@@ -923,6 +923,8 @@ private ImmutableDictionary<string, string> GetEnvVars(ImmutableDictionary<strin
         // set some experimental speed improving env vars for Windows ROCm
         return env.SetItem("PYTORCH_TUNABLEOP_ENABLED", "1")
             .SetItem("MIOPEN_FIND_MODE", "2")
-            .SetItem("TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL", "1");
+            .SetItem("TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL", "1")
+            .SetItem("PYTORCH_ALLOC_CONF", "max_split_size_mb:6144,garbage_collection_threshold:0.8") // greatly helps prevent GPU OOM and instability/driver timeouts/OS hard locks and decreases dependency on Tiled VAE at standard res's
+            .SetItem("COMFYUI_ENABLE_MIOPEN", "1"); // re-enables "cudnn" in ComfyUI as it's needed for MiOpen to function properly
     }
 }

StabilityMatrix.Core/Models/Packages/ComfyZluda.cs

@@ -6,6 +6,7 @@
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Helper.Cache;
 using StabilityMatrix.Core.Helper.HardwareInfo;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Core.Processes;
@@ -40,8 +41,65 @@ IPyInstallationManager pyInstallationManager
     public override string Disclaimer =>
         "Prerequisite install may require admin privileges and a reboot. "
         + "Visual Studio Build Tools for C++ Desktop Development will be installed automatically. "
-        + "AMD GPUs under the RX 6800 may require additional manual setup.";
+        + "AMD GPUs under the RX 6800 may require additional manual setup. ";
     public override string LaunchCommand => Path.Combine("zluda", "zluda.exe");
+
+    public override List<LaunchOptionDefinition> LaunchOptions
+    {
+        get
+        {
+            var options = new List<LaunchOptionDefinition>
+            {
+                new()
+                {
+                    Name = "Cross Attention Method",
+                    Type = LaunchOptionType.Bool,
+                    InitialValue = "--use-quad-cross-attention",
+                    Options =
+                    [
+                        "--use-split-cross-attention",
+                        "--use-quad-cross-attention",
+                        "--use-pytorch-cross-attention",
+                        "--use-sage-attention",
+                    ],
+                },
+                new()
+                {
+                    Name = "Disable Async Offload",
+                    Type = LaunchOptionType.Bool,
+                    InitialValue = true,
+                    Options = ["--disable-async-offload"],
+                },
+                new()
+                {
+                    Name = "Disable Pinned Memory",
+                    Type = LaunchOptionType.Bool,
+                    InitialValue = true,
+                    Options = ["--disable-pinned-memory"],
+                },
+                new()
+                {
+                    Name = "Disable Smart Memory",
+                    Type = LaunchOptionType.Bool,
+                    InitialValue = false,
+                    Options = ["--disable-smart-memory"],
+                },
+                new()
+                {
+                    Name = "Disable Model/Node Caching",
+                    Type = LaunchOptionType.Bool,
+                    InitialValue = false,
+                    Options = ["--cache-none"],
+                },
+            };
+
+            options.AddRange(
+                base.LaunchOptions.Where(x => x.Name != "Cross Attention Method")
+            );
+            return options;
+        }
+    }
+
     public override IEnumerable<TorchIndex> AvailableTorchIndices => [TorchIndex.Zluda];
 
     public override TorchIndex GetRecommendedTorchVersion() => TorchIndex.Zluda;

StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

@@ -31,9 +31,9 @@ IPyInstallationManager pyInstallationManager
     public override string Name => "automatic";
     public override string DisplayName { get; set; } = "SD.Next";
     public override string Author => "vladmandic";
-    public override string LicenseType => "AGPL-3.0";
-    public override string LicenseUrl => "https://github.com/vladmandic/automatic/blob/master/LICENSE.txt";
-    public override string Blurb => "Stable Diffusion implementation with advanced features and modern UI";
+    public override string LicenseType => "Apache License 2.0";
+    public override string LicenseUrl => "https://github.com/vladmandic/sdnext/blob/master/LICENSE.txt";
+    public override string Blurb => "SD.Next: All-in-one WebUI for AI generative image and video creation";
     public override string LaunchCommand => "launch.py";
 
     public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/vladautomatic/preview.webp");