public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #101780 from glittershark/bump-openblas" 

Hash is updated but not the version.

This reverts commit 8b98955451, reversing
changes made to 5e2fde0a4f.
This commit is contained in:
Frederik Rietdijk 2020-10-28 09:46:59 +01:00
parent db0fe5c3eb
commit 4e29151910
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch Normal file
View File

@ -0,0 +1,26 @@
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

8
pkgs/development/libraries/science/math/openblas/default.nix
View File

@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
sha256 = "0mk1kjkr96bvvcq2zigzjrs0cnhwsf6gfi0855mp9yifn8lvp20y";
sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";
};
inherit blas64;
@ -144,6 +144,12 @@ 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"}";