Skip to content

Commit bcbdd54

Browse files
authored
Merge pull request #796 from ionite34/backport/main/pr-795
[dev to main] backport: Fix RuinedFooocus requirements parsing & add CLIP link for forge/a1111 (795)
2 parents 82f142b + a5eff18 commit bcbdd54

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
99
### Added
1010
- Added Flux & AuraFlow types to CivitAI Browser
1111
- Added unet folder links for ComfyUI thanks to jeremydk
12+
- Added CLIP folder links for Forge
1213
### Changed
1314
- Updated Brazilian Portuguese translations thanks to thiagojramos
1415
### Fixed
15-
- Fixed CivitAI model browser not loading search results
16+
- Fixed [#840](https://github.com/LykosAI/StabilityMatrix/issues/840) - CivitAI model browser not loading search results
1617
- Fixed SwarmUI settings being overwritten on launch
17-
- Fixed Forge output folder links pointing to the incorrect folder
18+
- Fixed [#832](https://github.com/LykosAI/StabilityMatrix/issues/832) [#847](https://github.com/LykosAI/StabilityMatrix/issues/847) - Forge output folder links pointing to the incorrect folder
1819
- Fixed errors when downloading models with invalid characters in the file name
20+
- Fixed error when installing RuinedFooocus on nvidia GPUs
1921
### Supporters
2022
#### Pioneers
2123
- A big shoutout to our Pioneer-tier patrons: **tankfox**, **tanangular**, **Mr. Unknown**, and **Szir777**! We deeply appreciate your ongoing support!

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ IPrerequisiteHelper prerequisiteHelper
6767
[SharedFolderType.IpAdapter] = new[] { "models/controlnet/IpAdapter" },
6868
[SharedFolderType.InvokeIpAdapters15] = new[] { "models/controlnet/DiffusersIpAdapters" },
6969
[SharedFolderType.InvokeIpAdaptersXl] = new[] { "models/controlnet/DiffusersIpAdaptersXL" },
70-
[SharedFolderType.SVD] = new[] { "models/svd" }
70+
[SharedFolderType.SVD] = new[] { "models/svd" },
71+
[SharedFolderType.CLIP] = new[] { "models/text_encoder" }
7172
};
7273

7374
public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>

StabilityMatrix.Core/Models/Packages/RuinedFooocus.cs

+3-9
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,9 @@ public override async Task InstallPackage(
124124

125125
await venvRunner
126126
.PipInstall(
127-
new PipInstallArgs()
128-
.WithTorch("==2.1.2")
129-
.WithTorchVision("==0.16.2")
130-
.WithXFormers("==0.0.23.post1")
131-
.WithTorchExtraIndex("cu121")
132-
.WithParsedFromRequirementsTxt(
133-
await requirements.ReadAllTextAsync().ConfigureAwait(false),
134-
excludePattern: "torch"
135-
),
127+
new PipInstallArgs().WithParsedFromRequirementsTxt(
128+
await requirements.ReadAllTextAsync().ConfigureAwait(false)
129+
),
136130
onConsoleOutput
137131
)
138132
.ConfigureAwait(false);

0 commit comments

Comments
 (0)