Skip to content

Commit 0c8aa6e

Browse files
committed
address pr feedback
1 parent 545c5f5 commit 0c8aa6e

2 files changed

Lines changed: 19 additions & 10 deletions

File tree

StabilityMatrix.Core/Models/Packages/ForgeClassic.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Injectio.Attributes;
1+
using System.Text;
2+
using Injectio.Attributes;
23
using StabilityMatrix.Core.Helper;
34
using StabilityMatrix.Core.Helper.Cache;
45
using StabilityMatrix.Core.Helper.HardwareInfo;
@@ -156,10 +157,11 @@ public override async Task InstallPackage(
156157
progress?.Report(new ProgressReport(-1f, "Installing requirements...", isIndeterminate: true));
157158

158159
var requirements = new FilePath(installLocation, "requirements.txt");
159-
var requirementsContent = await requirements
160-
.ReadAllTextAsync(cancellationToken)
161-
.ConfigureAwait(false);
160+
var requirementsContentBuilder = new StringBuilder(
161+
await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false)
162+
);
162163

164+
// Collect all requirements.txt files from extensions-builtin subfolders
163165
var extensionsBuiltinDir = new DirectoryPath(installLocation, "extensions-builtin");
164166
if (extensionsBuiltinDir.Exists)
165167
{
@@ -170,12 +172,15 @@ public override async Task InstallPackage(
170172

171173
foreach (var requirementsFile in requirementsFiles)
172174
{
173-
requirementsContent += await requirementsFile
175+
var fileContent = await requirementsFile
174176
.ReadAllTextAsync(cancellationToken)
175177
.ConfigureAwait(false);
178+
requirementsContentBuilder.AppendLine(fileContent);
176179
}
177180
}
178181

182+
var requirementsContent = requirementsContentBuilder.ToString();
183+
179184
var isLegacyNvidia =
180185
SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu();
181186
var torchExtraIndex = isLegacyNvidia ? "cu126" : "cu128";

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Injectio.Attributes;
1+
using System.Text;
2+
using Injectio.Attributes;
23
using StabilityMatrix.Core.Helper;
34
using StabilityMatrix.Core.Helper.Cache;
45
using StabilityMatrix.Core.Helper.HardwareInfo;
@@ -163,9 +164,9 @@ public override async Task InstallPackage(
163164
progress?.Report(new ProgressReport(-1f, "Installing requirements...", isIndeterminate: true));
164165

165166
var requirements = new FilePath(installLocation, "requirements_versions.txt");
166-
var requirementsContent = await requirements
167-
.ReadAllTextAsync(cancellationToken)
168-
.ConfigureAwait(false);
167+
var requirementsContentBuilder = new StringBuilder(
168+
await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false)
169+
);
169170

170171
// Collect all requirements.txt files from extensions-builtin subfolders
171172
var extensionsBuiltinDir = new DirectoryPath(installLocation, "extensions-builtin");
@@ -178,12 +179,15 @@ public override async Task InstallPackage(
178179

179180
foreach (var requirementsFile in requirementsFiles)
180181
{
181-
requirementsContent += await requirementsFile
182+
var fileContent = await requirementsFile
182183
.ReadAllTextAsync(cancellationToken)
183184
.ConfigureAwait(false);
185+
requirementsContentBuilder.AppendLine(fileContent);
184186
}
185187
}
186188

189+
var requirementsContent = requirementsContentBuilder.ToString();
190+
187191
var pipArgs = new PipInstallArgs();
188192

189193
var isBlackwell =

0 commit comments

Comments
 (0)