Merge pull request #116499 from danieldk/amd-blis-3.0

amd-blis: 2.2 -> 3.0
This commit is contained in:
Sandro 2021-03-25 11:18:54 +01:00 committed by GitHub
commit 499600b06d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,10 +6,10 @@
# Enable BLAS interface with 64-bit integer width. # Enable BLAS interface with 64-bit integer width.
, blas64 ? false , blas64 ? false
# Target architecture, use "zen" or "zen2", optimization for Zen and # Target architecture. "amd64" compiles kernels for all Zen
# other families is pretty much mutually exclusive in the AMD fork of # generations. To build kernels for specific Zen generations,
# BLIS. # use "zen", "zen2", or "zen3".
, withArchitecture ? "zen" , withArchitecture ? "amd64"
# Enable OpenMP-based threading. # Enable OpenMP-based threading.
, withOpenMP ? true , withOpenMP ? true
@ -20,13 +20,13 @@ let
blasIntSize = if blas64 then "64" else "32"; blasIntSize = if blas64 then "64" else "32";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "amd-blis"; pname = "amd-blis";
version = "2.2"; version = "3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "amd"; owner = "amd";
repo = "blis"; repo = "blis";
rev = version; rev = version;
sha256 = "1b2f5bwi0gkw2ih2rb7wfzn3m9hgg7k270kg43rmzpr2acpy86xa"; hash = "sha256-bbbeo1yOKse9pzbsB6lQ7pULKdzu3G7zJzTUgPXiMZY=";
}; };
inherit blas64; inherit blas64;
@ -36,7 +36,10 @@ in stdenv.mkDerivation rec {
python3 python3
]; ];
doCheck = true; # Tests currently fail with non-Zen CPUs due to a floating point
# exception in one of the generic kernels. Try to re-enable the
# next release.
doCheck = false;
enableParallelBuilding = true; enableParallelBuilding = true;
@ -51,8 +54,8 @@ in stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libblas.so.3 ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libblas.so.3
ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libcblas.so.3 ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libcblas.so.3
ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libblas.so.3 $out/lib/libblas.so
ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
''; '';