From patchwork Wed Apr 23 23:08:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41960 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A057827BC4A; Thu, 24 Apr 2025 00:09:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF59927BC49 for ; Thu, 24 Apr 2025 00:09:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7jDF-0004vW-RY; Wed, 23 Apr 2025 19:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7jDC-0004uT-Nt for guix-patches@gnu.org; Wed, 23 Apr 2025 19:09:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7jDC-00037l-F0 for guix-patches@gnu.org; Wed, 23 Apr 2025 19:09:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=1q1PJhmmB97rhJ+TbDqU+UrN44gYa+vxQAp1dv3Hs7A=; b=QlX3YM4bNUFWcGkjnWFlPCC8JJqFJQ6blY9GatRNubl12PA3caA1WNqCK1qjza2EyfjYlgDOiGQii8XP7Ed2vTn+fxifjx++lVO0mwvOHimSAG/cKc4lZ6fmw0eGJI7fxSfMlW2oUoW6ywAhck9JIno4vl/FfW0NwgIWc+MquOGklZ2BxxRieDq4OiFZEayjLXCOscSs9Rz4hqAPiPQ3BxHcgCKkivI9wTn9mD3fatU06oyWFbM1Fsmbn53RV7Xuuj7RUYVmzsnReAiHXlaFKHWJuNNQu6NkQl83CRUYdW9/f/OGJfVz/sZgEGZqOpkAEuQHPvp91Zs1doUnSW34vw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7jDC-0005Wa-9q for guix-patches@gnu.org; Wed, 23 Apr 2025 19:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78022] [PATCH 1/8] gnu: kaldi-for-vosk: Update to 0-1.bc5baf1. References: <20250423225836.31487-1-ngraves@ngraves.fr> In-Reply-To: <20250423225836.31487-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Apr 2025 23:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78022@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78022-submit@debbugs.gnu.org id=B78022.174544971321105 (code B ref 78022); Wed, 23 Apr 2025 23:09:02 +0000 Received: (at 78022) by debbugs.gnu.org; 23 Apr 2025 23:08:33 +0000 Received: from localhost ([127.0.0.1]:59513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7jCi-0005UE-6T for submit@debbugs.gnu.org; Wed, 23 Apr 2025 19:08:32 -0400 Received: from 2.mo562.mail-out.ovh.net ([178.33.252.217]:43431) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u7jCf-0005TQ-IV for 78022@debbugs.gnu.org; Wed, 23 Apr 2025 19:08:30 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZjZXW3Ddbz1R4d; Wed, 23 Apr 2025 23:08:27 +0000 (UTC) Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net. [127.0.0.1]) by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78022@debbugs.gnu.org>; Wed, 23 Apr 2025 23:08:27 +0000 (UTC) Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.9.74]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZjZXW2fkPzyDF; Wed, 23 Apr 2025 23:08:27 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 06F57263A36; Wed, 23 Apr 2025 23:08:26 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-102R0044cda2d99-9b2f-4301-821b-cfb4da15fa6a, 299BDCF71F74AF9523BA0ED19DF3CA9E8A5786D9) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Thu, 24 Apr 2025 01:08:05 +0200 Message-ID: <20250423230821.1141-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 8280712341202985698 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvgeejkeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedtvddvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=1q1PJhmmB97rhJ+TbDqU+UrN44gYa+vxQAp1dv3Hs7A=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745449707; v=1; b=Iwg8uiuRWI56dOSLRdHLY/bPJ571KuUYz7IRfCmC4BqSLB7zvcgikRjDMBqJnEPjzC297PKo i9FTdQcvpaMwv7MjKREQHmPOF4lS0k/KxONsLhxJNtWCGu3XerF1YOa3ue01v+Z0eC2YSof6dk/ p2a698401QAawqARU/T2fXHvoNawAoNnwi//9T9US3T0CukQ387FsbUhm7odmtVsWdp1qK3Ziak 5ADMcdP+p/VMjZr5XmipSd/HrWK9kFEYAfcPt1O/oDsA+MdpvC2XKNxjrB/V7clnSHzvyhb1Swd /k3GjAEQUX7wxHJ7yWjnuW0CXqgyIS2qJxOiah4FDxN9w== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/kaldi-openblas-0.3.29-compatibility.patch: Add patch. * gnu/local.mk: Record patch. * gnu/packages/machine-learning.scm (kaldi-for-vosk): Update to 0-1.bc5baf1. [origin]: Record patch. --- gnu/local.mk | 1 + gnu/packages/machine-learning.scm | 9 ++- .../kaldi-openblas-0.3.29-compatibility.patch | 70 +++++++++++++++++++ 3 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/kaldi-openblas-0.3.29-compatibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4aa84f8ef96..9f0ed220d07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1680,6 +1680,7 @@ dist_patch_DATA = \ %D%/packages/patches/lightdm-vnc-color-depth.patch \ %D%/packages/patches/lightdm-vncserver-check.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ + %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch \ %D%/packages/patches/kcontacts-incorrect-country-name.patch \ %D%/packages/patches/kde-cli-tools-delay-mime-db.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index c4dd9e2c2dd..964e2aceb49 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3044,8 +3044,9 @@ (define-public kaldi (license license:asl2.0)))) (define kaldi-for-vosk - (let* ((commit "a25f216f5ce4eec5e45a6ab7651e20c9840a05cd") - (revision "0") + ;; Commit of branch "vosk" + (let* ((commit "bc5baf14231660bd50b7d05788865b4ac6c34481") + (revision "1") (openfst openfst-for-vosk)) (package (inherit kaldi) @@ -3059,7 +3060,9 @@ (define kaldi-for-vosk (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "16w90za8narkfi590cxj4p7vc1f5sdxc927g5hk6kh4l3mf6iisl")))) + (base32 "1y3d6918srr7cn5r72v5wvbdwz9p9j2bjw1x78sfis2r2k60lllw")) + (patches + (search-patches "kaldi-openblas-0.3.29-compatibility.patch")))) (inputs (list alsa-lib glib diff --git a/gnu/packages/patches/kaldi-openblas-0.3.29-compatibility.patch b/gnu/packages/patches/kaldi-openblas-0.3.29-compatibility.patch new file mode 100644 index 00000000000..c00e742e433 --- /dev/null +++ b/gnu/packages/patches/kaldi-openblas-0.3.29-compatibility.patch @@ -0,0 +1,70 @@ +From c8febca41cecf68f468f346409735c90ed340a5e Mon Sep 17 00:00:00 2001 +Message-ID: +From: Nicolas Graves +Date: Tue, 22 Apr 2025 17:57:34 +0200 +Subject: [PATCH] Openblas@0.3.29 compatibility. + +--- + src/matrix/cblas-wrappers.h | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/matrix/cblas-wrappers.h b/src/matrix/cblas-wrappers.h +index f869ab7e0..bcc2c2b75 100644 +--- a/src/matrix/cblas-wrappers.h ++++ b/src/matrix/cblas-wrappers.h +@@ -383,10 +383,10 @@ inline void mul_elements( + // add clapack here + #if !defined(HAVE_ATLAS) + inline void clapack_Xtptri(KaldiBlasInt *num_rows, float *Mdata, KaldiBlasInt *result) { +- stptri_(const_cast("U"), const_cast("N"), num_rows, Mdata, result); ++ stptri_(const_cast("U"), const_cast("N"), num_rows, Mdata, result, 1, 1); + } + inline void clapack_Xtptri(KaldiBlasInt *num_rows, double *Mdata, KaldiBlasInt *result) { +- dtptri_(const_cast("U"), const_cast("N"), num_rows, Mdata, result); ++ dtptri_(const_cast("U"), const_cast("N"), num_rows, Mdata, result, 1, 1); + } + // + inline void clapack_Xgetrf2(KaldiBlasInt *num_rows, KaldiBlasInt *num_cols, +@@ -420,7 +420,7 @@ inline void clapack_Xgesvd(char *v, char *u, KaldiBlasInt *num_cols, + sgesvd_(v, u, + num_cols, num_rows, Mdata, stride, + sv, Vdata, vstride, Udata, ustride, +- p_work, l_work, result); ++ p_work, l_work, result, 1, 1); + } + inline void clapack_Xgesvd(char *v, char *u, KaldiBlasInt *num_cols, + KaldiBlasInt *num_rows, double *Mdata, KaldiBlasInt *stride, +@@ -430,25 +430,25 @@ inline void clapack_Xgesvd(char *v, char *u, KaldiBlasInt *num_cols, + dgesvd_(v, u, + num_cols, num_rows, Mdata, stride, + sv, Vdata, vstride, Udata, ustride, +- p_work, l_work, result); ++ p_work, l_work, result, 1, 1); + } + // + void inline clapack_Xsptri(KaldiBlasInt *num_rows, float *Mdata, + KaldiBlasInt *ipiv, float *work, KaldiBlasInt *result) { +- ssptri_(const_cast("U"), num_rows, Mdata, ipiv, work, result); ++ ssptri_(const_cast("U"), num_rows, Mdata, ipiv, work, result, 1); + } + void inline clapack_Xsptri(KaldiBlasInt *num_rows, double *Mdata, + KaldiBlasInt *ipiv, double *work, KaldiBlasInt *result) { +- dsptri_(const_cast("U"), num_rows, Mdata, ipiv, work, result); ++ dsptri_(const_cast("U"), num_rows, Mdata, ipiv, work, result, 1); + } + // + void inline clapack_Xsptrf(KaldiBlasInt *num_rows, float *Mdata, + KaldiBlasInt *ipiv, KaldiBlasInt *result) { +- ssptrf_(const_cast("U"), num_rows, Mdata, ipiv, result); ++ ssptrf_(const_cast("U"), num_rows, Mdata, ipiv, result, 1); + } + void inline clapack_Xsptrf(KaldiBlasInt *num_rows, double *Mdata, + KaldiBlasInt *ipiv, KaldiBlasInt *result) { +- dsptrf_(const_cast("U"), num_rows, Mdata, ipiv, result); ++ dsptrf_(const_cast("U"), num_rows, Mdata, ipiv, result, 1); + } + #else + inline void clapack_Xgetrf(MatrixIndexT num_rows, MatrixIndexT num_cols, +-- +2.49.0 +