Browse Source

Merge pull request #629 from ionite34/backport/main/pr-628

[main] Merge pull request #628 from ionite34/fix-comfyui-torch
pull/629/head
Ionite 6 months ago committed by GitHub
parent
commit
b199f5e5fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      CHANGELOG.md
  2. 2
      StabilityMatrix.Core/Models/Packages/A3WebUI.cs
  3. 3
      StabilityMatrix.Core/Models/Packages/ComfyUI.cs
  4. 2
      StabilityMatrix.Core/Models/Packages/SDWebForge.cs
  5. 2
      StabilityMatrix.Core/Models/Packages/StableDiffusionUx.cs

4
CHANGELOG.md

@ -5,6 +5,10 @@ All notable changes to Stability Matrix will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
## v2.10.3
### Fixed
- Fixed MPS install on macOS for ComfyUI, A1111, SDWebUI Forge, and SDWebUI UX causing torch to be upgraded to dev nightly versions and causing incompatibilities with dependencies.
## v2.10.2 ## v2.10.2
### Changed ### Changed
- Updated translations for Spanish and Turkish - Updated translations for Spanish and Turkish

2
StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@ -223,7 +223,7 @@ public class A3WebUI(
TorchVersion.Cpu => "cpu", TorchVersion.Cpu => "cpu",
TorchVersion.Cuda => "cu121", TorchVersion.Cuda => "cu121",
TorchVersion.Rocm => "rocm5.6", TorchVersion.Rocm => "rocm5.6",
TorchVersion.Mps => "nightly/cpu", TorchVersion.Mps => "cpu",
_ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null) _ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null)
} }
) )

3
StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@ -209,8 +209,7 @@ public class ComfyUI(
pipArgs = torchVersion switch pipArgs = torchVersion switch
{ {
TorchVersion.DirectMl => pipArgs.WithTorchDirectML(), TorchVersion.DirectMl => pipArgs.WithTorchDirectML(),
TorchVersion.Mps TorchVersion.Mps => pipArgs.WithTorch().WithTorchVision().WithTorchExtraIndex("cpu"),
=> pipArgs.AddArg("--pre").WithTorch().WithTorchVision().WithTorchExtraIndex("nightly/cpu"),
_ _
=> pipArgs => pipArgs
.AddArg("--upgrade") .AddArg("--upgrade")

2
StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@ -162,7 +162,7 @@ public class SDWebForge(
TorchVersion.Cpu => "cpu", TorchVersion.Cpu => "cpu",
TorchVersion.Cuda => "cu121", TorchVersion.Cuda => "cu121",
TorchVersion.Rocm => "rocm5.6", TorchVersion.Rocm => "rocm5.6",
TorchVersion.Mps => "nightly/cpu", TorchVersion.Mps => "cpu",
_ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null) _ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null)
} }
); );

2
StabilityMatrix.Core/Models/Packages/StableDiffusionUx.cs

@ -211,7 +211,7 @@ public class StableDiffusionUx(
new PipInstallArgs() new PipInstallArgs()
.WithTorch("==2.1.2") .WithTorch("==2.1.2")
.WithTorchVision() .WithTorchVision()
.WithTorchExtraIndex("nightly/cpu"), .WithTorchExtraIndex("cpu"),
onConsoleOutput onConsoleOutput
) )
.ConfigureAwait(false); .ConfigureAwait(false);

Loading…
Cancel
Save