From 6eaf499b8399adbc35a73e5c45b2d29b6bb34547 Mon Sep 17 00:00:00 2001 From: NeuralFault Date: Mon, 27 Oct 2025 18:49:06 -0400 Subject: [PATCH 1/3] Re-enabled automatic installation of VSBuild tools and set required optionals for ComfyUI-Zluda install --- .../Helpers/WindowsPrerequisiteHelper.cs | 10 +++++----- StabilityMatrix.Core/Models/Packages/ComfyZluda.cs | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs b/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs index db647119..1144898a 100644 --- a/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs +++ b/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs @@ -334,10 +334,10 @@ public async Task InstallPackageRequirements( await InstallTkinterIfNecessary(PyInstallationManager.Python_3_10_11, progress); } - // if (prerequisites.Contains(PackagePrerequisite.VcBuildTools)) - // { - // await InstallVcBuildToolsIfNecessary(progress); - // } + if (prerequisites.Contains(PackagePrerequisite.VcBuildTools)) + { + await InstallVcBuildToolsIfNecessary(progress); + } } public async Task InstallAllIfNecessary(IProgress? progress = null) @@ -782,7 +782,7 @@ await downloadService.DownloadToFileAsync( var process = ProcessRunner.StartAnsiProcess( VcBuildToolsDownloadPath, - "--quiet --wait --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended;includeOptional", + "--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", outputDataReceived: output => progress?.Report( new ProgressReport( diff --git a/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs b/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs index cb45b7a6..d59a004d 100644 --- a/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs +++ b/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs @@ -39,6 +39,7 @@ IPyInstallationManager pyInstallationManager "Windows-only version of ComfyUI which uses ZLUDA to get better performance with AMD GPUs."; public override string Disclaimer => "Prerequisite install may require admin privileges and a reboot. " + + "Visual Studio Build Tools for C++ Desktop Development will be installed automatically." + "AMD GPUs under the RX 6800 may require additional manual setup."; public override string LaunchCommand => Path.Combine("zluda", "zluda.exe"); public override IEnumerable AvailableTorchIndices => [TorchIndex.Zluda]; @@ -52,11 +53,11 @@ IPyInstallationManager pyInstallationManager public override bool ShouldIgnoreReleases => true; public override IEnumerable Prerequisites => - base.Prerequisites.Concat([PackagePrerequisite.HipSdk]); + base.Prerequisites.Concat([PackagePrerequisite.HipSdk, PackagePrerequisite.VcBuildTools]); public override bool InstallRequiresAdmin => true; public override string AdminRequiredReason => - "HIP SDK installation and (if applicable) ROCmLibs patching requires admin privileges for accessing the HIP SDK files in the Program Files directory."; + "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."; public override async Task InstallPackage( string installLocation, From 7bb0a76c911c5db735daec9c0dda2eed3ca4a1d0 Mon Sep 17 00:00:00 2001 From: NeuralFault <65365345+NeuralFault@users.noreply.github.com> Date: Mon, 27 Oct 2025 19:01:28 -0400 Subject: [PATCH 2/3] Refactor process command for better readability --- .../Helpers/WindowsPrerequisiteHelper.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs b/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs index 1144898a..bf6b76f6 100644 --- a/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs +++ b/StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs @@ -782,7 +782,18 @@ await downloadService.DownloadToFileAsync( var process = ProcessRunner.StartAnsiProcess( VcBuildToolsDownloadPath, - "--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", + "--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", outputDataReceived: output => progress?.Report( new ProgressReport( From ddbdcb276706133029b63271e2b88254f32f5872 Mon Sep 17 00:00:00 2001 From: NeuralFault <65365345+NeuralFault@users.noreply.github.com> Date: Mon, 27 Oct 2025 19:02:05 -0400 Subject: [PATCH 3/3] Fix disclaimer formatting in ComfyZluda.cs --- StabilityMatrix.Core/Models/Packages/ComfyZluda.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs b/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs index d59a004d..16565208 100644 --- a/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs +++ b/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs @@ -39,7 +39,7 @@ IPyInstallationManager pyInstallationManager "Windows-only version of ComfyUI which uses ZLUDA to get better performance with AMD GPUs."; public override string Disclaimer => "Prerequisite install may require admin privileges and a reboot. " - + "Visual Studio Build Tools for C++ Desktop Development will be installed automatically." + + "Visual Studio Build Tools for C++ Desktop Development will be installed automatically. " + "AMD GPUs under the RX 6800 may require additional manual setup."; public override string LaunchCommand => Path.Combine("zluda", "zluda.exe"); public override IEnumerable AvailableTorchIndices => [TorchIndex.Zluda];