2024.5.16 测试整体构建

kaldi/CMakeLists.txt

@@ -12,7 +12,7 @@ add_library(kaldi-util
   util/simple-io-funcs.cc
   util/text-utils.cc
 )
-target_link_libraries(kaldi-util PUBLIC utils ${OPENFST_LIBRARYS})
+target_link_libraries(kaldi-util PUBLIC utils)
 
 add_library(kaldi-decoder
   lat/determinize-lattice-pruned.cc

kaldi/base/kaldi-error.h

@@ -17,8 +17,8 @@
 #ifndef KALDI_BASE_KALDI_ERROR_H_
 #define KALDI_BASE_KALDI_ERROR_H_ 1
 
-#include "fst/log.h"
-
+#include "kaldi-types.h"
+#include <glog/logging.h>
 namespace kaldi {
 
 #define KALDI_WARN \
@@ -32,7 +32,7 @@ namespace kaldi {
 #define KALDI_ASSERT(condition) CHECK(condition)
 
 /***** PROGRAM NAME AND VERBOSITY LEVEL *****/
-
+using namespace kaldi;
 /// Called by ParseOptions to set base name (no directory) of the executing
 /// program. The name is printed in logging code along with every message,
 /// because in our scripts, we often mix together the stderr of many programs.

kaldi/base/kaldi-types.h

@@ -41,22 +41,22 @@ typedef float BaseFloat;
 
 // for discussion on what to do if you need compile kaldi
 // without OpenFST, see the bottom of this this file
-#include <fst/types.h>
-
-namespace kaldi {
-using ::int16;
-using ::int32;
-using ::int64;
-using ::uint16;
-using ::uint32;
-using ::uint64;
-typedef float float32;
-typedef double double64;
-}  // end namespace kaldi
+//#include <fst/types.h>
+//
+//namespace kaldi {
+//using ::int16;
+//using ::int32;
+//using ::int64;
+//using ::uint16;
+//using ::uint32;
+//using ::uint64;
+//typedef float float32;
+//typedef double double64;
+//}  // end namespace kaldi
 
 // In a theoretical case you decide compile Kaldi without the OpenFST
 // comment the previous namespace statement and uncomment the following
-/*
+
 namespace kaldi {
   typedef int8_t   int8;
   typedef int16_t  int16;
@@ -70,6 +70,6 @@ namespace kaldi {
   typedef float    float32;
   typedef double   double64;
 }  // end namespace kaldi
-*/
+
 
 #endif  // KALDI_BASE_KALDI_TYPES_H_