-
-
Notifications
You must be signed in to change notification settings - Fork 13.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rocm-related: 5.4.X -> 5.7.0 #258328
rocm-related: 5.4.X -> 5.7.0 #258328
Conversation
575763f
to
6d24a6e
Compare
8f7127e
to
7d53d41
Compare
At some point after |
7d53d41
to
7e67e21
Compare
🎉 Hooray! Yeah ran into the same thing when trying to build this locally last night - makes maintenance for rocfft a lot simpler 😊 I think we still might want to keep diff --git a/pkgs/development/rocm-modules/5/rocfft/default.nix b/pkgs/development/rocm-modules/5/rocfft/default.nix
index 5325744540b5..ac50318622ce 100644
--- a/pkgs/development/rocm-modules/5/rocfft/default.nix
+++ b/pkgs/development/rocm-modules/5/rocfft/default.nix
@@ -14,6 +14,7 @@
, gtest
, openmp
, rocrand
+, gpuTargets ? [ ]
}:
stdenv.mkDerivation (finalAttrs: {
@@ -45,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
+ ] ++ lib.optionals (gpuTargets != [ ]) [
+ "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}"
];
passthru = { |
7e67e21
to
f22d15e
Compare
Done. |
8e17d3f
to
4072599
Compare
Did the nixpkgs docs change? |
9cb4560
to
156915a
Compare
I am still unsure as to why python3.11-torch> Successfully preprocessed all matching files.
python3.11-torch> no configure script, doing nothing
python3.11-torch> building
python3.11-torch> Executing setuptoolsBuildPhase
python3.11-torch> Traceback (most recent call last):
python3.11-torch> File "/build/source/setup.py", line 224, in <module>
python3.11-torch> from setuptools import setup, Extension, find_packages
python3.11-torch> ModuleNotFoundError: No module named 'setuptools'
python3.11-torch> /nix/store/3pfjacvdg9f491lfqc9qb2d0nknx73fb-stdenv-linux/setup: line 144: pop_var_context: head of shell_variables not a function context Related: #246250 |
echo $PYTHONPATH /nix/store/pzf6dnxg8gf04xazzjdwarm7s03cbrgz-python3-3.10.12/lib/python3.10/site-packages Looks like there's a |
Result of 8 packages marked as broken and skipped:
1 package blacklisted:
6 packages failed to build:
240 packages built:
|
Kicked-off another build ~30 min ago, just waiting on that. |
I'm noticing that |
I'm trying out this patch that explicitly makes the build |
I rebuilt Maybe the build for |
|
Yeah, the |
Result of 15 packages marked as broken and skipped:
2 packages blacklisted:
233 packages built:
|
I'm going to merge this, once again, huge props to @Madouura for pushing this fantastic work to completion! |
Thanks for the testing and the merge! ❤️ |
propagatedBuildInputs = [ filelock ]; | ||
|
||
postPatch = let | ||
# Bash was getting weird without linting, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RE: cosmetic changes
Sorry I post this after the fact, but it's conventional to keep postPatch next to src
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I always did pname -> version -> outputs -> src -> patches -> native/build/propagated/inputs -> cmakeFlags -> post/pre/phase.
Where is this convention?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What I think I remember is a comment from SuperSandro, but I'm failing to find it. The logic was, roughly speaking, to list attributes in the "chronological" order of when they are relevant: the first phase is unpacking the sources, so src
goes first, and the very next thing is patching, and the very next after that is postPatch
, and all of that happens before the configurePhase and before the build
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. Are native/build/propagated/inputs and cmakeFlags after patchPhase?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something like https://discourse.nixos.org/t/document-attribute-ordering-in-package-expressions/4887?u=sergek:
# Phases attrs are ordered exactly as they're executed in setup.sh
That being said, it's just a convention
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But also generally big formatting changes are undesirable because they're inconvenient to review, especially when formatting changes are entangled with functional changes
|
||
# Upstream's setup.py tries to write cache somewhere in ~/ | ||
export HOME=$TMPDIR | ||
export HOME=$(mktemp -d) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's wrong with TMPDIR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is TMPDIR
always guaranteed? I swear I remember someone telling me to use mktemp -d
instead a while back on nixpkgs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TMPDIR is documented at https://nixos.org/manual/nix/stable/language/derivations
(but otherwise I'm just passing by)
@Madouura We need to remove the warning from the aliases, unfortunately, they're causing all invocations of I apologize for misguiding you, I should've known this would happen. Let's just leave them as normal aliases, and convert to a throw after the release. |
Done. #260910 |
Hey, I think this might be causing build failures not sure but I am getting this now when building Ollama
And the full error
I assume PR #3853 fixes it though correct? |
Missing some digit(s) in the PR number? Anyway, I've noticed this and suspected that it was triggered by cmake upgrade from 3.28 to 3.29. |
Oops yeah, must have done something weird with the mouse. My mouse has a really bad double clicking issue to be honest |
Description of changes
Tracking: #197885
Time for a ROCm update.
Not ready for review, unless you just want me to fix some things you happen to find.We're ready for review!
Any huge changes we want to make, we should wait for ROCm 6.0 where there's a bit of a refactor.I'm bad at following my own advice.
TODO
switch to cudaPackages-like package set✅base ROCm stack✅openmp (depends on rocm-device-libs and rocm-runtime)✅mlir (upstream problem?)✅openai-triton (needs rebase on LLVM 16 or 17. Switch to triton-unstable?)✅rocm-llvm
for this!separate rocBLAS for hydra (we're at 3.7GB!)✅rest of the ROCm stack✅make sure torchWithRocm works✅Shelved
resolves #257477, resolves #255814, resolves #255345, resolves #252668, resolves #252262, resolves #243383, resolves #242885, resolves #239621, resolves #238161, resolves #238112, resolves #238109, resolves #233556, resolves #231000, resolves #228088, resolves #259796, resolves #259910, fixes #246250
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)