diff --git a/decoder/asr_decoder.h b/decoder/asr_decoder.h index 6e93d22..32688f2 100644 --- a/decoder/asr_decoder.h +++ b/decoder/asr_decoder.h @@ -32,7 +32,7 @@ #include "decoder/ctc_wfst_beam_search.h" #include "decoder/search_interface.h" #include "frontend/feature_pipeline.h" -#include "post_processor/post_processor.h" +#include "../post_processor/processor/post_processor.h" #include "utils/utils.h" namespace wenet { diff --git a/decoder/params.h b/decoder/params.h index 9a10b23..3511e7a 100644 --- a/decoder/params.h +++ b/decoder/params.h @@ -38,7 +38,7 @@ #include "ov/ov_asr_model.h" #endif #include "frontend/feature_pipeline.h" -#include "post_processor/post_processor.h" +#include "../post_processor/processor/post_processor.h" #include "utils/file.h" #include "utils/flags.h" #include "utils/string.h" diff --git a/kaldi/base/kaldi-common.h b/kaldi/base/kaldi-common.h index f8b9397..f41b655 100644 --- a/kaldi/base/kaldi-common.h +++ b/kaldi/base/kaldi-common.h @@ -34,6 +34,7 @@ #include "base/kaldi-error.h" #include "base/kaldi-types.h" #include "base/kaldi-utils.h" +#include "fst/log.h" // #include "base/io-funcs.h" #include "base/kaldi-math.h" // #include "base/timer.h" diff --git a/kaldi/base/kaldi-error.h b/kaldi/base/kaldi-error.h index 90948c1..e4c9ad3 100644 --- a/kaldi/base/kaldi-error.h +++ b/kaldi/base/kaldi-error.h @@ -19,7 +19,8 @@ #include "kaldi-types.h" namespace kaldi { - +#ifndef _LOGGING_H_ +#include "glog/logging.h" #define KALDI_WARN \ google::LogMessage(__FILE__, __LINE__, google::GLOG_WARNING).stream() #define KALDI_ERR \ @@ -29,7 +30,7 @@ namespace kaldi { #define KALDI_VLOG(v) VLOG(v) #define KALDI_ASSERT(condition) CHECK(condition) - +#endif /***** PROGRAM NAME AND VERBOSITY LEVEL *****/ /// Called by ParseOptions to set base name (no directory) of the executing diff --git a/kaldi/fst/log.h b/kaldi/fst/log.h new file mode 100644 index 0000000..78675b5 --- /dev/null +++ b/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 +#include +#include +#include +#include +#include + +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(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_ \ No newline at end of file diff --git a/post_processor/CMakeLists.txt b/post_processor/CMakeLists.txt index 228764b..a5232d0 100644 --- a/post_processor/CMakeLists.txt +++ b/post_processor/CMakeLists.txt @@ -1,7 +1,7 @@ message(STATUS "post_processor dir:${CMAKE_CURRENT_SOURCE_DIR}") add_library(post_processor STATIC - post_processor.cc + processor/post_processor.cc utils/wetext_string.cc processor/wetext_processor.cc processor/wetext_token_parser.cc diff --git a/post_processor/post_processor.cc b/post_processor/processor/post_processor.cc similarity index 97% rename from post_processor/post_processor.cc rename to post_processor/processor/post_processor.cc index b65010a..486d779 100644 --- a/post_processor/post_processor.cc +++ b/post_processor/processor/post_processor.cc @@ -16,8 +16,8 @@ #include "post_processor.h" #include #include -#include "processor/wetext_processor.h" -#include "utils/string.h" +#include "wetext_processor.h" +#include "../../utils/string.h" namespace wenet { void PostProcessor::InitITNResource(const std::string& tagger_path, diff --git a/post_processor/post_processor.h b/post_processor/processor/post_processor.h similarity index 97% rename from post_processor/post_processor.h rename to post_processor/processor/post_processor.h index b05aee6..8e99c71 100644 --- a/post_processor/post_processor.h +++ b/post_processor/processor/post_processor.h @@ -19,8 +19,8 @@ #include #include #include -#include "processor/wetext_processor.h" -#include "utils/utils.h" +#include "wetext_processor.h" +#include "../../utils/utils.h" namespace wenet {