Merge pull request #105330 from danieldk/mkl-2020.4.304

mkl: 2020.3.279 -> 2020.4.304
This commit is contained in:
Sandro 2020-11-29 18:09:57 +01:00 committed by GitHub
commit bb9c3e74f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -20,12 +20,11 @@ let
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
# https://github.com/matthewbauer/undmg/issues/4
year = if stdenvNoCC.isDarwin then "2019" else "2020";
spot = if stdenvNoCC.isDarwin then "3" else "3";
rel = if stdenvNoCC.isDarwin then "199" else "279";
spot = if stdenvNoCC.isDarwin then "3" else "4";
rel = if stdenvNoCC.isDarwin then "199" else "304";
# Replace `openmpSpot` by `spot` after 2020.3. Release 2020.03
# adresses performance regressions and does not update OpenMP.
openmpSpot = if stdenvNoCC.isDarwin then spot else "2";
# Replace `openmpSpot` by `spot` after 2020.
openmpSpot = if stdenvNoCC.isDarwin then spot else "3";
rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
@ -47,8 +46,8 @@ in stdenvNoCC.mkDerivation {
})
else
(fetchurl {
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz";
sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib";
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz";
hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU=";
});
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin