refactor: remove static ROCm profile forwarders, add TorchIndex-aware helper methods

NeuralFault · NeuralFault · commit 21b6732343f5 · 2026-06-01T05:00:09.000-04:00
- Remove static forwarder methods (GetCompatibility, HasSupport, ShouldApplyLaunchEnvironment/ShouldUseWindowsNativeInstall, BuildLaunchEnvironment, GetLaunchNoticeLines) from InvokeAiWindowsRocmProfile and ReforgeWindowsRocmProfile
- Add ShouldApplyWindowsLaunchEnvironment(TorchIndex) and GetWindowsLaunchNoticeLines(TorchIndex) to IRocmPackageHelper and RocmPackageHelper; make no-arg overload private
- Update InvokeAI and Reforge call sites to use IRocmPackageHelper directly
- Migrate ComfyUI.EmitWindowsRocmLaunchNotice to use GetWindowsLaunchNoticeLines(TorchIndex), removing ShouldShowWindowsRocmLaunchNotice
diff --git a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
@@ -654,24 +654,13 @@ private void EmitWindowsRocmLaunchNotice(
         Action<ProcessOutput>? onConsoleOutput
     )
     {
-        if (!ShouldShowWindowsRocmLaunchNotice(installedPackage))
-            return;
-
-        foreach (var line in rocmPackageHelper.GetWindowsLaunchNoticeLines())
+        var torchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();
+        foreach (var line in rocmPackageHelper.GetWindowsLaunchNoticeLines(torchIndex))
         {
             onConsoleOutput?.Invoke(ProcessOutput.FromStdOutLine($"{line}{Environment.NewLine}"));
         }
     }
 
-    private bool ShouldShowWindowsRocmLaunchNotice(InstalledPackage installedPackage)
-    {
-        if (!Compat.IsWindows || !HasWindowsRocmSupport())
-            return false;
-
-        var torchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();
-        return torchIndex == TorchIndex.Rocm;
-    }
-
     protected ProcessArgs NormalizeLaunchArguments(
         InstalledPackage installedPackage,
         ProcessArgs fallbackArguments
diff --git a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
@@ -120,7 +120,7 @@ public override TorchIndex GetRecommendedTorchVersion()
             return TorchIndex.Mps;
         }
 
-        if (Compat.IsWindows && InvokeAiWindowsRocmProfile.HasSupport(rocmPackageHelper))
+        if (Compat.IsWindows && rocmPackageHelper.GetCompatibility().IsCompatible)
         {
             return TorchIndex.Rocm;
         }
@@ -235,7 +235,7 @@ public override async Task InstallPackage(
         var isSupportedWindowsRocmInstall =
             Compat.IsWindows
             && torchVersion == TorchIndex.Rocm
-            && InvokeAiWindowsRocmProfile.HasSupport(rocmPackageHelper);
+            && rocmPackageHelper.GetCompatibility().IsCompatible;
         var isLegacyNvidiaGpu =
             SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu();
         var fallbackIndex = torchVersion switch
@@ -662,17 +662,17 @@ InstalledPackage installedPackage
         env = GetEnvVars(env, installPath);
 
         var selectedTorchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();
-        if (!InvokeAiWindowsRocmProfile.ShouldApplyLaunchEnvironment(rocmPackageHelper, selectedTorchIndex))
+        if (!rocmPackageHelper.ShouldApplyWindowsLaunchEnvironment(selectedTorchIndex))
         {
             return env;
         }
 
-        return env.SetItems(InvokeAiWindowsRocmProfile.BuildLaunchEnvironment(rocmPackageHelper));
+        return env.SetItems(rocmPackageHelper.BuildLaunchEnvironment(InvokeAiWindowsRocmProfile.Profile));
     }
 
     private IReadOnlyList<string> GetLaunchNoticeLines(InstalledPackage installedPackage)
     {
         var selectedTorchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();
-        return InvokeAiWindowsRocmProfile.GetLaunchNoticeLines(rocmPackageHelper, selectedTorchIndex);
+        return rocmPackageHelper.GetWindowsLaunchNoticeLines(selectedTorchIndex);
     }
 }
