2024.5.16 测试整体构建

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");

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");

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 {
 

decoder/asr_model.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "utils/timer.h"
-#include "utils/utils.h"
+#include "../utils/wn_utils.h"
 
 namespace wenet {
 

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 {
 

decoder/ctc_prefix_beam_search.cc

@@ -20,7 +20,7 @@
 #include <utility>
 
 #include "utils/log.h"
-#include "utils/utils.h"
+#include "../utils/wn_utils.h"
 
 namespace wenet {
 

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 {
 

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 {
 

decoder/onnx_asr_model.cc

@@ -21,7 +21,7 @@
 #include <memory>
 #include <utility>
 
-#include "utils/string.h"
+#include "utils/wn_string.h"
 
 namespace wenet {
 

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 {
 

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");
 

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 {
 

grpc/grpc_client.h

@@ -26,7 +26,7 @@
 #include <thread>
 
 #include "grpc/wenet.grpc.pb.h"
-#include "utils/utils.h"
+#include "../utils/wn_utils.h"
 
 namespace wenet {
 

post_processor/processor/post_processor.cc

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

post_processor/processor/post_processor.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 #include "wetext_processor.h"
-#include "../../utils/utils.h"
+#include "../../utils/wn_utils.h"
 
 namespace wenet {
 

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)

utils/blocking_queue.h

@@ -22,7 +22,7 @@
 #include <utility>
 #include <vector>
 
-#include "utils/utils.h"
+#include "wn_utils.h"
 
 namespace wenet {
 

utils/string.cc → 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 <sstream>
 #include <string>
 #include <vector>
 
-#include "utils/log.h"
-#include "utils/utils.h"
+#include "log.h"
+#include "wn_utils.h"
 
 namespace wenet {
 

utils/string.h → utils/wn_string.h

@@ -20,7 +20,6 @@
 #include <memory>
 #include <string>
 #include <vector>
-
 #include "fst/symbol-table.h"
 
 namespace wenet {

utils/utils.cc → 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 <algorithm>
 #include <cmath>
@@ -21,7 +22,7 @@
 #include <utility>
 #include <vector>
 
-#include "utils/log.h"
+
 
 namespace wenet {