diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bc7c34fa..2906f9180 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,4 +14,4 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) option(BUILD_SOX "Build libsox statically" ON) add_subdirectory(paddlespeech/audio/third_party) -add_subdirectory(paddlespeech/audio//csrc) +add_subdirectory(paddlespeech/audio/src) diff --git a/paddlespeech/audio/csrc/CMakeLists.txt b/paddlespeech/audio/src/CMakeLists.txt similarity index 100% rename from paddlespeech/audio/csrc/CMakeLists.txt rename to paddlespeech/audio/src/CMakeLists.txt diff --git a/paddlespeech/audio/csrc/pybind/kaldi_frontend/CMakeLists.txt b/paddlespeech/audio/src/pybind/kaldi_frontend/CMakeLists.txt similarity index 86% rename from paddlespeech/audio/csrc/pybind/kaldi_frontend/CMakeLists.txt rename to paddlespeech/audio/src/pybind/kaldi_frontend/CMakeLists.txt index 7cb240aab..b9212210a 100644 --- a/paddlespeech/audio/csrc/pybind/kaldi_frontend/CMakeLists.txt +++ b/paddlespeech/audio/src/pybind/kaldi_frontend/CMakeLists.txt @@ -1,6 +1,4 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/paddlespeech/audio/csrc/pybind/kaldi_frontend/feature_common.h b/paddlespeech/audio/src/pybind/kaldi_frontend/feature_common.h similarity index 100% rename from paddlespeech/audio/csrc/pybind/kaldi_frontend/feature_common.h rename to paddlespeech/audio/src/pybind/kaldi_frontend/feature_common.h diff --git a/paddlespeech/audio/csrc/pybind/kaldi_frontend/feature_common_inl.h b/paddlespeech/audio/src/pybind/kaldi_frontend/feature_common_inl.h similarity index 100% rename from paddlespeech/audio/csrc/pybind/kaldi_frontend/feature_common_inl.h rename to paddlespeech/audio/src/pybind/kaldi_frontend/feature_common_inl.h diff --git a/paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature.cc b/paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature.cc similarity index 100% rename from paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature.cc rename to paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature.cc diff --git a/paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature.h b/paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature.h similarity index 100% rename from paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature.h rename to paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature.h diff --git a/paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature_wrapper.cc b/paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature_wrapper.cc similarity index 100% rename from paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature_wrapper.cc rename to paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature_wrapper.cc diff --git a/paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature_wrapper.h b/paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature_wrapper.h similarity index 100% rename from paddlespeech/audio/csrc/pybind/kaldi_frontend/kaldi_feature_wrapper.h rename to paddlespeech/audio/src/pybind/kaldi_frontend/kaldi_feature_wrapper.h diff --git a/paddlespeech/audio/csrc/pybind/pybind.cpp b/paddlespeech/audio/src/pybind/pybind.cpp similarity index 100% rename from paddlespeech/audio/csrc/pybind/pybind.cpp rename to paddlespeech/audio/src/pybind/pybind.cpp diff --git a/paddlespeech/audio/csrc/pybind/sox/io.cpp b/paddlespeech/audio/src/pybind/sox/io.cpp similarity index 100% rename from paddlespeech/audio/csrc/pybind/sox/io.cpp rename to paddlespeech/audio/src/pybind/sox/io.cpp diff --git a/paddlespeech/audio/csrc/pybind/sox/io.h b/paddlespeech/audio/src/pybind/sox/io.h similarity index 100% rename from paddlespeech/audio/csrc/pybind/sox/io.h rename to paddlespeech/audio/src/pybind/sox/io.h diff --git a/paddlespeech/audio/csrc/pybind/sox/utils.cpp b/paddlespeech/audio/src/pybind/sox/utils.cpp similarity index 100% rename from paddlespeech/audio/csrc/pybind/sox/utils.cpp rename to paddlespeech/audio/src/pybind/sox/utils.cpp diff --git a/paddlespeech/audio/csrc/pybind/sox/utils.h b/paddlespeech/audio/src/pybind/sox/utils.h similarity index 100% rename from paddlespeech/audio/csrc/pybind/sox/utils.h rename to paddlespeech/audio/src/pybind/sox/utils.h diff --git a/paddlespeech/audio/third_party/kaldi/CMakeLists.txt b/paddlespeech/audio/third_party/kaldi/CMakeLists.txt index d68540cb4..66346a268 100644 --- a/paddlespeech/audio/third_party/kaldi/CMakeLists.txt +++ b/paddlespeech/audio/third_party/kaldi/CMakeLists.txt @@ -1,6 +1,5 @@ project(kaldi) - add_library(kaldi-base base/io-funcs.cc base/kaldi-error.cc diff --git a/speechx/speechx/kaldi/base/kaldi-types.h b/speechx/speechx/kaldi/base/kaldi-types.h index 23ef4c4c5..351366f1f 100644 --- a/speechx/speechx/kaldi/base/kaldi-types.h +++ b/speechx/speechx/kaldi/base/kaldi-types.h @@ -42,7 +42,7 @@ typedef float BaseFloat; // for discussion on what to do if you need compile kaldi // without OpenFST, see the bottom of this this file -#ifndef COMPILE_WITHOUT_OPENFST +#if (COMPILE_WITHOUT_OPENFST != 0) #include