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

Merge pull request #121983 from nbren12/mpich-mac-fix 

mpich: fix darwin build
This commit is contained in:
markuskowa 2021-05-07 11:26:31 +02:00 committed by GitHub
parent 74b4f6c9af a3d423090b
commit d93bcc481b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/mpich/default.nix
View File

@ -1,15 +1,13 @@
{ stdenv, lib, fetchurl, perl, gfortran { stdenv, lib, fetchurl, perl, gfortran
, openssh, hwloc, autoconf, automake, libtool , openssh, hwloc, autoconf, automake, libtool
# device options are ch3 or ch4 # either libfabric or ucx work for ch4backend on linux. On darwin, neither of
, device ? "ch4" # these libraries currently build so this argument is ignored on Darwin.
# backend option are libfabric or ucx , ch4backend
, ch4backend ? "libfabric"
, ucx, libfabric
# Process manager to build # Process manager to build
, withPm ? "hydra:gforker" , withPm ? "hydra:gforker"
} : } :
assert (ch4backend == "ucx" || ch4backend == "libfabric"); assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mpich"; pname = "mpich";
@ -45,8 +43,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ perl gfortran openssh hwloc ] buildInputs = [ perl gfortran openssh hwloc ]
++ lib.optional (ch4backend == "ucx") ucx ++ lib.optional (!stdenv.isDarwin) ch4backend;
++ lib.optional (ch4backend == "libfabric") libfabric;
doCheck = true; doCheck = true;

4
pkgs/top-level/all-packages.nix
View File

@ -16715,7 +16715,9 @@ in
libmpc = callPackage ../development/libraries/libmpc { }; libmpc = callPackage ../development/libraries/libmpc { };
mpich = callPackage ../development/libraries/mpich { }; mpich = callPackage ../development/libraries/mpich {
ch4backend = libfabric;
};
mstpd = callPackage ../os-specific/linux/mstpd { }; mstpd = callPackage ../os-specific/linux/mstpd { };