diff options
author | Griffin Smith <root@gws.fyi> | 2020-10-26 13:08:56 -0400 |
---|---|---|
committer | Griffin Smith <root@gws.fyi> | 2020-10-26 19:24:23 -0400 |
commit | 3b4cd4f4dacd7db4011e88d819a1ae5acc3f3aff (patch) | |
tree | 2a10bcdd01a319be0bc7af1fb52041027fbcca83 /pkgs/development/libraries/science/math/openblas | |
parent | 976af38df650ee6c8d9e39ff3ccc27075e75e98c (diff) |
openblas: 0.3.10 -> 0.3.12
Diffstat (limited to 'pkgs/development/libraries/science/math/openblas')
-rw-r--r-- | pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/openblas/default.nix | 8 |
2 files changed, 1 insertions, 33 deletions
diff --git a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch b/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch deleted file mode 100644 index 1da1f3fb3190c..0000000000000 --- a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001 -From: Tom Hall <tahall256@protonmail.ch> -Date: Sat, 14 Mar 2020 11:55:45 +0000 -Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix - -Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496, -but not yet fixed. ---- - kernel/arm64/KERNEL.ARMV8 | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8 -index fe32d313..33d12f94 100644 ---- a/kernel/arm64/KERNEL.ARMV8 -+++ b/kernel/arm64/KERNEL.ARMV8 -@@ -102,7 +102,6 @@ CDOTKERNEL = zdot.S - ZDOTKERNEL = zdot.S - DSDOTKERNEL = dot.S - --DGEMM_BETA = dgemm_beta.S - SGEMM_BETA = sgemm_beta.S - - SGEMMKERNEL = sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S --- -2.24.1 - diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index b03e2b3a8ca88..5d6dbd4a65c15 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b"; + sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y"; }; inherit blas64; @@ -144,12 +144,6 @@ stdenv.mkDerivation rec { buildPackages.stdenv.cc ]; - # Disable an optimisation which seems to cause issues, pending an - # upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496 - patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ - ./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch - ]; - makeFlags = mkMakeFlagsFromConfig (config // { FC = "${stdenv.cc.targetPrefix}gfortran"; CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}"; |