diff --git a/StabilityMatrix.Core/Models/Packages/Reforge.cs b/StabilityMatrix.Core/Models/Packages/Reforge.cs
@@ -82,7 +82,7 @@ public override TorchIndex GetRecommendedTorchVersion()
     {
         var preferRocm =
             (Compat.IsLinux && (SettingsManager.Settings.PreferredGpu?.IsAmd ?? HardwareHelper.PreferRocm()))
-            || ReforgeWindowsRocmProfile.HasSupport(rocmPackageHelper);
+            || rocmPackageHelper.GetCompatibility().IsCompatible;
 
         if (AvailableTorchIndices.Contains(TorchIndex.Rocm) && preferRocm)
         {
@@ -103,7 +103,7 @@ public override async Task InstallPackage(
     {
         var torchIndex = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
 
-        if (!ReforgeWindowsRocmProfile.ShouldUseWindowsNativeInstall(rocmPackageHelper, torchIndex))
+        if (!rocmPackageHelper.ShouldApplyWindowsLaunchEnvironment(torchIndex))
         {
             await base.InstallPackage(
                     installLocation,
@@ -162,17 +162,17 @@ InstalledPackage installedPackage
         env = base.GetEnvVars(env, installedPackage);
         env = env.SetItem("STABLE_DIFFUSION_REPO", StableDiffusionRepoOverride);
 
-        if (!ReforgeWindowsRocmProfile.ShouldUseWindowsNativeInstall(rocmPackageHelper, selectedTorchIndex))
+        if (!rocmPackageHelper.ShouldApplyWindowsLaunchEnvironment(selectedTorchIndex))
         {
             return env;
         }
 
-        return env.SetItems(ReforgeWindowsRocmProfile.BuildLaunchEnvironment(rocmPackageHelper));
+        return env.SetItems(rocmPackageHelper.BuildLaunchEnvironment(ReforgeWindowsRocmProfile.Profile));
     }
 
     protected override IReadOnlyList<string> GetLaunchNoticeLines(InstalledPackage installedPackage)
     {
         var selectedTorchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();
-        return ReforgeWindowsRocmProfile.GetLaunchNoticeLines(rocmPackageHelper, selectedTorchIndex);
+        return rocmPackageHelper.GetWindowsLaunchNoticeLines(selectedTorchIndex);
     }
 }
diff --git a/StabilityMatrix.Core/Models/Rocm/InvokeAiWindowsRocmProfile.cs b/StabilityMatrix.Core/Models/Rocm/InvokeAiWindowsRocmProfile.cs
@@ -1,7 +1,5 @@
-using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Packages;
 using StabilityMatrix.Core.Python;
-using StabilityMatrix.Core.Services.Rocm;
 
 namespace StabilityMatrix.Core.Models.Rocm;
 
@@ -37,44 +35,4 @@ public static RocmPackageProfile CreateInstallProfile(PyVersion pyVersion)
             InstallConfig = new PipInstallConfig { PostTorchInstallPipArgs = [TritonWindowsPackage] },
         };
     }
-
-    public static RocmCompatibilityResult GetCompatibility(IRocmPackageHelper rocmPackageHelper)
-    {
-        return rocmPackageHelper.GetCompatibility();
-    }
-
-    public static bool HasSupport(IRocmPackageHelper rocmPackageHelper)
-    {
-        return GetCompatibility(rocmPackageHelper).IsCompatible;
-    }
-
-    public static bool ShouldApplyLaunchEnvironment(
-        IRocmPackageHelper rocmPackageHelper,
-        TorchIndex selectedTorchIndex
-    )
-    {
-        if (!Compat.IsWindows || selectedTorchIndex != TorchIndex.Rocm)
-        {
-            return false;
-        }
-
-        return GetCompatibility(rocmPackageHelper).IsCompatible;
-    }
-
-    public static IReadOnlyDictionary<string, string> BuildLaunchEnvironment(
-        IRocmPackageHelper rocmPackageHelper
-    )
-    {
-        return rocmPackageHelper.BuildLaunchEnvironment(Profile);
-    }
-
-    public static IReadOnlyList<string> GetLaunchNoticeLines(
-        IRocmPackageHelper rocmPackageHelper,
-        TorchIndex selectedTorchIndex
-    )
-    {
-        return ShouldApplyLaunchEnvironment(rocmPackageHelper, selectedTorchIndex)
-            ? rocmPackageHelper.GetWindowsLaunchNoticeLines()
-            : [];
-    }
 }
diff --git a/StabilityMatrix.Core/Models/Rocm/ReforgeWindowsRocmProfile.cs b/StabilityMatrix.Core/Models/Rocm/ReforgeWindowsRocmProfile.cs
@@ -47,30 +47,12 @@ public static RocmPackageProfile CreateProfile(IEnumerable<string> requirementsF
         };
     }
 
