mvapich: remove with statements

This commit is contained in:
Philip Taron 2024-08-16 13:58:24 -07:00
parent 97070902ca
commit 4d44b70c86
No known key found for this signature in database

View File

@ -25,17 +25,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ];
propagatedBuildInputs = [ numactl rdma-core zlib opensm ];
buildInputs = with lib; [
buildInputs = [
numactl
libxml2
perl
openssh
hwloc
] ++ optionals (network == "infiniband") [ rdma-core opensm ]
++ optionals (network == "omnipath") [ libpsm2 libfabric ]
++ optional useSlurm slurm;
] ++ lib.optionals (network == "infiniband") [ rdma-core opensm ]
++ lib.optionals (network == "omnipath") [ libpsm2 libfabric ]
++ lib.optional useSlurm slurm;
configureFlags = with lib; [
configureFlags = [
"--with-pm=hydra"
"--enable-fortran=all"
"--enable-cxx"
@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
"--enable-hybrid"
"--enable-shared"
"FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10
] ++ optional useSlurm "--with-pm=slurm"
++ optional (network == "ethernet") "--with-device=ch3:sock"
++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ]
++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"];
] ++ lib.optional useSlurm "--with-pm=slurm"
++ lib.optional (network == "ethernet") "--with-device=ch3:sock"
++ lib.optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ]
++ lib.optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"];
doCheck = true;