Upgrade bench6 and enable MKL by default

2026-01-21 12:41:06 +01:00
parent 9e8c610d8c
commit 52caa714d4
1 changed files with 8 additions and 3 deletions
--- a/pkgs/bench6/default.nix
+++ b/pkgs/bench6/default.nix
@@ -9,13 +9,15 @@
 , nanos6
 , nodes
 , nosv
+, mkl
 , mpi
 , tampi
 , openblas
 , ovni
 , gitBranch ? "master"
 , gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
-, gitCommit ? "bf29a53113737c3aa74d2fe3d55f59868faea7b4"
+, gitCommit ? "fe30c2cfe36b535ef26a0054e010bc005e88ba04"
+, useMkl ? true
 }:

 stdenv.mkDerivation rec {
@@ -42,10 +44,13 @@ stdenv.mkDerivation rec {
    nosv
    mpi
    tampi
+    ovni
+  ] ++ (if (useMkl) then [
+    mkl
+  ] else [
    openblas
    openblas.dev
-    ovni
-  ];
+  ]);

  env = {
    NANOS6_HOME = nanos6;