From b36fd0871040ec9960558c580a8826ae63fa6324 Mon Sep 17 00:00:00 2001 From: ckie Date: Mon, 28 Nov 2022 20:15:39 +0200 Subject: [PATCH 1/2] pythonPackages.kaldi-active-grammar: clarify old-openfst override --- .../python-modules/kaldi-active-grammar/fork.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix index 8f5a11f14c6..bcd4720f500 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -13,15 +13,19 @@ }: let - old-openfst = openfst.overrideAttrs (self: { + old-openfst = openfst.overrideAttrs (prev: { + version = "kag-unstable-2022-05-06"; + src = fetchFromGitHub { owner = "kkm000"; repo = "openfst"; + # required by https://github.com/daanzu/kaldi-fork-active-grammar/blob/e9c7d0ffca401cf312779d25f2c05a34b41ff696/cmake/third_party/openfst.cmake#L7 rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9"; sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx"; }; buildInputs = [ zlib ]; - }); in + }); +in assert blas.implementation == "openblas" && lapack.implementation == "openblas"; From 46c2da3f1e0eba12077c0d25180b4f6000793787 Mon Sep 17 00:00:00 2001 From: ckie Date: Tue, 29 Nov 2022 19:47:47 +0200 Subject: [PATCH 2/2] pythonPackages.kaldi-active-grammar: fix compatability with OpenBLAS v0.3.21 --- .../python-modules/kaldi-active-grammar/fork.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix index bcd4720f500..7748e34df6f 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -70,6 +70,20 @@ stdenv.mkDerivation rec { postPatch = '' # Replace the shebangs for the various build scripts patchShebangs src + # Compatability with OpenBLAS 0.3.21 + substituteInPlace src/matrix/cblas-wrappers.h \ + --replace stptri_ LAPACK_stptri \ + --replace dtptri_ LAPACK_dtptri \ + --replace sgetrf_ LAPACK_sgetrf \ + --replace dgetrf_ LAPACK_dgetrf \ + --replace sgetri_ LAPACK_sgetri \ + --replace dgetri_ LAPACK_dgetri \ + --replace sgesvd_ LAPACK_sgesvd \ + --replace dgesvd_ LAPACK_dgesvd \ + --replace ssptri_ LAPACK_ssptri \ + --replace dsptri_ LAPACK_dsptri \ + --replace ssptrf_ LAPACK_ssptrf \ + --replace dsptrf_ LAPACK_dsptrf ''; configurePhase = ''