Skip to content

Commit 771bc04

Browse files
mohnjilesmohnjiles
committed
Update HIP SDK to 6.4.2 for zluda packages and update comfyzluda to just run the (slightly modified) install-n.bat file
1 parent 27b30f1 commit 771bc04

File tree

4 files changed

+106
-214
lines changed

4 files changed

+106
-214
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
77

88
## v2.15.1
9+
### Changed
10+
- Upgraded ComfyUI-Zluda and Stable Diffusion WebUI AMDGPU Forge packages to install and use HIP SDK 6.4.2
911
### Fixed
1012
- Fixed [#1372](https://github.com/LykosAI/StabilityMatrix/issues/1372) - LiteAsyncException upon starting Stability Matrix v2.15.0
1113
- Fixed [#1391](https://github.com/LykosAI/StabilityMatrix/issues/1391) - "Failed to parse" error when upgrading pip packages with extra index url

‎StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ IPyInstallationManager pyInstallationManager
4545
private const string CppBuildToolsUrl = "https://aka.ms/vs/17/release/vs_BuildTools.exe";
4646

4747
private const string HipSdkDownloadUrl =
48-
"https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q4-Win10-Win11-For-HIP.exe";
48+
"https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-25.Q3-Win10-Win11-For-HIP.exe";
4949
private const string PythonLibsDownloadUrl = "https://cdn.lykos.ai/python_libs_for_sage.zip";
5050

5151
private const string UvWindowsDownloadUrl =
@@ -110,7 +110,7 @@ private string GetPythonLibraryZipPath(PyVersion version) =>
110110
private string HipSdkDownloadPath => Path.Combine(AssetsDir, "AMD-HIP-SDK.exe");
111111

112112
private string HipInstalledPath =>
113-
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "AMD", "ROCm", "6.2");
113+
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "AMD", "ROCm", "6.4");
114114

115115
private string UvDownloadPath => Path.Combine(AssetsDir, "uv.zip");
116116
private string UvExtractPath => Path.Combine(AssetsDir, "uv");
@@ -189,7 +189,7 @@ private async Task<string> RunNode(
189189

190190
result.EnsureSuccessExitCode();
191191
return result.StandardOutput ?? result.StandardError ?? string.Empty;
192-
}
192+
}
193193

194194
public async Task RunNpm(
195195
ProcessArgs args,
@@ -997,15 +997,11 @@ private async Task PatchHipSdkIfNecessary(IProgress<ProgressReport>? progress)
997997

998998
var zipFolderName = downloadUrl switch
999999
{
1000-
_ when downloadUrl.Contains("gfx1201") => null,
1001-
_ when downloadUrl.Contains("gfx1150") => "rocm gfx1150 for hip skd 6.2.4",
1002-
_ when downloadUrl.Contains("gfx1103.AMD") =>
1003-
"rocm gfx1103 AMD 780M phoenix V5.0 for hip skd 6.2.4",
1004-
_ when downloadUrl.Contains("gfx1034") => "rocm gfx1034-gfx1035-gfx1036 for hip sdk 6.2.4",
1005-
_ when downloadUrl.Contains("gfx1032") => "rocm gfx1032 for hip skd 6.2.4(navi21 logic)",
1006-
_ when downloadUrl.Contains("gfx1031") => "rocm gfx1031 for hip skd 6.2.4 (littlewu's logic)",
1007-
_ when downloadUrl.Contains("gfx1010") =>
1008-
"rocm gfx1010-xnack-gfx1011-xnack-gfx1012-xnack- for hip sdk 6.2.4",
1000+
_ when downloadUrl.Contains("gfx1103.AMD") => "rocm gfx1103 for hip 6.4.2",
1001+
_ when downloadUrl.Contains("gfx1034") => "rocm gfx1034.gfx1035.gfx1036 for hip 6.4.2",
1002+
_ when downloadUrl.Contains("gfx1032") => "rocm gfx1032 for hip 6.4.2",
1003+
_ when downloadUrl.Contains("gfx1031") => "rocm gfx1031 for hip 6.4.2",
1004+
_ when downloadUrl.Contains("gfx1010") => "rocm gfx1010-xnack-gfx1012-xnack-.for.hip6.4.2",
10091005
_ => null,
10101006
};
10111007

@@ -1035,27 +1031,29 @@ _ when downloadUrl.Contains("gfx1010") =>
10351031

10361032
private string? GetDownloadUrlFromGpuName(string name)
10371033
{
1034+
// not used anymore but good to know for gfx -> name reference
10381035
// gfx1201
1039-
if (name.Contains("9060") || name.Contains("9070"))
1040-
{
1041-
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1201.for.hip.skd.6.2.4-no-optimized.7z";
1042-
}
1036+
// if (name.Contains("9060") || name.Contains("9070"))
1037+
// {
1038+
// return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1201.for.hip.skd.6.2.4-no-optimized.7z";
1039+
// }
10431040

1041+
// not used anymore but good to know for gfx -> name reference
10441042
// gfx1150
1045-
if (
1046-
name.Contains("8050S")
1047-
|| name.Contains("8060S")
1048-
|| name.Contains("880M")
1049-
|| name.Contains("890M")
1050-
)
1051-
{
1052-
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1150.for.hip.skd.6.2.4.7z";
1053-
}
1043+
// if (
1044+
// name.Contains("8050S")
1045+
// || name.Contains("8060S")
1046+
// || name.Contains("880M")
1047+
// || name.Contains("890M")
1048+
// )
1049+
// {
1050+
// return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1150.for.hip.skd.6.2.4.7z";
1051+
// }
10541052

10551053
// gfx1103
10561054
if (name.Contains("740M") || name.Contains("760M") || name.Contains("780M") || name.Contains("Z1"))
10571055
{
1058-
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1103.AMD.780M.phoenix.V5.0.for.hip.sdk.6.2.4.7z";
1056+
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1103.for.hip.6.4.2.7z";
10591057
}
10601058

10611059
// gfx1034, gfx1035, gfx1036
@@ -1070,7 +1068,7 @@ _ when downloadUrl.Contains("gfx1010") =>
10701068
|| name.Contains("Graphics 128SP")
10711069
)
10721070
{
1073-
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1034-gfx1035-gfx1036.for.hip.sdk.6.2.4.7z";
1071+
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1034.gfx1035.gfx1036.for.hip.6.4.2.7z";
10741072
}
10751073

10761074
// gfx1032
@@ -1081,7 +1079,7 @@ _ when downloadUrl.Contains("gfx1010") =>
10811079
|| name.Contains("6650")
10821080
)
10831081
{
1084-
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1032.for.hip.sdk.6.2.4.navi21.logic.7z";
1082+
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1032.for.hip.6.4.2.7z";
10851083
}
10861084

10871085
// gfx1031
@@ -1092,13 +1090,13 @@ _ when downloadUrl.Contains("gfx1010") =>
10921090
|| name.Contains("6850M")
10931091
)
10941092
{
1095-
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1031.for.hip.sdk.6.2.4.littlewu.s.logic.7z";
1093+
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1031.for.hip.6.4.2.7z";
10961094
}
10971095

10981096
// gfx1010/1012
10991097
if (name.Contains("5700") || name.Contains("5600") || name.Contains("5300") || name.Contains("5500"))
11001098
{
1101-
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1010-xnack-gfx1011-xnack-gfx1012-xnack-.for.hip.sdk.6.2.4.7z";
1099+
return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1010-xnack-gfx1012-xnack-.for.hip6.4.2.7z";
11021100
}
11031101

11041102
return null;

0 commit comments

Comments
 (0)