From f099daf834fb87d7920c4cffde3fb4d04c33a140 Mon Sep 17 00:00:00 2001
From: Gian Jaeger <gianjaeger@Gians-MBP.mynet>
Date: Thu, 12 Mar 2026 19:16:51 +0000
Subject: [PATCH] Fix compilation errors: update kaldi, fix k3.cc and m3.cc for
 openfst 1.8.x

---
 ext/k3.cc | 8 ++++----
 ext/kaldi | 2 +-
 ext/m3.cc | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/k3.cc b/ext/k3.cc
index 836d563d..7a50491a 100644
--- a/ext/k3.cc
+++ b/ext/k3.cc
@@ -15,6 +15,9 @@
 #include "cudamatrix/cu-device.h"
 #endif
 
+#include <string>
+using std::string;
+
 const int arate = 8000;
 
 void ConfigFeatureInfo(kaldi::OnlineNnet2FeaturePipelineInfo& info,
@@ -96,10 +99,7 @@ int main(int argc, char *argv[]) {
 
 #ifdef HAVE_CUDA
     fprintf(stdout, "Cuda enabled\n");
-    CuDevice &cu_device = CuDevice::Instantiate();
-    cu_device.SetVerbose(true);
-    cu_device.SelectGpuId("yes");
-    fprintf(stdout, "active gpu: %d\n", cu_device.ActiveGpuId());
+    CuDevice::Instantiate().SelectGpuId("yes");
 #endif
     const std::string ivector_model_dir = nnet_dir + "/ivector_extractor";
     const std::string nnet3_rxfilename = nnet_dir + "/final.mdl";
diff --git a/ext/kaldi b/ext/kaldi
index 8c451e28..e02e35f0 160000
--- a/ext/kaldi
+++ b/ext/kaldi
@@ -1 +1 @@
-Subproject commit 8c451e28582f5d91f84ea3d64bb76c794c3b1683
+Subproject commit e02e35f0254bb033fab73d1df99fc34123e31d56
diff --git a/ext/m3.cc b/ext/m3.cc
index 1c8f4c52..fb1a3316 100644
--- a/ext/m3.cc
+++ b/ext/m3.cc
@@ -9,6 +9,7 @@
 #include "util/common-utils.h"
 #include <fst/script/arcsort.h>
 #include <fst/script/compile.h>
+#include <fst/symbol-table.h>
 
 int main(int argc, char *argv[]) {
 	using namespace kaldi;
@@ -65,11 +66,10 @@ int main(int argc, char *argv[]) {
 		}
 
 		// fstcompile
-		const SymbolTable *ssyms = 0;
-		fst::SymbolTableTextOptions opts;
-		const SymbolTable *isyms = SymbolTable::ReadText(words_filename, opts);
+		SymbolTable *ssyms = 0;
+		fst::SymbolTable *isyms = fst::SymbolTable::ReadText(words_filename);
 		if (!isyms) { return 1; }
-		const SymbolTable *osyms = SymbolTable::ReadText(words_filename, opts);
+		fst::SymbolTable *osyms = fst::SymbolTable::ReadText(words_filename);
 		if (!osyms) { return 1; }
 		std::ifstream grammar_fst_file(grammar_fst_filename.c_str());
 		FstCompiler<StdArc> fstcompiler(grammar_fst_file, "", isyms,