2024.5.16 测试整体构建

CMakeLists.txt

@@ -31,7 +31,6 @@ endif()
 include(openfst)
 #wenet个人项目内容
 include_directories(
-        ${OPENFST_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/kaldi
 )

kaldi/base/kaldi-error.h

@@ -16,11 +16,7 @@
 
 #ifndef KALDI_BASE_KALDI_ERROR_H_
 #define KALDI_BASE_KALDI_ERROR_H_ 1
-
-#ifndef FST_LOG_H_
-#pragma message("fst/log.h is included")
-#include "fst/log.h"
-#endif
+#include "kaldi-types.h"
 
 namespace kaldi {
 

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_

kaldi/fst/log.h

@@ -1,82 +0,0 @@
-// Copyright 2005-2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the 'License');
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an 'AS IS' BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// See www.openfst.org for extensive documentation on this weighted
-// finite-state transducer library.
-//
-// Google-style logging declarations and inline definitions.
-
-#ifndef FST_LOG_H_
-#define FST_LOG_H_
-
-#include <cassert>
-#include <cstdlib>
-#include <iostream>
-#include <ostream>
-#include <string_view>
-
-#include <fst/flags.h>
-
-class LogMessage;
-class LogMessage;
-
-DECLARE_int32(v);
-
-class LogMessage {
- public:
-  explicit LogMessage(std::string_view type) : fatal_(type == "FATAL") {
-    std::cerr << type << ": ";
-  }
-
-  ~LogMessage() {
-    std::cerr << std::endl;
-    if (fatal_) exit(1);
-  }
-
-  std::ostream &stream() { return std::cerr; }
-
- private:
-  bool fatal_;
-};
-
-#define LOG(type) LogMessage(#type).stream()
-#define VLOG(level) if ((level) <= FST_FLAGS_v) LOG(INFO)
-
-// Checks.
-inline void FstCheck(bool x, std::string_view expr, std::string_view file,
-                     int line) {
-  if (!x) {
-    LOG(FATAL) << "Check failed: \"" << expr << "\" file: " << file
-               << " line: " << line;
-  }
-}
-
-#define CHECK(x) FstCheck(static_cast<bool>(x), #x, __FILE__, __LINE__)
-#define CHECK_EQ(x, y) CHECK((x) == (y))
-#define CHECK_LT(x, y) CHECK((x) < (y))
-#define CHECK_GT(x, y) CHECK((x) > (y))
-#define CHECK_LE(x, y) CHECK((x) <= (y))
-#define CHECK_GE(x, y) CHECK((x) >= (y))
-#define CHECK_NE(x, y) CHECK((x) != (y))
-
-// Debug checks.
-#define DCHECK(x) assert(x)
-#define DCHECK_EQ(x, y) DCHECK((x) == (y))
-#define DCHECK_LT(x, y) DCHECK((x) < (y))
-#define DCHECK_GT(x, y) DCHECK((x) > (y))
-#define DCHECK_LE(x, y) DCHECK((x) <= (y))
-#define DCHECK_GE(x, y) DCHECK((x) >= (y))
-#define DCHECK_NE(x, y) DCHECK((x) != (y))
-
-#endif  // FST_LOG_H_