mkl: include Intel's libiomp.so in the MKL RPM unpack

Since Intel's default openmp implementation is available in the same src
tarball, we can just include it in the package. This means that `mkl` now "just
works" without any environment variables, fragile setup-hooks, or forced
propagation.

Since the openmp implementation is only needed at runtime (and for test cases),
users can substitute a different one if they prefer by exporting it with
`LD_PRELOAD`, which is how Intel recommends handling this. If they do not do so,
`libiomp.so` lives next to `libmkl_rt.so` and thus will be in the RPATH as a
sane default.

Since this still comes from the same src tarball, we can ship it without losing
the fixed-output derivation; likewise, since Hydra is not building or caching
these, shipping these proprietary packages costs no bandwidth for the nix
community.
This commit is contained in:
Benjamin Hipple
2018-10-23 17:33:49 -04:00
committed by Frederik Rietdijk
parent 65dfc2b272
commit 6206a342e0
4 changed files with 25 additions and 30 deletions

View File

@@ -71,8 +71,6 @@ in buildPythonPackage rec {
inherit blasImplementation cfg;
};
doCheck = blasImplementation != "mkl";
# Disable two tests
# - test_f2py: f2py isn't yet on path.
# - test_large_file_support: takes a long time and can cause the machine to run out of disk space