aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/science/math/mkl
diff options
context:
space:
mode:
authorDaniël de Kok <me@danieldk.eu>2020-09-03 15:28:01 +0200
committerDaniël de Kok <me@danieldk.eu>2020-09-03 15:29:10 +0200
commit405f49dc4aa4901e6cd3020ddc842c5f4fef55c8 (patch)
treee5171a994577b48246f1be2053120d1097f71266 /pkgs/development/libraries/science/math/mkl
parent02a2649220887363e7730cfb2f0dcc3c4cf17f06 (diff)
mkl: 2020.2.254 -> 2020.3.279
Release notes: https://software.intel.com/content/www/us/en/develop/articles/intel-math-kernel-library-release-notes-and-new-features.html
Diffstat (limited to 'pkgs/development/libraries/science/math/mkl')
-rw-r--r--pkgs/development/libraries/science/math/mkl/default.nix14
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 11c5e42335b1..2be3baed4497 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -19,14 +19,18 @@ 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 "2";
- rel = if stdenvNoCC.isDarwin then "199" else "254";
+ spot = if stdenvNoCC.isDarwin then "3" else "3";
+ 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}";
# Intel openmp uses its own versioning, but shares the spot release patch.
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;
@@ -42,8 +46,8 @@ in stdenvNoCC.mkDerivation {
})
else
(fetchurl {
- url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16849/l_mkl_${version}.tgz";
- sha256 = "08q2q5rary7fxlrk09kpw0vl7mkk2smmklib44a6qainmxks407d";
+ url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz";
+ sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib";
});
nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin