mkl: 2019.3 -> 2019.5 (#71476)
Includes bugfixes, new features, and performance improvements. Full release notes here: https://software.intel.com/en-us/articles/intel-math-kernel-library-release-notes-and-new-features Leave Darwin on 2019.3 pending resolution of DMG issues
This commit is contained in:
parent
f3a97b24cd
commit
fa1e275f31
@ -3,11 +3,25 @@
|
|||||||
For details on using mkl as a blas provider for python packages such as numpy,
|
For details on using mkl as a blas provider for python packages such as numpy,
|
||||||
numexpr, scipy, etc., see the Python section of the NixPkgs manual.
|
numexpr, scipy, etc., see the Python section of the NixPkgs manual.
|
||||||
*/
|
*/
|
||||||
stdenvNoCC.mkDerivation rec {
|
let
|
||||||
name = "mkl-${version}";
|
# Release notes and download URLs are here:
|
||||||
version = "${date}.${rel}";
|
# https://registrationcenter.intel.com/en/products/
|
||||||
date = "2019.3";
|
version = "${year}.${spot}.${rel}";
|
||||||
rel = "199";
|
year = "2019";
|
||||||
|
|
||||||
|
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
|
||||||
|
# https://github.com/matthewbauer/undmg/issues/4
|
||||||
|
spot = if stdenvNoCC.isDarwin then "3" else "5";
|
||||||
|
rel = if stdenvNoCC.isDarwin then "199" else "281";
|
||||||
|
|
||||||
|
rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
|
||||||
|
|
||||||
|
# Intel openmp uses its own versioning, but shares the spot release patch.
|
||||||
|
openmp-ver = "19.0.${spot}-${rel}-19.0.${spot}-${rel}";
|
||||||
|
|
||||||
|
in stdenvNoCC.mkDerivation {
|
||||||
|
pname = "mkl";
|
||||||
|
inherit version;
|
||||||
|
|
||||||
src = if stdenvNoCC.isDarwin
|
src = if stdenvNoCC.isDarwin
|
||||||
then
|
then
|
||||||
@ -17,15 +31,13 @@ stdenvNoCC.mkDerivation rec {
|
|||||||
})
|
})
|
||||||
else
|
else
|
||||||
(fetchurl {
|
(fetchurl {
|
||||||
url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15275/l_mkl_${version}.tgz";
|
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15816/l_mkl_${version}.tgz";
|
||||||
sha256 = "13rb2v2872jmvzcqm4fqsvhry0j2r5cn4lqql4wpqbl1yia2pph6";
|
sha256 = "0zkk4rrq7g44acxaxhpd2053r66w169mww6917an0lxhd52fm5cr";
|
||||||
});
|
});
|
||||||
|
|
||||||
nativeBuildInputs = if stdenvNoCC.isDarwin
|
nativeBuildInputs = if stdenvNoCC.isDarwin
|
||||||
then
|
then
|
||||||
[ undmg
|
[ undmg darwin.cctools ]
|
||||||
darwin.cctools
|
|
||||||
]
|
|
||||||
else
|
else
|
||||||
[ rpmextract ];
|
[ rpmextract ];
|
||||||
|
|
||||||
@ -34,10 +46,10 @@ stdenvNoCC.mkDerivation rec {
|
|||||||
tar xzvf $f
|
tar xzvf $f
|
||||||
done
|
done
|
||||||
'' else ''
|
'' else ''
|
||||||
rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm
|
rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm
|
||||||
rpmextract rpm/intel-mkl-core-${date}-${rel}-${date}-${rel}.x86_64.rpm
|
rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm
|
||||||
rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm
|
rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm
|
||||||
rpmextract rpm/intel-openmp-19.0.3-${rel}-19.0.3-${rel}.x86_64.rpm
|
rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
@ -105,6 +117,6 @@ stdenvNoCC.mkDerivation rec {
|
|||||||
homepage = https://software.intel.com/en-us/mkl;
|
homepage = https://software.intel.com/en-us/mkl;
|
||||||
license = licenses.issl;
|
license = licenses.issl;
|
||||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||||
maintainers = [ maintainers.bhipple ];
|
maintainers = with maintainers; [ bhipple ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user