From 6bd24c99dff32a8e44dcfb545e9822b79d8558a0 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 18 May 2024 09:53:38 +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 --- CMakeLists.txt | 2 +- frontend/fbank.h | 4 +++- frontend/feature_pipeline.h | 1 - utils/CMakeLists.txt | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cd8867..4041b7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ endif() include(openfst) #wenet个人项目内容 include_directories( - + ${OPENFST_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} # ${CMAKE_CURRENT_SOURCE_DIR}/kaldi ) diff --git a/frontend/fbank.h b/frontend/fbank.h index f2218d6..066cd55 100644 --- a/frontend/fbank.h +++ b/frontend/fbank.h @@ -22,7 +22,9 @@ #include #include "frontend/fft.h" -#include "utils/wn_log.h" +#ifndef FST_LOG_H_ +#include "fst/log.h" +#endif namespace wenet { diff --git a/frontend/feature_pipeline.h b/frontend/feature_pipeline.h index 3e51574..048134b 100644 --- a/frontend/feature_pipeline.h +++ b/frontend/feature_pipeline.h @@ -23,7 +23,6 @@ #include "fbank.h" #include "utils/blocking_queue.h" -#include "utils/wn_log.h" namespace wenet { diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 3ecfc09..b5a276e 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -1,5 +1,3 @@ -message(-----------------${OPENFST_INCLUDE_DIR}--------------------) -include_directories(${OPENFST_INCLUDE_DIR}) add_library(utils STATIC wn_string.cc wn_utils.cc