forked from rarias/jungle
Upgrade bench6 and enable MKL by default
This commit is contained in:
@@ -9,13 +9,15 @@
|
|||||||
, nanos6
|
, nanos6
|
||||||
, nodes
|
, nodes
|
||||||
, nosv
|
, nosv
|
||||||
|
, mkl
|
||||||
, mpi
|
, mpi
|
||||||
, tampi
|
, tampi
|
||||||
, openblas
|
, openblas
|
||||||
, ovni
|
, ovni
|
||||||
, gitBranch ? "master"
|
, gitBranch ? "master"
|
||||||
, gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
|
, gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
|
||||||
, gitCommit ? "bf29a53113737c3aa74d2fe3d55f59868faea7b4"
|
, gitCommit ? "fe30c2cfe36b535ef26a0054e010bc005e88ba04"
|
||||||
|
, useMkl ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@@ -42,10 +44,13 @@ stdenv.mkDerivation rec {
|
|||||||
nosv
|
nosv
|
||||||
mpi
|
mpi
|
||||||
tampi
|
tampi
|
||||||
|
ovni
|
||||||
|
] ++ (if (useMkl) then [
|
||||||
|
mkl
|
||||||
|
] else [
|
||||||
openblas
|
openblas
|
||||||
openblas.dev
|
openblas.dev
|
||||||
ovni
|
]);
|
||||||
];
|
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
NANOS6_HOME = nanos6;
|
NANOS6_HOME = nanos6;
|
||||||
|
|||||||
Reference in New Issue
Block a user