From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kIgZKHO6OGIS7gAAgWs5BA (envelope-from ) for ; Mon, 21 Mar 2022 18:48:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id gAfVIHO6OGJ1OgEAG6o9tA (envelope-from ) for ; Mon, 21 Mar 2022 18:48:35 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F0D78359FC for ; Mon, 21 Mar 2022 18:48:34 +0100 (CET) Received: from localhost ([::1]:41062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWM8w-0004hH-4s for larch@yhetil.org; Mon, 21 Mar 2022 13:48:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWM4Y-0001PT-N5 for guix-patches@gnu.org; Mon, 21 Mar 2022 13:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWM4Y-0005xV-Ef for guix-patches@gnu.org; Mon, 21 Mar 2022 13:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWM4Y-0006Wv-Cq for guix-patches@gnu.org; Mon, 21 Mar 2022 13:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54507] [PATCH 2/2] gnu: kaldi: Update to 498b25d, add vector fix patch, bypass tests References: <20220321173942.2206-1-rind38@disroot.org> In-Reply-To: <20220321173942.2206-1-rind38@disroot.org> Resent-From: Aurora Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Mar 2022 17:44: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.164788458524996 (code B ref 54507); Mon, 21 Mar 2022 17:44:02 +0000 Received: (at 54507) by debbugs.gnu.org; 21 Mar 2022 17:43:05 +0000 Received: from localhost ([127.0.0.1]:38129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWM3c-0006V5-Qf for submit@debbugs.gnu.org; Mon, 21 Mar 2022 13:43:05 -0400 Received: from knopi.disroot.org ([178.21.23.139]:43394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWM3X-0006US-C3 for 54507@debbugs.gnu.org; Mon, 21 Mar 2022 13:43:03 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7D0E8400BE; Mon, 21 Mar 2022 18:42:58 +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 RjZ2eMElPqqY; Mon, 21 Mar 2022 18:42:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1647884575; bh=mXcYEMgWwM+Y1jd2QJaxt4d0sLXiMW41idLMpIvR3E0=; h=From:To:Cc:Subject:Date; b=JMel0ChL2hUHpXTC3b5dhLVLoyTRU5ARKem39qNEhxYJL9y7yWaBjWy4LyG+NwaZO G2tdwsz2FrNJ0FUuMLi5ToeSX8UlSlERKvosof+Bpg5LLxz+ALUBFnmxvbkxd5PMcF shaA8q8It/kIFrrpGlBRalDAUC2dHWUwGlwzb1QX0j+wEZecB1t1Ms2G7LQzEc6sWR 22Z54x2auGfz6Sl+NK8bfgBxVLxKxTA8HB8oh3ZjCMSdDgdSM97tXKMpqJK0kmbpYl +weGf/4k5jRbjKmhb958EgvqWsk7fjyBB1YBZxIKRWepWQ78eIqyiUuRormEIncKVQ bmj33iKWb8yIA== Date: Mon, 21 Mar 2022 17:42:49 +0000 Message-Id: <20220321174249.2408-1-rind38@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Aurora X-ACL-Warn: , Aurora via Guix-patches From: Aurora via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647884915; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=1WgtoJzDwm98ooOCLZMyBu2fd9dKP88B39cbzXQAMYs=; b=lowEcizZE0g18w5nKpmgvmg3+upPrX9KDIgQLk+nLMdpHgSlVQ3uaTLr0OgBr7/pLCt1zz GqZBfSvWITf7y1/onPOP34P7/uBKxA7HQVNeDrwnNcQ8Moy+ZQFGNtKljm1o9JZQJWeCiK Kg4VFJ8+15Oamh/ZsQyDU59+DtcGEnLYamheyjG/tvbgok3O9PZLk/yaf5KGl5qs2Ie12U GQNMMsOk1h5+aCjCGS6Nz0iuxVd6st6Q7aQgaVfAYrHj3zT+JU4ENpgt9PYe74eeKFIXQ/ J+ImDlV0WxRL6+wTpSuLiHz+Ulds0uaZBOJbtMGQrL3BeNz1VZqzplI40UESOA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647884915; a=rsa-sha256; cv=none; b=cYNFejUMA2Jf0k154w918KId59CMrBFLr3JVpEPy2RgNLUoUWNLZLceL8996HHw/iaeJFU ctOzCBvNmU70+RTh5ORSyrBRRDjXigYN5NJDYwkf5Ng9YA3zxLRDsOdgnpxtFPAWK4s1Wc O32mWCleolEhnfp86naVqK4ITlSwSEjOXAT0gJNBrPEhlihyF3DAvIZIz8yDQeqGA0RNJn 7uCtmH/kqFtofCgPrXsMrK92uv9z+W7qQZWoUxDtDcBuCcehnLaDfPf9uAwHffo9xHJMnR uOKdmpOXLLyGS0yPhlnCrEhBaxZw8DrOvcQ62oB9c2AKO1xBn7t1nNzNJb4UKA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=JMel0ChL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.62 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=JMel0ChL; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: F0D78359FC X-Spam-Score: -2.62 X-Migadu-Scanner: scn0.migadu.com X-TUID: wxGxx/zIhySB The patch is in the process of being upstreamed: https://github.com/kaldi-asr/kaldi/pull/4713 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. --- gnu/packages/machine-learning.scm | 10 ++- ...or-casts-by-using-explicit-namespace.patch | 89 +++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/kaldi-Fix-vector-casts-by-using-explicit-namespace.patch diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ec70980..ba6a439 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 "498b25db122ec68a96aee154b9d829030adfae4c") + (revision "1") + (openfst openfst-1.7.3)) ;; Temporary bypass for upstream issues (package (name "kaldi") (version (git-version "0" revision commit)) @@ -1562,7 +1563,8 @@ discrete, and conditional dimensions.") (file-name (git-file-name name version)) (sha256 (base32 - "07k80my6f19mhrkwbzhjsnpf9871wmrwkl0ym468i830w67qyjrz")))) + "06wapq8xkr2xwkj10z70w20437kqjkf6v705z68h78zrgrj9dzj9")) + (patches (search-patches "kaldi-Fix-vector-casts-by-using-explicit-namespace.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -1586,6 +1588,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". diff --git a/gnu/packages/patches/kaldi-Fix-vector-casts-by-using-explicit-namespace.patch b/gnu/packages/patches/kaldi-Fix-vector-casts-by-using-explicit-namespace.patch new file mode 100644 index 0000000..5bae584 --- /dev/null +++ b/gnu/packages/patches/kaldi-Fix-vector-casts-by-using-explicit-namespace.patch @@ -0,0 +1,89 @@ +--- + src/onlinebin/online-audio-server-decode-faster.cc | 2 +- + src/onlinebin/online-gmm-decode-faster.cc | 4 ++-- + src/onlinebin/online-server-gmm-decode-faster.cc | 4 ++-- + src/onlinebin/online-wav-gmm-decode-faster.cc | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/onlinebin/online-audio-server-decode-faster.cc b/src/onlinebin/online-audio-server-decode-faster.cc +index ca4bfeb88..e5faf9530 100644 +--- a/src/onlinebin/online-audio-server-decode-faster.cc ++++ b/src/onlinebin/online-audio-server-decode-faster.cc +@@ -308,7 +308,7 @@ int32 main(int argc, char *argv[]) { + } else { + std::vector word_ids; + if (decoder.PartialTraceback(&out_fst)) { +- GetLinearSymbolSequence(out_fst, static_cast *>(0), ++ GetLinearSymbolSequence(out_fst, static_cast *>(0), + &word_ids, + static_cast(0)); + for (size_t i = 0; i < word_ids.size(); i++) { +diff --git a/src/onlinebin/online-gmm-decode-faster.cc b/src/onlinebin/online-gmm-decode-faster.cc +index 46904dbc5..74f381658 100644 +--- a/src/onlinebin/online-gmm-decode-faster.cc ++++ b/src/onlinebin/online-gmm-decode-faster.cc +@@ -166,7 +166,7 @@ int main(int argc, char *argv[]) { + std::vector word_ids; + decoder.FinishTraceBack(&out_fst); + fst::GetLinearSymbolSequence(out_fst, +- static_cast *>(0), ++ static_cast *>(0), + &word_ids, + static_cast(0)); + PrintPartialResult(word_ids, word_syms, partial_res || word_ids.size()); +@@ -181,7 +181,7 @@ int main(int argc, char *argv[]) { + std::vector word_ids; + if (decoder.PartialTraceback(&out_fst)) { + fst::GetLinearSymbolSequence(out_fst, +- static_cast *>(0), ++ static_cast *>(0), + &word_ids, + static_cast(0)); + PrintPartialResult(word_ids, word_syms, false); +diff --git a/src/onlinebin/online-server-gmm-decode-faster.cc b/src/onlinebin/online-server-gmm-decode-faster.cc +index 80973bf07..9840c0f88 100644 +--- a/src/onlinebin/online-server-gmm-decode-faster.cc ++++ b/src/onlinebin/online-server-gmm-decode-faster.cc +@@ -179,7 +179,7 @@ int main(int argc, char *argv[]) { + if (dstate & (decoder.kEndFeats | decoder.kEndUtt)) { + decoder.FinishTraceBack(&out_fst); + fst::GetLinearSymbolSequence(out_fst, +- static_cast *>(0), ++ static_cast *>(0), + &word_ids, + static_cast(0)); + SendPartialResult(word_ids, word_syms, partial_res || word_ids.size(), +@@ -188,7 +188,7 @@ int main(int argc, char *argv[]) { + } else { + if (decoder.PartialTraceback(&out_fst)) { + fst::GetLinearSymbolSequence(out_fst, +- static_cast *>(0), ++ static_cast *>(0), + &word_ids, + static_cast(0)); + SendPartialResult(word_ids, word_syms, false, +diff --git a/src/onlinebin/online-wav-gmm-decode-faster.cc b/src/onlinebin/online-wav-gmm-decode-faster.cc +index fe7c6d6b9..ca482934d 100644 +--- a/src/onlinebin/online-wav-gmm-decode-faster.cc ++++ b/src/onlinebin/online-wav-gmm-decode-faster.cc +@@ -196,7 +196,7 @@ int main(int argc, char *argv[]) { + std::vector word_ids; + decoder.FinishTraceBack(&out_fst); + fst::GetLinearSymbolSequence(out_fst, +- static_cast *>(0), ++ static_cast *>(0), + &word_ids, + static_cast(0)); + PrintPartialResult(word_ids, word_syms, partial_res || word_ids.size()); +@@ -220,7 +220,7 @@ int main(int argc, char *argv[]) { + std::vector word_ids; + if (decoder.PartialTraceback(&out_fst)) { + fst::GetLinearSymbolSequence(out_fst, +- static_cast *>(0), ++ static_cast *>(0), + &word_ids, + static_cast(0)); + PrintPartialResult(word_ids, word_syms, false); +-- +2.30.2 + -- 2.30.2