sox can build

3 years ago · 52477a1030
parent d63895fc88
commit 52477a1030
9 changed files with 103 additions and 81 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -13,8 +13,10 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.15.0)
  cmake_policy(SET CMP0092 NEW)
 endif()

+
 project(paddlespeech)

+
 # check and set CMAKE_CXX_STANDARD
 string(FIND "${CMAKE_CXX_FLAGS}" "-std=c++" env_cxx_standard)
 if(env_cxx_standard GREATER -1)
@ -27,23 +29,38 @@ endif()
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_C_STANDARD 11)

-
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_VERBOSE_MAKEFILE ON)


+
 # Options
 option(BUILD_SOX "Build libsox statically" ON)
 option(BUILD_MAD "Enable libmad" ON)
+option(BUILD_KALDI "Build kaldi statically" ON)
 option(BUILD_PADDLEAUDIO_PYTHON_EXTENSION "Build Python extension" ON)

-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")

+# cmake
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${PROJECT_SOURCE_DIR}/cmake;${PROJECT_SOURCE_DIR}/cmake/external")
+
+
+# fc_patch dir
+set(FETCHCONTENT_QUIET off)
+get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
+set(FETCHCONTENT_BASE_DIR ${fc_patch})
+
+
+include(openblas)
+# include(pybind)
+
+# packages
 find_package(Python3 COMPONENTS Interpreter Development)
 find_package(pybind11 CONFIG)
-message(STATUS "Python_INCLUDE_DIR=" ${Python_INCLUDE_DIR})

+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -fPIC -O0 -Wall -g")
 add_subdirectory(paddlespeech/audio)

 # Summary
--- a/paddlespeech/audio/cmake/FindGFortranLibs.cmake
+++ b/paddlespeech/audio/cmake/FindGFortranLibs.cmake
--- a/paddlespeech/audio/cmake/external/openblas.cmake
+++ b/paddlespeech/audio/cmake/external/openblas.cmake
@ -1,4 +1,5 @@
 include(FetchContent)
+include(ExternalProject)

 set(OpenBLAS_SOURCE_DIR ${fc_patch}/OpenBLAS-src)
 set(OpenBLAS_PREFIX ${fc_patch}/OpenBLAS-prefix)
--- a/paddlespeech/audio/cmake/external/pybind.cmake
+++ b/paddlespeech/audio/cmake/external/pybind.cmake
@ -1,4 +1,6 @@
 include(FetchContent)
