rocm-6: bump packages to 6.3.1 and add missing packages #367695
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LunNova
force-pushed
the
rocm-update
branch
2 times, most recently
from
76e05f1 to
c2abb37
Compare
|
not knowing much about the rocm stack, mainly here as i am using btop with rocm support enabled. I receive the following error when compiling |
|
@Shawn8901 Should be fixed now, was broken when I first opened the PR. |
|
One thing that I've wanted to do for a long time is to completely remove the ROCm LLVM as an stdEnv, which should solve a lot of these weird compilation errors. Solus's ROCm stack does this, and we compile every non-HIP code with GCC. In this way, the entire ROCm LLVM can be compacted into a single derivation and the complexity of packaging/updating ROCm LLVM is drastically reduced. That is, you should be able to use just the default stdenv with GCC to compile non-HIP code and tell CMake/HIPCC to use the ROCm LLVM only when compiling HIP code. You can achieve this entirely through environment variables. It doesn't make sense that because a portion of the codebase contains HIP code, any C/C++ in the codebase needs to be compiled with ROCm LLVM's C compiler. |
|
Ok I just noticed the "Contemplate trying to make a normal Nix style CC wrapper work again" section, so it seems like you've already experienced the pain of the ROCm LLVM 😅 I will give my idea a try in the next few days and get back. |
|
It looks like upstream are moving away from a separate hipcc and using clang (now Maintaining a separate HIP only compiler might require maintaining significant cmakefile patches to get it to be used, but if you can work out a way to do this that isn't maintenance hell that's great. |
Please see https://github.com/GZGavinZhao/rocm-llvm-project/commits/solus-rocm-6.2.x for the patches and https://lists.debian.org/debian-ai/2024/12/msg00042.html for more details. I hope they apply cleanly on v6.3, but if not I think the changes are easy enough to manually rewrite them. If you need patches for other components, please see |
Solus does this and we didn't have to use any patches. Most of the work done was figuring out the environment variables to tell CMake and/or HIPCC what our intended HIP compiler is. The only thing I'm worrying about is locating sysroots due to non-standard installation prefix, but other than that Solus's experience shows that this is definitely doable. |
github-actions
bot
added
6.topic: python
10.rebuild-darwin: 101-500
and removed
10.rebuild-darwin: 11-100
labels
LunNova
force-pushed
the
rocm-update
branch
2 times, most recently
from
22f00e1 to
c05b8cb
Compare
|
This should be testable (including torch) if you have an instinct MI50 or newer, Radeon VII, W/RX 6800 or similar, W/RX 78/900 or similar. Cards which relied on the ISA compat patches like iGPUs or 66/7xx aren't going to work, haven't applied @GZGavinZhao's updated patches yet. If you're going to try to test it you want >200G free space so hipblaslt can spew an unfathomable amount of asm into the build temp directory and a lot of cores or you'll be here all month. |
|
I'm having trouble getting this to build. I get Failed Tests (2): during the triton-llvm-19.1.0-rc1 test phase. RX6800XT. X86_64-linux on nixos. No overlays or config or anything, just trying to create a devshell with python312Packages.torch. I can post a (nearly) minimum reproducible flake: |
|
@henryrgithub Your test flake is using non-rocm torch which is broken in master with the same error. If you use Recommend updating inputs before starting a build of torchWithRocm, just fixed some issues. |
|
GZGavinZhao
reviewed
Dec 25, 2024
| }; | ||
|
|
||
| rocm-opencl-runtime = symlinkJoin { | ||
| name = "rocm-opencl-runtime-meta"; | ||
| # FIXME: we have compressed code objects now, may be able to skip two stages? |
There was a problem hiding this comment.
CCOB (compressed code object bundle) is on by default for composable_kernel for ROCm v6.2+, so yes no need for two-stage builds now.
|
I tried to use this PR via overlay But got a collision when building ollama But overall it seems to be building without errors. When not using ollama I was able to rebuild my system without errors. |
GZGavinZhao
reviewed
Dec 26, 2024
|
I got a separate HIP compiler working and successfully compiled |
|
ROCm's standard toolchain is clang + GNU libs including libstdc++. There are a few packages which don't compile with Clashing error is because I added a /llvm link to clr for use by other ROCm packages and ollama also already adds one to its ROCm env internally, can be resolved by dropping the /llvm link from ollama. |
|
Added exact GPU targets as pkgs.rocmPackages_6.gfx908, gfx1030 etc. |
|
|
|
I can also verify that the LLVM fix worked for me and I'm getting reasonable outputs from gemma2 and qwen2, |
|
|
|
I noticed there's a mention of I ask because I think that one what's causing exo to fail with rocmSupport = true on my PR to update it. |
This PR could also unbreak ROCm: #375850 I don't know how long it will take to finish that short-term fix, vs updating to 6.3.1. |
|
Aiming to integrate @GZGavinZhao's PR and get hipblaslt compression working this weekend. A few of the patches in this PR have been merged in upstream ROC0m, sometimes with changes, so need to update patches. |
Signed-off-by: Gavin Zhao <git@gzgz.dev>
Signed-off-by: Gavin Zhao <git@gzgz.dev>
Signed-off-by: Gavin Zhao <git@gzgz.dev>
Signed-off-by: Gavin Zhao <git@gzgz.dev>
Signed-off-by: Gavin Zhao <git@gzgz.dev>
ofborg
bot
added
the
2.status: merge conflict
|
Not going to bother including hipblaslt msgpack compression in this PR. Adding code object compression got hipblaslt down to 1.2G which is good enough. |
3 tasks
|
Well, this was a bit of a pain to build, as usual with ROCm, 😂 I have not checked yet if any of those 108 packages that fail to build are actual breakage.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #337159
WIP bump to 6.3.1 for rocmPackages_6 package set.
Upstream PRs/issues Raised
TODO List
and msgpackworking for hipblaslt. 10GB derivation is not ok.Make use of working LLVM packages .override to simplify LLVMoverrideScope isn't present and is needed.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.