Merge outputs of MPI in a single directory
Some MPI implementations now have their headers in the dev output as well as the mpicc wrappers. Reviewed-by: Aleix Boné <abonerib@bsc.es>
This commit is contained in:
parent
505f101e00
commit
501f11a8e5
@ -17,6 +17,10 @@ let
|
||||
name ="rdma-core-all";
|
||||
paths = [ rdma-core.dev rdma-core.out ];
|
||||
};
|
||||
mpiAll = symlinkJoin {
|
||||
name = "mpi-all";
|
||||
paths = [ mpi.all ];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -37,13 +41,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
"--with-infiniband=${rdma-core-all}"
|
||||
"--with-mpi=${mpi}"
|
||||
"--with-mpi=${mpiAll}"
|
||||
"--with-slurm"
|
||||
"CFLAGS=-fPIC"
|
||||
"CXXFLAGS=-fPIC"
|
||||
];
|
||||
|
||||
buildInputs = [ slurm mpi rdma-core-all autoconf automake libtool rsync gfortran ];
|
||||
buildInputs = [ slurm mpiAll rdma-core-all autoconf automake libtool rsync gfortran ];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
}
|
||||
|
@ -3,8 +3,16 @@
|
||||
, fetchurl
|
||||
, mpi
|
||||
, lib
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
let
|
||||
mpiAll = symlinkJoin {
|
||||
name = "mpi-all";
|
||||
paths = [ mpi.all ];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.1-1";
|
||||
name = "osu-micro-benchmarks-${version}";
|
||||
@ -16,11 +24,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ mpi ];
|
||||
buildInputs = [ mpiAll ];
|
||||
hardeningDisable = [ "all" ];
|
||||
configureFlags = [
|
||||
"CC=${mpi}/bin/mpicc"
|
||||
"CXX=${mpi}/bin/mpicxx"
|
||||
"CC=mpicc"
|
||||
"CXX=mpicxx"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
@ -11,8 +11,16 @@
|
||||
, numactl
|
||||
, rdma-core
|
||||
, gfortran
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
let
|
||||
mpiAll = symlinkJoin {
|
||||
name = "mpi-all";
|
||||
paths = [ mpi.all ];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tagaspi";
|
||||
enableParallelBuilding = true;
|
||||
@ -32,10 +40,10 @@ stdenv.mkDerivation rec {
|
||||
autoconf
|
||||
libtool
|
||||
boost
|
||||
mpi
|
||||
numactl
|
||||
rdma-core
|
||||
gfortran
|
||||
mpiAll
|
||||
];
|
||||
|
||||
dontDisableStatic = true;
|
||||
|
Loading…
Reference in New Issue
Block a user