+include(ExternalProject)
+
 FetchContent_Declare(
  pybind
  URL      https://github.com/pybind/pybind11/archive/refs/tags/v2.9.0.zip 
--- a/cmake/summary.cmake
+++ b/cmake/summary.cmake
@ -33,9 +33,8 @@ function (onnx_print_configuration_summary)
  message(STATUS "  Protobuf includes         : ${PROTOBUF_INCLUDE_DIRS}")
  message(STATUS "  Protobuf libraries        : ${PROTOBUF_LIBRARIES}")
  message(STATUS "  BUILD_ONNX_PYTHON         : ${BUILD_ONNX_PYTHON}")
-  if (${BUILD_ONNX_PYTHON})
-    message(STATUS "    Python version        : ${PY_VERSION}")
-    message(STATUS "    Python executable     : ${PYTHON_EXECUTABLE}")
-    message(STATUS "    Python includes       : ${PYTHON_INCLUDE_DIR}")
-  endif()
+  message(STATUS "    Python version        : ${Python_VERSION}")
+  message(STATUS "    Python executable     : ${Python_EXECUTABLE}")
+  message(STATUS "    Python includes       : ${Python_INCLUDE_DIRS}")
+
 endfunction()
--- a/paddlespeech/audio/CMakeLists.txt
+++ b/paddlespeech/audio/CMakeLists.txt
@ -1,40 +1,3 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-
-project(paddleaudio VERSION 0.1)
-
-string(FIND "${CMAKE_CXX_FLAGS}" "-std=c++" env_cxx_standard)
-
-# cmake dir
-set(paddleaudio_cmake_dir ${PROJECT_SOURCE_DIR}/cmake)
-
-# Modules
-list(APPEND CMAKE_MODULE_PATH ${paddleaudio_cmake_dir}/external)
-list(APPEND CMAKE_MODULE_PATH ${paddleaudio_cmake_dir})
-include(FetchContent)
-include(ExternalProject)
-
-# fc_patch dir
-set(FETCHCONTENT_QUIET off)
-get_filename_component(fc_patch "fc_patch" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
-set(FETCHCONTENT_BASE_DIR ${fc_patch})
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -fPIC -O0 -Wall -g")
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-option(BUILD_SOX "Build libsox statically" ON)
-
-
-# checkout the thirdparty/kaldi/base/kaldi-types.h
-# compile kaldi without openfst
-add_definitions("-DCOMPILE_WITHOUT_OPENFST")
-
-include(openblas)
-# include(pybind)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/third_party/kaldi)
-include_directories(/usr/include/python3.7m)

 add_subdirectory(third_party)
 add_subdirectory(src)
--- a/paddlespeech/audio/third_party/CMakeLists.txt
+++ b/paddlespeech/audio/third_party/CMakeLists.txt
@ -1,11 +1,16 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

+################################################################################
+# sox
+################################################################################
 if (BUILD_SOX)
  add_subdirectory(sox)
 endif()

-include_directories(
-${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_CURRENT_SOURCE_DIR}/kaldi
-)
-add_subdirectory(kaldi)
+################################################################################
+# kaldi
+################################################################################
+if (BUILD_KALDI)
+  add_subdirectory(kaldi)
+  message(STATUS "Build Kaldi")
+endif()
--- a/paddlespeech/audio/third_party/kaldi/CMakeLists.txt
+++ b/paddlespeech/audio/third_party/kaldi/CMakeLists.txt
@ -1,14 +1,58 @@
-project(kaldi)
+# checkout the thirdparty/kaldi/base/kaldi-types.h
+# compile kaldi without openfst
+add_definitions("-DCOMPILE_WITHOUT_OPENFST")

-add_library(kaldi-base  
+# include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../third_party/kaldi)
+# include_directories(/usr/include/python3.7m)
+
+set(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+# function (define_library name source include_dirs link_libraries compile_defs)
+#   add_library(${name} INTERFACE ${source})
+#   target_include_directories(${name} INTERFACE ${include_dirs})
+#   target_link_libraries(${name} INTERFACE ${link_libraries})
+#   target_compile_definitions(${name} INTERFACE ${compile_defs})
+#   set_target_properties(${name} PROPERTIES PREFIX "")
+#   if (MSVC)
+#     set_target_properties(${name} PROPERTIES SUFFIX ".pyd")
+#   endif(MSVC)
+#   install(
+#     TARGETS ${name}
+#     LIBRARY DESTINATION lib
+#     RUNTIME DESTINATION lib  # For Windows
+#     )
+# endfunction()
+
+# kaldi-base
+add_library(kaldi-base INTERFACE
  base/io-funcs.cc
  base/kaldi-error.cc
  base/kaldi-math.cc
  base/kaldi-utils.cc
  base/timer.cc
 )
+target_include_directories(kaldi-base INTERFACE ${INSTALL_DIR}/base)
+target_compile_definitions(kaldi-base INTERFACE "-DCOMPILE_WITHOUT_OPENFST")
+
+# kaldi-matrix
+add_library(kaldi-matrix INTERFACE
+  matrix/compressed-matrix.cc
+  matrix/kaldi-matrix.cc
+  matrix/kaldi-vector.cc
+  matrix/matrix-functions.cc
+  matrix/optimization.cc
+  matrix/packed-matrix.cc
+  matrix/qr.cc
+  matrix/sparse-matrix.cc
+  matrix/sp-matrix.cc
+  matrix/srfft.cc
+  matrix/tp-matrix.cc
+)
+target_include_directories(kaldi-matrix INTERFACE ${INSTALL_DIR}/matrix)
+target_link_libraries(kaldi-matrix INTERFACE gfortran kaldi-base libopenblas.a)

-add_library(kaldi-util
+# kaldi-util
+add_library(kaldi-util INTERFACE
  util/kaldi-holder.cc
  util/kaldi-io.cc
  util/kaldi-semaphore.cc
@ -19,19 +63,11 @@ add_library(kaldi-util
  util/simple-options.cc
  util/text-utils.cc
 )
-target_link_libraries(kaldi-util PUBLIC kaldi-base kaldi-matrix)
-
-add_library(kaldi-mfcc
-  feat/feature-mfcc.cc
-)
-target_link_libraries(kaldi-mfcc PUBLIC kaldi-feat-common)
+target_include_directories(kaldi-util INTERFACE ${INSTALL_DIR}/util)
+target_link_libraries(kaldi-util INTERFACE kaldi-base kaldi-matrix)

-add_library(kaldi-fbank
-  feat/feature-fbank.cc
-)
-target_link_libraries(kaldi-fbank PUBLIC kaldi-feat-common)
-
-add_library(kaldi-feat-common
+# kaldi-feat-common
+add_library(kaldi-feat-common INTERFACE
  feat/wave-reader.cc
  feat/signal.cc
  feat/feature-functions.cc
@ -40,20 +76,19 @@ add_library(kaldi-feat-common
  feat/mel-computations.cc
  feat/cmvn.cc
 )
-target_link_libraries(kaldi-feat-common PUBLIC kaldi-base kaldi-matrix kaldi-util)
+target_include_directories(kaldi-feat-common INTERFACE ${INSTALL_DIR}/feat)
+target_link_libraries(kaldi-feat-common INTERFACE kaldi-base kaldi-matrix kaldi-util)

-add_library(kaldi-matrix
-  matrix/compressed-matrix.cc
-  matrix/kaldi-matrix.cc
-  matrix/kaldi-vector.cc
-  matrix/matrix-functions.cc
-  matrix/optimization.cc
-  matrix/packed-matrix.cc
-  matrix/qr.cc
-  matrix/sparse-matrix.cc
-  matrix/sp-matrix.cc
-  matrix/srfft.cc
-  matrix/tp-matrix.cc
+# kaldi-mfcc
+add_library(kaldi-mfcc INTERFACE
+  feat/feature-mfcc.cc
 )
-target_link_libraries(kaldi-matrix gfortran kaldi-base libopenblas.a)
+target_include_directories(kaldi-mfcc INTERFACE ${INSTALL_DIR}/feat)
+target_link_libraries(kaldi-mfcc INTERFACE kaldi-feat-common)

+# kaldi-fbank
+add_library(kaldi-fbank INTERFACE
+  feat/feature-fbank.cc
+)
+target_include_directories(kaldi-fbank INTERFACE ${INSTALL_DIR}/feat)
+target_link_libraries(kaldi-fbank INTERFACE kaldi-feat-common)
--- a/tools/setup_helpers/extension.py
+++ b/tools/setup_helpers/extension.py
@ -35,7 +35,7 @@ def _get_build(var, default=False):
 _BUILD_SOX = False if platform.system() == "Windows" else _get_build(
    "BUILD_SOX", True)
 _BUILD_MAD = _get_build("BUILD_MAD", False)
-# _BUILD_KALDI = False if platform.system() == "Windows" else _get_build("BUILD_KALDI", True)
+_BUILD_KALDI = False if platform.system() == "Windows" else _get_build("BUILD_KALDI", True)
 # _BUILD_RNNT = _get_build("BUILD_RNNT", True)
 # _BUILD_CTC_DECODER = False if platform.system() == "Windows" else _get_build("BUILD_CTC_DECODER", True)
 # _USE_FFMPEG = _get_build("USE_FFMPEG", False)
@ -88,7 +88,7 @@ class CMakeBuild(build_ext):
            # f"-DCMAKE_PREFIX_PATH={torch.utils.cmake_prefix_path}",
            f"-DCMAKE_INSTALL_PREFIX={extdir}",
            "-DCMAKE_VERBOSE_MAKEFILE=ON",
-            f"-DPython_INCLUDE_DIR={distutils.sysconfig.get_python_inc()}",
+            f"-DPython_INCLUDE_DIRS={distutils.sysconfig.get_python_inc()}",
            f"-DBUILD_SOX:BOOL={'ON' if _BUILD_SOX else 'OFF'}",
            f"-DBUILD_MAD:BOOL={'ON' if _BUILD_MAD else 'OFF'}",
            # f"-DBUILD_KALDI:BOOL={'ON' if _BUILD_KALDI else 'OFF'}",