Skip to content

Commit 66319fd

Browse files
authored
Merge pull request #1154 from ionite34/backport/main/pr-1152
[dev to main] backport: Fix SD.Next install using incorrect torch version (1152)
2 parents 9a7e665 + cd142ce commit 66319fd

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
1616
- Fixed [#1391](https://github.com/LykosAI/StabilityMatrix/issues/1391) - "Failed to parse" error when upgrading pip packages with extra index url
1717
- Fixed [#1401](https://github.com/LykosAI/StabilityMatrix/issues/1401) - "Python <version> was not found and/or failed to install" errors when path contains special characters
1818
- Fixed [#1403](https://github.com/LykosAI/StabilityMatrix/issues/1403) - Checkpoint Manager filters not being saved correctly
19+
- Fixed [#1411](https://github.com/LykosAI/StabilityMatrix/issues/1411) - SD.Next installs not using correct torch version
1920
- Fixed "cannot access local variable 'job' where it is not associated with a value" error when running jobs in AI Toolkit
2021
- Fixed Civitai browser not always returning at least 30 results when possible on initial search
2122
- Fixed model browser crashing when downloading a file with invalid characters in the name

StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,6 @@ IPyInstallationManager pyInstallationManager
223223
Options = ["--autolaunch"],
224224
},
225225
new()
226-
{
227-
Name = "Force use of Intel OneAPI XPU backend",
228-
Type = LaunchOptionType.Bool,
229-
Options = ["--use-ipex"],
230-
},
231-
new()
232226
{
233227
Name = "Use DirectML if no compatible GPU is detected",
234228
Type = LaunchOptionType.Bool,
@@ -310,15 +304,11 @@ public override async Task InstallPackage(
310304
);
311305
}
312306

313-
var requirementsContent = await new FilePath(installLocation, "requirements.txt")
314-
.ReadAllTextAsync(cancellationToken)
315-
.ConfigureAwait(false);
316-
var pipArgs = new PipInstallArgs("--upgrade").WithParsedFromRequirementsTxt(requirementsContent);
317-
if (installedPackage.PipOverrides != null)
307+
if (installedPackage.PipOverrides is { Count: > 0 })
318308
{
319-
pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
309+
var pipArgs = new PipInstallArgs().WithUserOverrides(installedPackage.PipOverrides);
310+
await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
320311
}
321-
await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
322312

323313
var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
324314
switch (torchVersion)

0 commit comments

Comments
 (0)