Skip to content

Commit 29b2a11

Browse files
authored
fix merge conflict
1 parent f6513d4 commit 29b2a11

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,6 @@ public override async Task InstallPackage(
149149
var isBlackwell =
150150
SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu();
151151
var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
152-
<<<<<<< HEAD
153-
if (torchVersion is TorchIndex.DirectMl)
154-
{
155-
pipArgs = pipArgs.WithTorchDirectML();
156-
=======
157152

158153
if (isBlackwell && torchVersion is TorchIndex.Cuda)
159154
{
@@ -164,7 +159,6 @@ public override async Task InstallPackage(
164159
.AddArg(
165160
"https://huggingface.co/w-e-w/torch-2.6.0-cu128.nv/resolve/main/torchvision-0.20.0a0%2Bcu128.nv-cp310-cp310-win_amd64.whl"
166161
);
167-
>>>>>>> 17f068b3 (Merge pull request #993 from ionite34/fixes-n-stuf)
168162
}
169163
else
170164
{

0 commit comments

Comments
 (0)