Skip to content

Commit 7480d06

Browse files
authored
fix merge conflict in InstallSageAttentionStep
1 parent 334fdf1 commit 7480d06

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

StabilityMatrix.Core/Models/PackageModification/InstallSageAttentionStep.cs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@ public async Task ExecuteAsync(IProgress<ProgressReport>? progress = null)
4040

4141
var torchInfo = await venvRunner.PipShow("torch").ConfigureAwait(false);
4242
var sageWheelUrl = string.Empty;
43-
<<<<<<< HEAD
44-
=======
45-
var shortPythonVersionString = pyVersion.Minor switch
46-
{
47-
10 => "cp310",
48-
11 => "cp311",
49-
12 => "cp312",
50-
_ => throw new ArgumentOutOfRangeException("Invalid Python version"),
51-
};
52-
>>>>>>> 8a35e055 (Merge pull request #1101 from ionite34/moar-fixes-n-stuff)
5343

5444
if (torchInfo == null)
5545
{
@@ -73,12 +63,12 @@ public async Task ExecuteAsync(IProgress<ProgressReport>? progress = null)
7363
else if (torchInfo.Version.Contains("2.7.1") && torchInfo.Version.Contains("cu128"))
7464
{
7565
sageWheelUrl =
76-
$"https://github.com/woct0rdho/SageAttention/releases/download/v2.2.0-windows/sageattention-2.2.0+cu128torch2.7.1-{shortPythonVersionString}-{shortPythonVersionString}-win_amd64.whl";
66+
$"https://github.com/woct0rdho/SageAttention/releases/download/v2.2.0-windows/sageattention-2.2.0+cu128torch2.7.1-cp310-cp310-win_amd64.whl";
7767
}
7868
else if (torchInfo.Version.Contains("2.8.0") && torchInfo.Version.Contains("cu128"))
7969
{
8070
sageWheelUrl =
81-
$"https://github.com/woct0rdho/SageAttention/releases/download/v2.2.0-windows/sageattention-2.2.0+cu128torch2.8.0-{shortPythonVersionString}-{shortPythonVersionString}-win_amd64.whl";
71+
$"https://github.com/woct0rdho/SageAttention/releases/download/v2.2.0-windows/sageattention-2.2.0+cu128torch2.8.0-cp310-cp310-win_amd64.whl";
8272
}
8373

8474
var pipArgs = new PipInstallArgs();

0 commit comments

Comments
 (0)