Browse Source

2024.5.16 测试整体构建

master
Administrator 1 year ago
parent
commit
9802ddac53
8 changed files with 92 additions and 9 deletions
  1. +1
    -1
      decoder/asr_decoder.h
  2. +1
    -1
      decoder/params.h
  3. +1
    -0
      kaldi/base/kaldi-common.h
  4. +3
    -2
      kaldi/base/kaldi-error.h
  5. +81
    -0
      kaldi/fst/log.h
  6. +1
    -1
      post_processor/CMakeLists.txt
  7. +2
    -2
      post_processor/processor/post_processor.cc
  8. +2
    -2
      post_processor/processor/post_processor.h

+ 1
- 1
decoder/asr_decoder.h

@ -32,7 +32,7 @@
#include "decoder/ctc_wfst_beam_search.h" #include "decoder/ctc_wfst_beam_search.h"
#include "decoder/search_interface.h" #include "decoder/search_interface.h"
#include "frontend/feature_pipeline.h" #include "frontend/feature_pipeline.h"
#include "post_processor/post_processor.h"
#include "../post_processor/processor/post_processor.h"
#include "utils/utils.h" #include "utils/utils.h"
namespace wenet { namespace wenet {

+ 1
- 1
decoder/params.h

@ -38,7 +38,7 @@
#include "ov/ov_asr_model.h" #include "ov/ov_asr_model.h"
#endif #endif
#include "frontend/feature_pipeline.h" #include "frontend/feature_pipeline.h"
#include "post_processor/post_processor.h"
#include "../post_processor/processor/post_processor.h"
#include "utils/file.h" #include "utils/file.h"
#include "utils/flags.h" #include "utils/flags.h"
#include "utils/string.h" #include "utils/string.h"

+ 1
- 0
kaldi/base/kaldi-common.h

@ -34,6 +34,7 @@
#include "base/kaldi-error.h" #include "base/kaldi-error.h"
#include "base/kaldi-types.h" #include "base/kaldi-types.h"
#include "base/kaldi-utils.h" #include "base/kaldi-utils.h"
#include "fst/log.h"
// #include "base/io-funcs.h" // #include "base/io-funcs.h"
#include "base/kaldi-math.h" #include "base/kaldi-math.h"
// #include "base/timer.h" // #include "base/timer.h"

+ 3
- 2
kaldi/base/kaldi-error.h

@ -19,7 +19,8 @@
#include "kaldi-types.h" #include "kaldi-types.h"
namespace kaldi { namespace kaldi {
#ifndef _LOGGING_H_
#include "glog/logging.h"
#define KALDI_WARN \ #define KALDI_WARN \
google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING).stream() google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING).stream()
#define KALDI_ERR \ #define KALDI_ERR \
@ -29,7 +30,7 @@ namespace kaldi {
#define KALDI_VLOG(v) VLOG(v) #define KALDI_VLOG(v) VLOG(v)
#define KALDI_ASSERT(condition) CHECK(condition) #define KALDI_ASSERT(condition) CHECK(condition)
#endif
/***** PROGRAM NAME AND VERBOSITY LEVEL *****/ /***** PROGRAM NAME AND VERBOSITY LEVEL *****/
/// Called by ParseOptions to set base name (no directory) of the executing /// Called by ParseOptions to set base name (no directory) of the executing

+ 81
- 0
kaldi/fst/log.h

@ -0,0 +1,81 @@
// 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_;
};
#ifndef _LOGGING_H_
#define LOG(type) LogMessage(#type).stream()
#define VLOG(level) if ((level) <= FST_FLAGS_v) LOG(INFO)
#endif
// 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_

+ 1
- 1
post_processor/CMakeLists.txt

@ -1,7 +1,7 @@
message(STATUS "post_processor dir:${CMAKE_CURRENT_SOURCE_DIR}") message(STATUS "post_processor dir:${CMAKE_CURRENT_SOURCE_DIR}")
add_library(post_processor STATIC add_library(post_processor STATIC
post_processor.cc
processor/post_processor.cc
utils/wetext_string.cc utils/wetext_string.cc
processor/wetext_processor.cc processor/wetext_processor.cc
processor/wetext_token_parser.cc processor/wetext_token_parser.cc

post_processor/post_processor.cc → post_processor/processor/post_processor.cc

@ -16,8 +16,8 @@
#include "post_processor.h" #include "post_processor.h"
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include "processor/wetext_processor.h"
#include "utils/string.h"
#include "wetext_processor.h"
#include "../../utils/string.h"
namespace wenet { namespace wenet {
void PostProcessor::InitITNResource(const std::string& tagger_path, void PostProcessor::InitITNResource(const std::string& tagger_path,

post_processor/post_processor.h → post_processor/processor/post_processor.h

@ -19,8 +19,8 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <utility> #include <utility>
#include "processor/wetext_processor.h"
#include "utils/utils.h"
#include "wetext_processor.h"
#include "../../utils/utils.h"
namespace wenet { namespace wenet {

Loading…
Cancel
Save