nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97019 from danieldk/mkl-2020.2

Browse Source 
mkl: 2020.2.254 -> 2020.3.279
This commit is contained in:
Benjamin Hipple 2020-09-07 13:28:27 -04:00 committed by GitHub
commit 3c4335723c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -19,14 +19,18 @@ let
# Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
# https://github.com/matthewbauer/undmg/issues/4 # https://github.com/matthewbauer/undmg/issues/4
year = if stdenvNoCC.isDarwin then "2019" else "2020"; year = if stdenvNoCC.isDarwin then "2019" else "2020";
spot = if stdenvNoCC.isDarwin then "3" else "2"; spot = if stdenvNoCC.isDarwin then "3" else "3";
rel = if stdenvNoCC.isDarwin then "199" else "254"; rel = if stdenvNoCC.isDarwin then "199" else "279";
# 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";
rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
# Intel openmp uses its own versioning, but shares the spot release patch. # Intel openmp uses its own versioning, but shares the spot release patch.
openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1";
openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; openmp-ver = "${openmp}.${openmpSpot}-${rel}-${openmp}.${openmpSpot}-${rel}";
shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary;
@ -42,8 +46,8 @@ in stdenvNoCC.mkDerivation {
}) })
else else
(fetchurl { (fetchurl {
url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16849/l_mkl_${version}.tgz"; url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz";
sha256 = "08q2q5rary7fxlrk09kpw0vl7mkk2smmklib44a6qainmxks407d"; sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib";
}); });
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin