From patchwork Thu Mar 24 19:59:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurora X-Patchwork-Id: 38045 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 7BCDF27BBE9; Thu, 24 Mar 2022 20:00:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 402B427BBE9 for ; Thu, 24 Mar 2022 20:00:18 +0000 (GMT) Received: from localhost ([::1]:48672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXTd3-0008G7-8P for patchwork@mira.cbaines.net; Thu, 24 Mar 2022 16:00:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXTcp-0008Fd-CL for guix-patches@gnu.org; Thu, 24 Mar 2022 16:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXTcp-0006Jv-2g for guix-patches@gnu.org; Thu, 24 Mar 2022 16:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nXTcp-0005w4-10 for guix-patches@gnu.org; Thu, 24 Mar 2022 16:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54507] [PATCH v3 1/3] gnu: openfst: Add 1.7.3 for kaldi Resent-From: Aurora Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Mar 2022 20:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54507@debbugs.gnu.org Cc: Aurora Received: via spool by 54507-submit@debbugs.gnu.org id=B54507.164815198822738 (code B ref 54507); Thu, 24 Mar 2022 20:00:02 +0000 Received: (at 54507) by debbugs.gnu.org; 24 Mar 2022 19:59:48 +0000 Received: from localhost ([127.0.0.1]:49462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXTca-0005ug-JL for submit@debbugs.gnu.org; Thu, 24 Mar 2022 15:59:48 -0400 Received: from knopi.disroot.org ([178.21.23.139]:42978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXTcY-0005uY-Qx for 54507@debbugs.gnu.org; Thu, 24 Mar 2022 15:59:47 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 181DD4027E; Thu, 24 Mar 2022 20:59:46 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V_DPIx9fJoJx; Thu, 24 Mar 2022 20:59:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1648151980; bh=0ME0fzs8CBvjMN9pvtMfBRrFEOYg7iIsBB3fzQwT1qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lv2eKEBjnPDUKdLS2npIHHuzMX+06jm6j08bWwsh+9yT/Zg+6G0F6v4RKtrTul0Xp JkkhtnO+1zD4vRNdc/pY2ClRI+tKcLKITP42bKalEqxKzUkFQkoUWm3z/CQlTSQjNy k/4S9fwnxTz/Ju4804fvNPhsQU0G8Tn9WQZJuklyyOHi/azcEp6QLRo4e56QMhL6NY Njedjx5fH4vBkdn1pWWFU/+KIPx96e6LYoc7qxXQBt0lmL/2PbV/IXLfxbuWGZLaHn B8DnRSZAE6MXv2zQFgWztyIQBLQdCoEKeqhL8XRlDEwVg/RpCi1HLRz7g2pjg8CTRm WBb2Ma4ej8KzQ== Date: Thu, 24 Mar 2022 19:59:31 +0000 Message-Id: <20220324195933.2129-2-rind38@disroot.org> In-Reply-To: <20220324195933.2129-1-rind38@disroot.org> References: <877d8ji5tl.fsf@disp3269> <20220324195933.2129-1-rind38@disroot.org> Mime-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Aurora X-ACL-Warn: , Aurora via Guix-patches X-Patchwork-Original-From: Aurora via Guix-patches via From: Aurora X-getmail-retrieved-from-mailbox: Patches Kaldi is currently broken with openfst versions newer than 1.7.3 as it changed some of its function signatures. Once Kaldi is patched/fixed, this should be removed. Reference Issues: - https://github.com/kaldi-asr/kaldi/issues/4131 - https://github.com/kaldi-asr/kaldi/issues/4393 --- gnu/packages/machine-learning.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index afac56f..ec70980 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -585,6 +585,19 @@ sample proximities between pairs of cases.") optimizing, and searching weighted finite-state transducers (FSTs).") (license license:asl2.0))) +;; This is a temporary addition to bypass upstream issues with the kaldi +;; package. +(define-public openfst-1.7.3 + (package (inherit openfst) + (version "1.7.3") + (source (origin + (method url-fetch) + (uri (string-append "http://www.openfst.org/twiki/pub/FST/" + "FstDownload/openfst-" version ".tar.gz")) + (sha256 + (base32 + "038a60w7y8qnbxmcrsim9rafz9mihsny8xv50jpzlr7rl166pp5q")))))) + (define-public shogun (package (name "shogun") From patchwork Thu Mar 24 19:59:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurora X-Patchwork-Id: 38046 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 1B0E527BBEA; Thu, 24 Mar 2022 20:00:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 D746527BBE9 for ; Thu, 24 Mar 2022 20:00:29 +0000 (GMT) Received: from localhost ([::1]:49094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXTdE-00007o-W0 for patchwork@mira.cbaines.net; Thu, 24 Mar 2022 16:00:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXTcq-0008Fp-5F for guix-patches@gnu.org; Thu, 24 Mar 2022 16:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXTcp-0006OS-RN for guix-patches@gnu.org; Thu, 24 Mar 2022 16:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nXTcp-0005wD-PX for guix-patches@gnu.org; Thu, 24 Mar 2022 16:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54507] [PATCH v3 2/3] gnu: kaldi: Update to dd107fd, bypass tests Resent-From: Aurora Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Mar 2022 20:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54507@debbugs.gnu.org Cc: Aurora Received: via spool by 54507-submit@debbugs.gnu.org id=B54507.164815200122790 (code B ref 54507); Thu, 24 Mar 2022 20:00:03 +0000 Received: (at 54507) by debbugs.gnu.org; 24 Mar 2022 20:00:01 +0000 Received: from localhost ([127.0.0.1]:49466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXTce-0005uy-Qv for submit@debbugs.gnu.org; Thu, 24 Mar 2022 16:00:01 -0400 Received: from knopi.disroot.org ([178.21.23.139]:44210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXTcc-0005up-Sp for 54507@debbugs.gnu.org; Thu, 24 Mar 2022 15:59:51 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 394D140280; Thu, 24 Mar 2022 20:59:50 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id Pgvs2dzoYT4D; Thu, 24 Mar 2022 20:59:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1648151983; bh=5nVP53q6gVYezY+Cd4DNzTIpKde1WxbhQmeqOWDA0+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N4UsQ87lrmAtFh6Vh+HM6plxmqw+p3J1pU2P+AAF4Usu32LM5n3bHyovPG4zpTYR4 U9FVEx3HVm3iEOWNs2D7ckXwQmnjhd6HcZ76zk4EPECcp9lWE77gbp0Z2iF/lJ4TEn 1a769/UhYNaYIQgGzpilo02Rv31UI/0ex+tQ6kkH2/ojUV+0UV6cKEKs/WvDuisR7l Vu69jotAzolx2jth6KGBJMiD79jWUD44w9s5+K18gyo14xEt+h38s+Sh0oB7EhK+y1 qHqzuZv7Via6owCQZGZYB/Jc1gC4O+X2+nLI1WzuBofs0qAYB5mccxy7qFxYKjQLTN jmKsn/FNbkvHw== Date: Thu, 24 Mar 2022 19:59:32 +0000 Message-Id: <20220324195933.2129-3-rind38@disroot.org> In-Reply-To: <20220324195933.2129-1-rind38@disroot.org> References: <877d8ji5tl.fsf@disp3269> <20220324195933.2129-1-rind38@disroot.org> Mime-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Aurora X-ACL-Warn: , Aurora via Guix-patches X-Patchwork-Original-From: Aurora via Guix-patches via From: Aurora X-getmail-retrieved-from-mailbox: Patches Either kaldi's tests are broken or openblas has reintroduced a bug: - https://github.com/kaldi-asr/kaldi/pull/4421 More testing & fixes required upstream to re-enable the tests later. For now they'll just have to be ignored. --- gnu/packages/machine-learning.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ec70980..ddc1392 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1549,8 +1549,9 @@ discrete, and conditional dimensions.") ;; There have been no proper releases yet. (define-public kaldi - (let ((commit "d4791c0f3fc1a09c042dac365e120899ee2ad21e") - (revision "2")) + (let ((commit "dd107fd594ac58af962031c1689abfdc10f84452") + (revision "0") + (openfst openfst-1.7.3)) ;; Temporary bypass for upstream issues (package (name "kaldi") (version (git-version "0" revision commit)) @@ -1562,7 +1563,7 @@ discrete, and conditional dimensions.") (file-name (git-file-name name version)) (sha256 (base32 - "07k80my6f19mhrkwbzhjsnpf9871wmrwkl0ym468i830w67qyjrz")))) + "0iqbzgn7gzmgwvjfzifpbwwidxx887qmlgmsjkg7b1yzyfv00l21")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -1586,6 +1587,8 @@ discrete, and conditional dimensions.") "gst-plugin/Makefile") (("../../tools/portaudio/install") (assoc-ref inputs "portaudio"))) + (substitute* "matrix/Makefile" ;; temporary test bypass + (("matrix-lib-test sparse-matrix-test") "")) ;; This `configure' script doesn't support variables passed as ;; arguments, nor does it support "prefix". From patchwork Thu Mar 24 19:59:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurora X-Patchwork-Id: 38047 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 4537727BBEA; Thu, 24 Mar 2022 20:01:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 0F1E927BBE9 for ; Thu, 24 Mar 2022 20:01:23 +0000 (GMT) Received: from localhost ([::1]:49366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXTe6-0000Q5-7a for patchwork@mira.cbaines.net; Thu, 24 Mar 2022 16:01:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXTdm-0000Pq-8f for guix-patches@gnu.org; Thu, 24 Mar 2022 16:01:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXTdl-0006c3-Vp for guix-patches@gnu.org; Thu, 24 Mar 2022 16:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nXTdl-0005yx-VJ for guix-patches@gnu.org; Thu, 24 Mar 2022 16:01:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54507] [PATCH v3 3/3] gnu: openfst-1.7.3: Enable ngram-fst extension & C++14 build Resent-From: Aurora Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Mar 2022 20:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54507@debbugs.gnu.org Cc: Aurora Received: via spool by 54507-submit@debbugs.gnu.org id=B54507.164815200622852 (code B ref 54507); Thu, 24 Mar 2022 20:01:01 +0000 Received: (at 54507) by debbugs.gnu.org; 24 Mar 2022 20:00:06 +0000 Received: from localhost ([127.0.0.1]:49469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXTcn-0005vX-Ce for submit@debbugs.gnu.org; Thu, 24 Mar 2022 16:00:06 -0400 Received: from knopi.disroot.org ([178.21.23.139]:44704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXTcf-0005ux-3s for 54507@debbugs.gnu.org; Thu, 24 Mar 2022 15:59:53 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5DEE84026F; Thu, 24 Mar 2022 20:59:52 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KY58DJMi1-UH; Thu, 24 Mar 2022 20:59:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1648151986; bh=8HZtzF2zHvkJi3A0WV0G4TAg5UXIzus7NxIFaMzE0TY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Dik83LYFaNiVJW1ZodC4ZsCwh/+5kOgioMPG8HO1/LdG8sj/88jnihrkthT0pccws RYYM7RhW+pfnDKFz2YOujyIyTygjtOAMiKl0rWlVEcKO22mde/sb+gzunFalgZN70d b0qUcPFS7f0poSUMLUuy4QjccSiCOmzGNhIsrxb4EwuXa8/6HlaUgs91y/3X4N15iL ZDjipXegDicPDPuGAwyh55QF7WfxfoWgA6KMhDTb5H4AX+XIP98q9EHV+TRWmCdNb9 yV8/e2qlvrtRYs8+AdYdx9tqI7sG/hrucir9LmREG0hxDGoWCR0OyptwlAf3EbTPQB Kxmls0uAXaO5Q== Date: Thu, 24 Mar 2022 19:59:33 +0000 Message-Id: <20220324195933.2129-4-rind38@disroot.org> In-Reply-To: <20220324195933.2129-1-rind38@disroot.org> References: <877d8ji5tl.fsf@disp3269> <20220324195933.2129-1-rind38@disroot.org> Mime-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Aurora X-ACL-Warn: , Aurora via Guix-patches X-Patchwork-Original-From: Aurora via Guix-patches via From: Aurora X-getmail-retrieved-from-mailbox: Patches The extension doesn't build in old versions of openfst such as 1.7.3 without manually setting CXXFLAGS. This package definition, including this workaround to build extensions successfully, will need to be removed once kaldi is fixed upstream and can be used with up-to-date versions of openfst. --- gnu/packages/machine-learning.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ddc1392..d4a3604 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -596,7 +596,9 @@ optimizing, and searching weighted finite-state transducers (FSTs).") "FstDownload/openfst-" version ".tar.gz")) (sha256 (base32 - "038a60w7y8qnbxmcrsim9rafz9mihsny8xv50jpzlr7rl166pp5q")))))) + "038a60w7y8qnbxmcrsim9rafz9mihsny8xv50jpzlr7rl166pp5q")))) + (arguments '(#:configure-flags '("--enable-ngram-fsts" "CXXFLAGS=-std=c++14") + #:make-flags '("CXXFLAGS=-std=c++14"))))) (define-public shogun (package