From 98b367412733fbffe9b1e0570c666f7832c5436e Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 17 May 2024 17:18:11 +0800 Subject: [PATCH] =?UTF-8?q?2024.5.16=20=E6=B5=8B=E8=AF=95=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/decoder_main.cc | 4 ++-- bin/label_checker_main.cc | 2 +- decoder/asr_decoder.h | 2 +- decoder/asr_model.h | 2 +- decoder/context_graph.cc | 4 ++-- decoder/ctc_prefix_beam_search.cc | 2 +- decoder/ctc_prefix_beam_search.h | 2 +- decoder/ctc_wfst_beam_search.h | 2 +- decoder/onnx_asr_model.cc | 2 +- decoder/onnx_asr_model.h | 2 +- decoder/params.h | 2 +- decoder/torch_asr_model.h | 2 +- grpc/grpc_client.h | 2 +- post_processor/processor/post_processor.cc | 2 +- post_processor/processor/post_processor.h | 2 +- utils/CMakeLists.txt | 5 +++-- utils/blocking_queue.h | 2 +- utils/{string.cc => wn_string.cc} | 6 +++--- utils/{string.h => wn_string.h} | 1 - utils/{utils.cc => wn_utils.cc} | 5 +++-- utils/{utils.h => wn_utils.h} | 0 21 files changed, 27 insertions(+), 26 deletions(-) rename utils/{string.cc => wn_string.cc} (98%) rename utils/{string.h => wn_string.h} (99%) rename utils/{utils.cc => wn_utils.cc} (98%) rename utils/{utils.h => wn_utils.h} (100%) diff --git a/bin/decoder_main.cc b/bin/decoder_main.cc index b05b5f5..ef05cfa 100644 --- a/bin/decoder_main.cc +++ b/bin/decoder_main.cc @@ -19,10 +19,10 @@ #include "decoder/params.h" #include "frontend/wav.h" #include "utils/flags.h" -#include "utils/string.h" +#include "utils/wn_string.h" #include "utils/thread_pool.h" #include "utils/timer.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" DEFINE_bool(simulate_streaming, false, "simulate streaming input"); DEFINE_bool(output_nbest, false, "output n-best of decode result"); diff --git a/bin/label_checker_main.cc b/bin/label_checker_main.cc index a06dfe1..5c460f7 100644 --- a/bin/label_checker_main.cc +++ b/bin/label_checker_main.cc @@ -20,7 +20,7 @@ #include "decoder/params.h" #include "frontend/wav.h" #include "utils/flags.h" -#include "utils/string.h" +#include "utils/wn_string.h" DEFINE_string(text, "", "kaldi style text input file"); DEFINE_string(wav_scp, "", "kaldi style wav scp"); diff --git a/decoder/asr_decoder.h b/decoder/asr_decoder.h index 32688f2..a69f9fd 100644 --- a/decoder/asr_decoder.h +++ b/decoder/asr_decoder.h @@ -33,7 +33,7 @@ #include "decoder/search_interface.h" #include "frontend/feature_pipeline.h" #include "../post_processor/processor/post_processor.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/decoder/asr_model.h b/decoder/asr_model.h index d100dd8..36ca854 100644 --- a/decoder/asr_model.h +++ b/decoder/asr_model.h @@ -10,7 +10,7 @@ #include #include "utils/timer.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/decoder/context_graph.cc b/decoder/context_graph.cc index 1fd3e16..09ded50 100644 --- a/decoder/context_graph.cc +++ b/decoder/context_graph.cc @@ -20,8 +20,8 @@ #include "fst/determinize.h" -#include "utils/string.h" -#include "utils/utils.h" +#include "utils/wn_string.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/decoder/ctc_prefix_beam_search.cc b/decoder/ctc_prefix_beam_search.cc index fa01f0f..3bcf50b 100644 --- a/decoder/ctc_prefix_beam_search.cc +++ b/decoder/ctc_prefix_beam_search.cc @@ -20,7 +20,7 @@ #include #include "utils/log.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/decoder/ctc_prefix_beam_search.h b/decoder/ctc_prefix_beam_search.h index 3f88285..678ae26 100644 --- a/decoder/ctc_prefix_beam_search.h +++ b/decoder/ctc_prefix_beam_search.h @@ -22,7 +22,7 @@ #include "decoder/context_graph.h" #include "decoder/search_interface.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/decoder/ctc_wfst_beam_search.h b/decoder/ctc_wfst_beam_search.h index c02048b..92ff812 100644 --- a/decoder/ctc_wfst_beam_search.h +++ b/decoder/ctc_wfst_beam_search.h @@ -21,7 +21,7 @@ #include "decoder/context_graph.h" #include "decoder/search_interface.h" #include "kaldi/decoder/lattice-faster-online-decoder.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/decoder/onnx_asr_model.cc b/decoder/onnx_asr_model.cc index fc7afc7..688a502 100644 --- a/decoder/onnx_asr_model.cc +++ b/decoder/onnx_asr_model.cc @@ -21,7 +21,7 @@ #include #include -#include "utils/string.h" +#include "utils/wn_string.h" namespace wenet { diff --git a/decoder/onnx_asr_model.h b/decoder/onnx_asr_model.h index f5d9e9a..b3e5c0a 100644 --- a/decoder/onnx_asr_model.h +++ b/decoder/onnx_asr_model.h @@ -26,7 +26,7 @@ #include "decoder/asr_model.h" #include "utils/log.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/decoder/params.h b/decoder/params.h index 3511e7a..9de694e 100644 --- a/decoder/params.h +++ b/decoder/params.h @@ -41,7 +41,7 @@ #include "../post_processor/processor/post_processor.h" #include "utils/file.h" #include "utils/flags.h" -#include "utils/string.h" +#include "utils/wn_string.h" DEFINE_int32(device_id, 0, "set XPU DeviceID for ASR model"); diff --git a/decoder/torch_asr_model.h b/decoder/torch_asr_model.h index a3cebe0..7bb7d82 100644 --- a/decoder/torch_asr_model.h +++ b/decoder/torch_asr_model.h @@ -26,7 +26,7 @@ #endif #include "decoder/asr_model.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/grpc/grpc_client.h b/grpc/grpc_client.h index 36e36a0..b221513 100644 --- a/grpc/grpc_client.h +++ b/grpc/grpc_client.h @@ -26,7 +26,7 @@ #include #include "grpc/wenet.grpc.pb.h" -#include "utils/utils.h" +#include "../utils/wn_utils.h" namespace wenet { diff --git a/post_processor/processor/post_processor.cc b/post_processor/processor/post_processor.cc index 486d779..db86453 100644 --- a/post_processor/processor/post_processor.cc +++ b/post_processor/processor/post_processor.cc @@ -17,7 +17,7 @@ #include #include #include "wetext_processor.h" -#include "../../utils/string.h" +#include "../../utils/wn_string.h" namespace wenet { void PostProcessor::InitITNResource(const std::string& tagger_path, diff --git a/post_processor/processor/post_processor.h b/post_processor/processor/post_processor.h index 8e99c71..b798b39 100644 --- a/post_processor/processor/post_processor.h +++ b/post_processor/processor/post_processor.h @@ -20,7 +20,7 @@ #include #include #include "wetext_processor.h" -#include "../../utils/utils.h" +#include "../../utils/wn_utils.h" namespace wenet { diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 6863626..a8a1b24 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,6 +1,7 @@ +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_library(utils STATIC - string.cc - utils.cc + wn_string.cc + wn_utils.cc ) if(NOT ANDROID) diff --git a/utils/blocking_queue.h b/utils/blocking_queue.h index 9bf0127..658f68b 100644 --- a/utils/blocking_queue.h +++ b/utils/blocking_queue.h @@ -22,7 +22,7 @@ #include #include -#include "utils/utils.h" +#include "wn_utils.h" namespace wenet { diff --git a/utils/string.cc b/utils/wn_string.cc similarity index 98% rename from utils/string.cc rename to utils/wn_string.cc index ea9609b..064d7e6 100644 --- a/utils/string.cc +++ b/utils/wn_string.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "utils/string.h" +#include "wn_string.h" #include #include #include -#include "utils/log.h" -#include "utils/utils.h" +#include "log.h" +#include "wn_utils.h" namespace wenet { diff --git a/utils/string.h b/utils/wn_string.h similarity index 99% rename from utils/string.h rename to utils/wn_string.h index bf7a52a..3b8a930 100644 --- a/utils/string.h +++ b/utils/wn_string.h @@ -20,7 +20,6 @@ #include #include #include - #include "fst/symbol-table.h" namespace wenet { diff --git a/utils/utils.cc b/utils/wn_utils.cc similarity index 98% rename from utils/utils.cc rename to utils/wn_utils.cc index c37e36c..5d8a2a5 100644 --- a/utils/utils.cc +++ b/utils/wn_utils.cc @@ -12,7 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "utils/utils.h" +#include "wn_utils.h" +#include "log.h" #include #include @@ -21,7 +22,7 @@ #include #include -#include "utils/log.h" + namespace wenet { diff --git a/utils/utils.h b/utils/wn_utils.h similarity index 100% rename from utils/utils.h rename to utils/wn_utils.h