Skip to content

Commit 6eaf499

Browse files
committed
Re-enabled automatic installation of VSBuild tools and set required optionals for ComfyUI-Zluda install
1 parent 81e0936 commit 6eaf499

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,10 @@ public async Task InstallPackageRequirements(
334334
await InstallTkinterIfNecessary(PyInstallationManager.Python_3_10_11, progress);
335335
}
336336

337-
// if (prerequisites.Contains(PackagePrerequisite.VcBuildTools))
338-
// {
339-
// await InstallVcBuildToolsIfNecessary(progress);
340-
// }
337+
if (prerequisites.Contains(PackagePrerequisite.VcBuildTools))
338+
{
339+
await InstallVcBuildToolsIfNecessary(progress);
340+
}
341341
}
342342

343343
public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = null)
@@ -782,7 +782,7 @@ await downloadService.DownloadToFileAsync(
782782

783783
var process = ProcessRunner.StartAnsiProcess(
784784
VcBuildToolsDownloadPath,
785-
"--quiet --wait --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended;includeOptional",
785+
"--quiet --wait --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.CMake.Project --add Microsoft.VisualStudio.Component.VC.Llvm.Clang --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Llvm.Clang --add Microsoft.VisualStudio.Component.Windows10SDK.18362 --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.Windows10SDK.20348 --add Microsoft.VisualStudio.Component.Windows11SDK.22000 --add Microsoft.VisualStudio.Component.Windows11SDK.22621 --add Microsoft.VisualStudio.Component.Windows11SDK.26100",
786786
outputDataReceived: output =>
787787
progress?.Report(
788788
new ProgressReport(

StabilityMatrix.Core/Models/Packages/ComfyZluda.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ IPyInstallationManager pyInstallationManager
3939
"Windows-only version of ComfyUI which uses ZLUDA to get better performance with AMD GPUs.";
4040
public override string Disclaimer =>
4141
"Prerequisite install may require admin privileges and a reboot. "
42+
+ "Visual Studio Build Tools for C++ Desktop Development will be installed automatically."
4243
+ "AMD GPUs under the RX 6800 may require additional manual setup.";
4344
public override string LaunchCommand => Path.Combine("zluda", "zluda.exe");
4445
public override IEnumerable<TorchIndex> AvailableTorchIndices => [TorchIndex.Zluda];
@@ -52,11 +53,11 @@ IPyInstallationManager pyInstallationManager
5253
public override bool ShouldIgnoreReleases => true;
5354

5455
public override IEnumerable<PackagePrerequisite> Prerequisites =>
55-
base.Prerequisites.Concat([PackagePrerequisite.HipSdk]);
56+
base.Prerequisites.Concat([PackagePrerequisite.HipSdk, PackagePrerequisite.VcBuildTools]);
5657

5758
public override bool InstallRequiresAdmin => true;
5859
public override string AdminRequiredReason =>
59-
"HIP SDK installation and (if applicable) ROCmLibs patching requires admin privileges for accessing the HIP SDK files in the Program Files directory.";
60+
"HIP SDK and Visual Studio Build Tools installation, as well as (if applicable) ROCmLibs patching, require admin privileges for accessing files in the Program Files directory. This may take several minutes to complete.";
6061

6162
public override async Task InstallPackage(
6263
string installLocation,

0 commit comments

Comments
 (0)