-    public static RocmCompatibilityResult GetCompatibility(IRocmPackageHelper rocmPackageHelper)
-    {
-        return rocmPackageHelper.GetCompatibility();
-    }
-
-    public static bool HasSupport(IRocmPackageHelper rocmPackageHelper)
-    {
-        return GetCompatibility(rocmPackageHelper).IsCompatible;
-    }
-
-    public static bool ShouldUseWindowsNativeInstall(
-        IRocmPackageHelper rocmPackageHelper,
-        TorchIndex selectedTorchIndex
-    )
-    {
-        return Compat.IsWindows && selectedTorchIndex == TorchIndex.Rocm && HasSupport(rocmPackageHelper);
-    }
-
     public static void ApplyWindowsRocmLaunchDefaults(
         List<LaunchOptionDefinition> launchOptions,
         IRocmPackageHelper rocmPackageHelper
     )
     {
-        if (!(Compat.IsWindows && HasSupport(rocmPackageHelper)))
+        if (!(Compat.IsWindows && rocmPackageHelper.GetCompatibility().IsCompatible))
         {
             return;
         }
@@ -89,7 +71,7 @@ IRocmPackageHelper rocmPackageHelper
 
     public static string? GetPreferredCrossAttentionArgument(IRocmPackageHelper rocmPackageHelper)
     {
-        var compatibility = GetCompatibility(rocmPackageHelper);
+        var compatibility = rocmPackageHelper.GetCompatibility();
         if (!compatibility.IsCompatible)
         {
             return null;
@@ -99,21 +81,4 @@ IRocmPackageHelper rocmPackageHelper
             ? "--attention-quad"
             : "--attention-pytorch";
     }
-
-    public static IReadOnlyDictionary<string, string> BuildLaunchEnvironment(
-        IRocmPackageHelper rocmPackageHelper
-    )
-    {
-        return rocmPackageHelper.BuildLaunchEnvironment(Profile);
-    }
-
-    public static IReadOnlyList<string> GetLaunchNoticeLines(
-        IRocmPackageHelper rocmPackageHelper,
-        TorchIndex selectedTorchIndex
-    )
-    {
-        return ShouldUseWindowsNativeInstall(rocmPackageHelper, selectedTorchIndex)
-            ? rocmPackageHelper.GetWindowsLaunchNoticeLines()
-            : [];
-    }
 }
diff --git a/StabilityMatrix.Core/Services/Rocm/IRocmPackageHelper.cs b/StabilityMatrix.Core/Services/Rocm/IRocmPackageHelper.cs
@@ -23,9 +23,16 @@ public interface IRocmPackageHelper
     IReadOnlyDictionary<string, string> BuildLaunchEnvironment(RocmPackageProfile profile);
 
     /// <summary>
-    /// Returns shared Windows ROCm launch notice lines for helper-managed packages.
+    /// Returns shared Windows ROCm launch notice lines if the current machine and selected torch index
+    /// qualify for the Windows native ROCm launch environment; otherwise returns an empty list.
     /// </summary>
-    IReadOnlyList<string> GetWindowsLaunchNoticeLines();
+    IReadOnlyList<string> GetWindowsLaunchNoticeLines(TorchIndex selectedTorchIndex);
+
+    /// <summary>
+    /// Returns true when the current machine is Windows, the selected torch index is ROCm,
+    /// and the machine is compatible with Windows native ROCm.
+    /// </summary>
+    bool ShouldApplyWindowsLaunchEnvironment(TorchIndex selectedTorchIndex);
 
     /// <summary>
     /// Ensures a usable Windows ROCm SDK devel package is installed from the ROCm multi-arch index,
diff --git a/StabilityMatrix.Core/Services/Rocm/RocmPackageHelper.cs b/StabilityMatrix.Core/Services/Rocm/RocmPackageHelper.cs
@@ -101,14 +101,25 @@ public IReadOnlyDictionary<string, string> BuildLaunchEnvironment(RocmPackagePro
         return mergedEnvironment;
     }
 
-    /// <summary>
-    /// Returns the shared informational notice lines shown when launching Windows ROCm packages.
-    /// </summary>
-    public IReadOnlyList<string> GetWindowsLaunchNoticeLines()
+    private IReadOnlyList<string> GetWindowsLaunchNoticeLines()
     {
         return WindowsLaunchNoticeLines;
     }
 
+    /// <inheritdoc />
+    public bool ShouldApplyWindowsLaunchEnvironment(TorchIndex selectedTorchIndex)
+    {
+        if (!Compat.IsWindows || selectedTorchIndex != TorchIndex.Rocm)
+            return false;
+        return GetCompatibility().IsCompatible;
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<string> GetWindowsLaunchNoticeLines(TorchIndex selectedTorchIndex)
+    {
+        return ShouldApplyWindowsLaunchEnvironment(selectedTorchIndex) ? GetWindowsLaunchNoticeLines() : [];
+    }
+
     /// <summary>
     /// Ensures <c>rocm-sdk-devel</c> is installed from the ROCm multi-arch index.
     /// It prefers a build whose date token matches the installed ROCm torch build and falls back to the latest available build when no exact match is available.

Original file line number	Diff line number	Diff line change
`@@ -654,24 +654,13 @@ private void EmitWindowsRocmLaunchNotice(`
`654`	`654`	`Action<ProcessOutput>? onConsoleOutput`
`655`	`655`	`)`
`656`	`656`	`{`
`657`		`- if (!ShouldShowWindowsRocmLaunchNotice(installedPackage))`
`658`		`- return;`
`659`		`-`
`660`		`- foreach (var line in rocmPackageHelper.GetWindowsLaunchNoticeLines())`
	`657`	`+ var torchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();`
	`658`	`+ foreach (var line in rocmPackageHelper.GetWindowsLaunchNoticeLines(torchIndex))`
`661`	`659`	`{`
`662`	`660`	`onConsoleOutput?.Invoke(ProcessOutput.FromStdOutLine($"{line}{Environment.NewLine}"));`
`663`	`661`	`}`
`664`	`662`	`}`
`665`	`663`
`666`		`- private bool ShouldShowWindowsRocmLaunchNotice(InstalledPackage installedPackage)`
`667`		`- {`
`668`		`- if (!Compat.IsWindows \|\| !HasWindowsRocmSupport())`
`669`		`- return false;`
`670`		`-`
`671`		`- var torchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();`
`672`		`- return torchIndex == TorchIndex.Rocm;`
`673`		`- }`
`674`		`-`
`675`	`664`	`protected ProcessArgs NormalizeLaunchArguments(`
`676`	`665`	`InstalledPackage installedPackage,`
`677`	`666`	`ProcessArgs fallbackArguments`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public override TorchIndex GetRecommendedTorchVersion()`
`120`	`120`	`return TorchIndex.Mps;`
`121`	`121`	`}`
`122`	`122`
`123`		`- if (Compat.IsWindows && InvokeAiWindowsRocmProfile.HasSupport(rocmPackageHelper))`
	`123`	`+ if (Compat.IsWindows && rocmPackageHelper.GetCompatibility().IsCompatible)`
`124`	`124`	`{`
`125`	`125`	`return TorchIndex.Rocm;`
`126`	`126`	`}`
`@@ -235,7 +235,7 @@ public override async Task InstallPackage(`
`235`	`235`	`var isSupportedWindowsRocmInstall =`
`236`	`236`	`Compat.IsWindows`
`237`	`237`	`&& torchVersion == TorchIndex.Rocm`
`238`		`- && InvokeAiWindowsRocmProfile.HasSupport(rocmPackageHelper);`
	`238`	`+ && rocmPackageHelper.GetCompatibility().IsCompatible;`
`239`	`239`	`var isLegacyNvidiaGpu =`
`240`	`240`	`SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu();`
`241`	`241`	`var fallbackIndex = torchVersion switch`
`@@ -662,17 +662,17 @@ InstalledPackage installedPackage`
`662`	`662`	`env = GetEnvVars(env, installPath);`
`663`	`663`
`664`	`664`	`var selectedTorchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();`
`665`		`- if (!InvokeAiWindowsRocmProfile.ShouldApplyLaunchEnvironment(rocmPackageHelper, selectedTorchIndex))`
	`665`	`+ if (!rocmPackageHelper.ShouldApplyWindowsLaunchEnvironment(selectedTorchIndex))`
`666`	`666`	`{`
`667`	`667`	`return env;`
`668`	`668`	`}`
`669`	`669`
`670`		`- return env.SetItems(InvokeAiWindowsRocmProfile.BuildLaunchEnvironment(rocmPackageHelper));`
	`670`	`+ return env.SetItems(rocmPackageHelper.BuildLaunchEnvironment(InvokeAiWindowsRocmProfile.Profile));`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`private IReadOnlyList<string> GetLaunchNoticeLines(InstalledPackage installedPackage)`
`674`	`674`	`{`
`675`	`675`	`var selectedTorchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();`
`676`		`- return InvokeAiWindowsRocmProfile.GetLaunchNoticeLines(rocmPackageHelper, selectedTorchIndex);`
	`676`	`+ return rocmPackageHelper.GetWindowsLaunchNoticeLines(selectedTorchIndex);`
`677`	`677`	`}`
`678`	`678`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public override TorchIndex GetRecommendedTorchVersion()`
`82`	`82`	`{`
`83`	`83`	`var preferRocm =`
`84`	`84`	`(Compat.IsLinux && (SettingsManager.Settings.PreferredGpu?.IsAmd ?? HardwareHelper.PreferRocm()))`
`85`		`- \|\| ReforgeWindowsRocmProfile.HasSupport(rocmPackageHelper);`
	`85`	`+ \|\| rocmPackageHelper.GetCompatibility().IsCompatible;`
`86`	`86`
`87`	`87`	`if (AvailableTorchIndices.Contains(TorchIndex.Rocm) && preferRocm)`
`88`	`88`	`{`
`@@ -103,7 +103,7 @@ public override async Task InstallPackage(`
`103`	`103`	`{`
`104`	`104`	`var torchIndex = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();`
`105`	`105`
`106`		`- if (!ReforgeWindowsRocmProfile.ShouldUseWindowsNativeInstall(rocmPackageHelper, torchIndex))`
	`106`	`+ if (!rocmPackageHelper.ShouldApplyWindowsLaunchEnvironment(torchIndex))`
`107`	`107`	`{`
`108`	`108`	`await base.InstallPackage(`
`109`	`109`	`installLocation,`
`@@ -162,17 +162,17 @@ InstalledPackage installedPackage`
`162`	`162`	`env = base.GetEnvVars(env, installedPackage);`
`163`	`163`	`env = env.SetItem("STABLE_DIFFUSION_REPO", StableDiffusionRepoOverride);`
`164`	`164`
`165`		`- if (!ReforgeWindowsRocmProfile.ShouldUseWindowsNativeInstall(rocmPackageHelper, selectedTorchIndex))`
	`165`	`+ if (!rocmPackageHelper.ShouldApplyWindowsLaunchEnvironment(selectedTorchIndex))`
`166`	`166`	`{`
`167`	`167`	`return env;`
`168`	`168`	`}`
`169`	`169`
`170`		`- return env.SetItems(ReforgeWindowsRocmProfile.BuildLaunchEnvironment(rocmPackageHelper));`
	`170`	`+ return env.SetItems(rocmPackageHelper.BuildLaunchEnvironment(ReforgeWindowsRocmProfile.Profile));`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`protected override IReadOnlyList<string> GetLaunchNoticeLines(InstalledPackage installedPackage)`
`174`	`174`	`{`
`175`	`175`	`var selectedTorchIndex = installedPackage.PreferredTorchIndex ?? GetRecommendedTorchVersion();`
`176`		`- return ReforgeWindowsRocmProfile.GetLaunchNoticeLines(rocmPackageHelper, selectedTorchIndex);`
	`176`	`+ return rocmPackageHelper.GetWindowsLaunchNoticeLines(selectedTorchIndex);`
`177`	`177`	`}`
`178`	`178`	`}`