pythonPackages.numpy: refactor adding mkl support

NixOS · Oct 18, 2018 · e4c51e5 · e4c51e5
1 parent 84890ac
commit e4c51e5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
@@ -1,5 +1,7 @@
 { stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas }:
 
+let blasImplementation = stdenv.lib.nameFromURL blas.name "-";
+in
 buildPythonPackage rec {
   pname = "numpy";
   version = "1.15.1";
@@ -38,7 +40,16 @@ buildPythonPackage rec {
     export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
   '';
 
-  preBuild = ''
+  preBuild = if blasImplementation == "mkl" then ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [mkl]
+    include_dirs = ${blas}/include
+    library_dirs = ${blas}/lib
+    mkl_libs = mkl_rt
+  	lapack_libs =
+    EOF
+  '' else ''
     echo "Creating site.cfg file..."
     cat << EOF > site.cfg
     [openblas]

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -8111,6 +8111,10 @@ in {
     blas = pkgs.openblasCompat;
   };
 
+  numpy-mkl = callPackage ../development/python-modules/numpy {
+    blas = pkgs.mkl;
+  };
+
   numpydoc = callPackage ../development/python-modules/numpydoc { };
 
   numpy-stl = callPackage ../development/python-modules/numpy-stl { };