Merge pull request LykosAI#929 from ionite34/backport/main/pr-924

[dev to main] backport: Comfy zluda (924)

Author: mohnjiles

Directory.Packages.props

@@ -103,7 +103,7 @@
     <PackageVersion Include="Dock.Model.Avalonia" Version="11.2.0" />
     <PackageVersion Include="Dock.Serializer" Version="11.2.0" />
     <PackageVersion Include="FluentAvalonia.BreadcrumbBar" Version="2.0.2" />
-    <PackageVersion Include="FluentAvaloniaUI" Version="2.1.0" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="2.2.0" />
     <PackageVersion Include="FluentIcons.Avalonia" Version="1.1.249" />
     <PackageVersion Include="FluentIcons.Avalonia.Fluent" Version="1.1.249" />
     <PackageVersion Include="Markdown.Avalonia" Version="11.0.3-a1" />

StabilityMatrix.Avalonia/App.axaml.cs

@@ -450,8 +450,9 @@ internal static IServiceCollection ConfigureServices()
             // if (string.IsNullOrWhiteSpace(githubApiKey))
             //     return client;
             //
-            // client.Credentials =
-            //     new Credentials("");
+            // client.Credentials = new Credentials(
+            //     ""
+            // );
             return client;
         });
 

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -45,6 +45,8 @@ IPyRunner pyRunner
 
     private const string CppBuildToolsUrl = "https://aka.ms/vs/17/release/vs_BuildTools.exe";
 
+    private const string HipSdkDownloadUrl = "https://cdn.lykos.ai/AMD-HIP-SDK.exe";
+
     private string HomeDir => settingsManager.LibraryDir;
 
     private string VcRedistDownloadPath => Path.Combine(HomeDir, "vcredist.x64.exe");
@@ -83,6 +85,11 @@ IPyRunner pyRunner
             "BuildTools"
         );
 
+    private string HipSdkDownloadPath => Path.Combine(AssetsDir, "AMD-HIP-SDK.exe");
+
+    private string HipInstalledPath =>
+        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "AMD", "ROCm", "5.7");
+
     public string GitBinPath => Path.Combine(PortableGitInstallDir, "bin");
     public bool IsPythonInstalled => File.Exists(PythonDllPath);
 
@@ -192,6 +199,11 @@ public async Task InstallPackageRequirements(
         {
             await InstallVcBuildToolsIfNecessary(progress);
         }
+
+        if (prerequisites.Contains(PackagePrerequisite.HipSdk))
+        {
+            await InstallHipSdkIfNecessary(progress);
+        }
     }
 
     public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = null)
@@ -202,6 +214,7 @@ public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = nu
         await InstallGitIfNecessary(progress);
         await InstallNodeIfNecessary(progress);
         await InstallVcBuildToolsIfNecessary(progress);
+        await InstallHipSdkIfNecessary(progress);
     }
 
     public async Task UnpackResourcesIfNecessary(IProgress<ProgressReport>? progress = null)
@@ -553,6 +566,39 @@ await downloadService.DownloadToFileAsync(
         await process.WaitForExitAsync();
     }
 
+    [SupportedOSPlatform("windows")]
+    public async Task InstallHipSdkIfNecessary(IProgress<ProgressReport>? progress = null)
+    {
+        if (Directory.Exists(HipInstalledPath))
+            return;
+
+        await downloadService.DownloadToFileAsync(HipSdkDownloadUrl, HipSdkDownloadPath, progress: progress);
+        Logger.Info("Downloaded & installing HIP SDK");
+
+        progress?.Report(
+            new ProgressReport(
+                progress: 0.5f,
+                isIndeterminate: true,
+                type: ProgressType.Generic,
+                message: "Installing HIP SDK, this may take a few minutes..."
+            )
+        );
+
+        var info = new ProcessStartInfo
+        {
+            FileName = HipSdkDownloadPath,
+            Arguments = "-install -log hip_install.log",
+            UseShellExecute = true,
+            CreateNoWindow = true,
+            Verb = "runas"
+        };
+
+        if (Process.Start(info) is { } process)
+        {
+            await process.WaitForExitAsync();
+        }
+    }
+
     public async Task<Process> RunDotnet(
         ProcessArgs args,
         string? workingDirectory = null,

StabilityMatrix.Core/Helper/Factory/PackageFactory.cs

@@ -94,6 +94,8 @@ public BasePackage GetNewBasePackage(InstalledPackage installedPackage)
                 => new SimpleSDXL(githubApiCache, settingsManager, downloadService, prerequisiteHelper),
             "Cogstudio"
                 => new Cogstudio(githubApiCache, settingsManager, downloadService, prerequisiteHelper),
+            "ComfyUI-Zluda"
+                => new ComfyZluda(githubApiCache, settingsManager, downloadService, prerequisiteHelper),
             _ => throw new ArgumentOutOfRangeException(nameof(installedPackage))
         };
     }

StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs

@@ -264,7 +264,7 @@ public static bool HasAmdGpu()
     public static bool PreferRocm() => !HasNvidiaGpu() && HasAmdGpu() && Compat.IsLinux;
 
     // Set DirectML for default if AMD and Windows
-    public static bool PreferDirectML() => !HasNvidiaGpu() && HasAmdGpu() && Compat.IsWindows;
+    public static bool PreferDirectMLOrZluda() => !HasNvidiaGpu() && HasAmdGpu() && Compat.IsWindows;
 
     private static readonly Lazy<bool> IsMemoryInfoAvailableLazy = new(() => TryGetMemoryInfo(out _));
     public static bool IsMemoryInfoAvailable => IsMemoryInfoAvailableLazy.Value;

StabilityMatrix.Core/Models/PackagePrerequisite.cs

@@ -5,6 +5,7 @@ public enum PackagePrerequisite
     Python310,
     VcRedist,
     Git,
+    HipSdk,
     Node,
     Dotnet,
     Tkinter,

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -162,7 +162,7 @@ IPrerequisiteHelper prerequisiteHelper
                 Type = LaunchOptionType.Bool,
                 Description = "Do not switch the model to 16-bit floats",
                 InitialValue =
-                    HardwareHelper.PreferRocm() || HardwareHelper.PreferDirectML() || Compat.IsMacOS,
+                    HardwareHelper.PreferRocm() || HardwareHelper.PreferDirectMLOrZluda() || Compat.IsMacOS,
                 Options = ["--no-half"]
             },
             new()

StabilityMatrix.Core/Models/Packages/BasePackage.cs

@@ -147,7 +147,7 @@ public virtual TorchIndex GetRecommendedTorchVersion()
 
         var preferDirectMl =
             Compat.IsWindows
-            && (SettingsManager.Settings.PreferredGpu?.IsAmd ?? HardwareHelper.PreferDirectML());
+            && (SettingsManager.Settings.PreferredGpu?.IsAmd ?? HardwareHelper.PreferDirectMLOrZluda());
         if (AvailableTorchIndices.Contains(TorchIndex.DirectMl) && preferDirectMl)
         {
             return TorchIndex.DirectMl;

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -103,6 +103,15 @@ IPrerequisiteHelper prerequisiteHelper
                 Options = ["--highvram", "--normalvram", "--lowvram", "--novram"]
             },
             new LaunchOptionDefinition
+            {
+                Name = "Reserve VRAM",
+                Type = LaunchOptionType.String,
+                InitialValue = Compat.IsWindows && HardwareHelper.HasAmdGpu() ? "0.9" : null,
+                Description =
+                    "Sets the amount of VRAM (in GB) you want to reserve for use by your OS/other software",
+                Options = ["--reserve-vram"]
+            },
+            new LaunchOptionDefinition
             {
                 Name = "Preview Method",
                 Type = LaunchOptionType.Bool,
@@ -113,7 +122,7 @@ IPrerequisiteHelper prerequisiteHelper
             {
                 Name = "Enable DirectML",
                 Type = LaunchOptionType.Bool,
-                InitialValue = HardwareHelper.PreferDirectML(),
+                InitialValue = HardwareHelper.PreferDirectMLOrZluda() && this is not ComfyZluda,
                 Options = ["--directml"]
             },
             new LaunchOptionDefinition
@@ -128,7 +137,11 @@ IPrerequisiteHelper prerequisiteHelper
             {
                 Name = "Cross Attention Method",
                 Type = LaunchOptionType.Bool,
-                InitialValue = Compat.IsMacOS ? "--use-pytorch-cross-attention" : null,
+                InitialValue = Compat.IsMacOS
+                    ? "--use-pytorch-cross-attention"
+                    : (Compat.IsWindows && HardwareHelper.HasAmdGpu())
+                        ? "--use-quad-cross-attention"
+                        : null,
                 Options =
                 [
                     "--use-split-cross-attention",