JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #80617 from ikervagyok/slurm

Browse Source 
Slurm: improve RDMA capability
This commit is contained in:
markuskowa 2020-02-22 17:33:47 +01:00 committed by GitHub
commit 74dcd1c637
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/computing/slurm/slurm.nix
View File

@ -355,6 +355,7 @@ in
ExecStart = "${wrappedSlurm}/bin/slurmd"; ExecStart = "${wrappedSlurm}/bin/slurmd";
PIDFile = "/run/slurmd.pid"; PIDFile = "/run/slurmd.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
LimitMEMLOCK = "infinity";
}; };
preStart = '' preStart = ''

5
pkgs/servers/computing/slurm/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl, zlib , python, munge, perl, pam, openssl, zlib
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg, lz4 , readline, freeipmi, libssh2, xorg, lz4, rdma-core
# enable internal X11 support via libssh2 # enable internal X11 support via libssh2
, enableX11 ? true , enableX11 ? true
}: }:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libtool ]; nativeBuildInputs = [ pkgconfig libtool ];
buildInputs = [ buildInputs = [
curl python munge perl pam openssl zlib curl python munge perl pam openssl zlib
libmysqlclient ncurses gtk2 lz4 libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi lua hwloc numactl readline freeipmi
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
"--with-munge=${munge}" "--with-munge=${munge}"
"--with-ssl=${openssl.dev}" "--with-ssl=${openssl.dev}"
"--with-zlib=${zlib}" "--with-zlib=${zlib}"
"--with-ofed=${rdma-core}"
"--sysconfdir=/etc/slurm" "--sysconfdir=/etc/slurm"
] ++ (optional (gtk2 == null) "--disable-gtktest") ] ++ (optional (gtk2 == null) "--disable-gtktest")
++ (optional enableX11 "--with-libssh2=${libssh2.dev}") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}")