diff --git a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs index 345505bf..305f56e7 100644 --- a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs +++ b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs @@ -219,19 +219,19 @@ public override async Task InstallPackage( .ConfigureAwait(false); var torchIndex = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion(); - var isBlackwell = + var isLegacyNvidia = torchIndex is TorchIndex.Cuda - && (SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu()); + && (SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu()); // 1. Configure the entire install process declaratively. var config = new PipInstallConfig { RequirementsFilePaths = ["requirements_versions.txt"], - TorchVersion = torchIndex == TorchIndex.Mps ? "==2.3.1" : (isBlackwell ? "" : "==2.1.2"), - TorchvisionVersion = torchIndex == TorchIndex.Mps ? "==0.18.1" : (isBlackwell ? "" : "==0.16.2"), - XformersVersion = isBlackwell ? " " : "==0.0.23.post1", - CudaIndex = isBlackwell ? "cu128" : "cu121", - RocmIndex = "rocm5.6", + TorchVersion = " ", + TorchvisionVersion = " ", + XformersVersion = isLegacyNvidia ? "==0.0.30" : " ", + CudaIndex = isLegacyNvidia ? "cu126" : "cu128", + RocmIndex = "rocm7.2", ExtraPipArgs = [ "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip", diff --git a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs index 215901ed..a4c34649 100644 --- a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs +++ b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs @@ -431,7 +431,7 @@ _ when gfxArch.StartsWith("gfx120") => "https://rocm.nightlies.amd.com/v2/gfx120 ExtraPipArgs = ["numpy<2"], TorchaudioVersion = " ", // Request torchaudio without a specific version CudaIndex = isLegacyNvidia ? "cu126" : "cu130", - RocmIndex = "rocm7.1", + RocmIndex = "rocm7.2", UpgradePackages = true, PostInstallPipArgs = ["typing-extensions>=4.15.0"], }; diff --git a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs index ed0226df..32080e0a 100644 --- a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs +++ b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs @@ -229,7 +229,7 @@ public override async Task InstallPackage( TorchIndex.Cpu when Compat.IsLinux => "https://download.pytorch.org/whl/cpu", TorchIndex.Cuda when isLegacyNvidiaGpu => "https://download.pytorch.org/whl/cu126", TorchIndex.Cuda => "https://download.pytorch.org/whl/cu128", - TorchIndex.Rocm => "https://download.pytorch.org/whl/rocm6.3", + TorchIndex.Rocm => "https://download.pytorch.org/whl/rocm7.2", _ => string.Empty, }; diff --git a/StabilityMatrix.Core/Models/Packages/PipInstallConfig.cs b/StabilityMatrix.Core/Models/Packages/PipInstallConfig.cs index 320915b2..f2f23add 100644 --- a/StabilityMatrix.Core/Models/Packages/PipInstallConfig.cs +++ b/StabilityMatrix.Core/Models/Packages/PipInstallConfig.cs @@ -15,7 +15,7 @@ public record PipInstallConfig public string TorchaudioVersion { get; init; } = ""; public string XformersVersion { get; init; } = ""; public string CudaIndex { get; init; } = "cu130"; - public string RocmIndex { get; init; } = "rocm6.4"; + public string RocmIndex { get; init; } = "rocm7.2"; public bool ForceReinstallTorch { get; init; } = true; public bool UpgradePackages { get; init; } = false; public bool SkipTorchInstall { get; init; } = false; diff --git a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs index d2675c43..dd542aaa 100644 --- a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs +++ b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs @@ -181,18 +181,18 @@ public override async Task InstallPackage( } var torchIndex = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion(); - var isBlackwell = + var isLegacyNvidia = torchIndex is TorchIndex.Cuda - && (SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu()); + && (SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu()); var config = new PipInstallConfig { PrePipInstallArgs = ["joblib"], RequirementsFilePaths = requirementsPaths, - TorchVersion = "", - TorchvisionVersion = "", - CudaIndex = isBlackwell ? "cu128" : "cu126", - RocmIndex = "rocm7.1", + TorchVersion = " ", + TorchvisionVersion = " ", + CudaIndex = isLegacyNvidia ? "cu126" : "cu128", + RocmIndex = "rocm7.2", ExtraPipArgs = [ "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",