-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
Bump slurm, add pyslurm #27350
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
Bump slurm, add pyslurm #27350
Conversation
@veprbl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jagajaga, @rickynils, @mitchty and @FRidh to be potential reviewers. |
pkgs/top-level/python-packages.nix
Outdated
@@ -22378,6 +22378,29 @@ in { | |||
}; | |||
}; | |||
|
|||
pyslurm = buildPythonPackage rec { |
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.
Can you add only a reference to this file and move the actual expression to a dedicated file python-modules
as describe in header of this file?
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.
Do you want me to move definition to pkgs/development/python-modules/pyslurm/default.nix
because there is a patch?
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.
No. We do this for all new python packages and for most updated ones, due the size of this file.
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.
This is good. Updated!
substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" | ||
substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" | ||
patchShebangs ./doc/html/shtml2html.py | ||
patchShebangs ./doc/man/man2html.py |
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.
Solution is ok. Often I just prefer the shotgun method and use patchShebangs .
to avoid future shebangs maintenance.
}; | ||
|
||
outputs = [ "out" "dev" ]; | ||
|
||
nativeBuildInputs = [ pkgconfig ]; | ||
# nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode' | ||
# https://groups.google.com/forum/#!topic/slurm-devel/HiltSkNiGJU |
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.
Are you sure this was the correct link? The thread mentions something about removing "-O0" from CFLAGS
.
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.
Great catch! Fixed.
@@ -0,0 +1,18 @@ | |||
diff --git a/pyslurm/__init__.py b/pyslurm/__init__.py |
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.
Can you also send this patch upstream?
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.
Thanks! |
@Mic92 Thank you! |
|
||
slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); |
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.
It is cool to leave an alias.
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.
Right! #27364
Motivation for this change
I needed pyslurm client which is based on slurm version from 2017, so hence the version bump.
I don't use nixos or daemon, but I've tried to look at the test that was broken even before. The problem seems to be that slurmd wouldn't start. I fixed that, so now
nix-build ./nixos/tests/slurm.nix
produces an output path. So, I guess, it's fixed?Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)