[bug#54507] [PATCH 2/2] gnu: kaldi: Update to 498b25d, add vector fix patch, bypass tests

[Aurora]

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<int32> word_ids;
+           if (decoder.PartialTraceback(&out_fst)) {
+-            GetLinearSymbolSequence(out_fst, static_cast<vector<int32> *>(0),
++            GetLinearSymbolSequence(out_fst, static_cast<std::vector<int32> 
*>(0),
+                                     &word_ids,
+                                     static_cast<LatticeArc::Weight*>(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<int32> word_ids;
+         decoder.FinishTraceBack(&out_fst);
+         fst::GetLinearSymbolSequence(out_fst,
+-                                     static_cast<vector<int32> *>(0),
++                                     static_cast<std::vector<int32> *>(0),
+                                      &word_ids,
+                                      static_cast<LatticeArc::Weight*>(0));
+         PrintPartialResult(word_ids, word_syms, partial_res || 
word_ids.size());
+@@ -181,7 +181,7 @@ int main(int argc, char *argv[]) {
+         std::vector<int32> word_ids;
+         if (decoder.PartialTraceback(&out_fst)) {
+           fst::GetLinearSymbolSequence(out_fst,
+-                                       static_cast<vector<int32> *>(0),
++                                       static_cast<std::vector<int32> *>(0),
+                                        &word_ids,
+                                        static_cast<LatticeArc::Weight*>(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<vector<int32> *>(0),
++                                     static_cast<std::vector<int32> *>(0),
+                                      &word_ids,
+                                      static_cast<LatticeArc::Weight*>(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<vector<int32> *>(0),
++                                       static_cast<std::vector<int32> *>(0),
+                                        &word_ids,
+                                        static_cast<LatticeArc::Weight*>(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<int32> word_ids;
+           decoder.FinishTraceBack(&out_fst);
+           fst::GetLinearSymbolSequence(out_fst,
+-                                       static_cast<vector<int32> *>(0),
++                                       static_cast<std::vector<int32> *>(0),
+                                        &word_ids,
+                                        static_cast<LatticeArc::Weight*>(0));
+           PrintPartialResult(word_ids, word_syms, partial_res || 
word_ids.size());
+@@ -220,7 +220,7 @@ int main(int argc, char *argv[]) {
+           std::vector<int32> word_ids;
+           if (decoder.PartialTraceback(&out_fst)) {
+             fst::GetLinearSymbolSequence(out_fst,
+-                                        static_cast<vector<int32> *>(0),
++                                        static_cast<std::vector<int32> *>(0),
+                                         &word_ids,
+                                         static_cast<LatticeArc::Weight*>(0));
+             PrintPartialResult(word_ids, word_syms, false);
+-- 
+2.30.2
+
-- 
2.30.2