diff --git a/speechx/CMakeLists.txt b/speechx/CMakeLists.txt index 34b901168..dcb13a710 100644 --- a/speechx/CMakeLists.txt +++ b/speechx/CMakeLists.txt @@ -72,6 +72,8 @@ find_package(Eigen3 REQUIRED) include(kenlm) add_dependencies(kenlm eigen boost) +#openblas +include(openblas) # openfst set(openfst_SOURCE_DIR ${fc_patch}/openfst-src) @@ -94,6 +96,8 @@ add_dependencies(openfst gflags glog) link_directories(${openfst_PREFIX_DIR}/lib) include_directories(${openfst_PREFIX_DIR}/include) + + # paddle lib set(paddle_SOURCE_DIR ${fc_patch}/paddle-lib) set(paddle_PREFIX_DIR ${fc_patch}/paddle-lib-prefix) @@ -136,11 +140,7 @@ set(DEPS ${DEPS} glog gflags protobuf xxhash cryptopp ${EXTERNAL_LIB}) -#openblas -include(openblas) -# openblas need, gfortan dir in the docker. -#link_directories(/usr/local/gcc-8.2/lib64) ############################################################################### # Add local library diff --git a/speechx/build.sh b/speechx/build.sh index 15caa18aa..3c63928ef 100755 --- a/speechx/build.sh +++ b/speechx/build.sh @@ -22,6 +22,6 @@ cd build cmake .. -DBOOST_ROOT:STRING=${boost_SOURCE_DIR} -make -j +make -j1 cd - diff --git a/speechx/cmake/EnableCMP0048.cmake b/speechx/cmake/EnableCMP0048.cmake index f9afa013a..1b59188fd 100644 --- a/speechx/cmake/EnableCMP0048.cmake +++ b/speechx/cmake/EnableCMP0048.cmake @@ -1 +1 @@ -cmake_policy(SET CMP0048 NEW) +cmake_policy(SET CMP0048 NEW) \ No newline at end of file diff --git a/speechx/cmake/external/libsndfile.cmake b/speechx/cmake/external/libsndfile.cmake index fc5e0a8a7..52d64bacd 100644 --- a/speechx/cmake/external/libsndfile.cmake +++ b/speechx/cmake/external/libsndfile.cmake @@ -11,8 +11,8 @@ else() set(FETCHCONTENT_SOURCE_DIR_LIBSNDFILE "") endif() -set(LIBSNDFILE_GIT_REPO "https://github.com/erikd/libsndfile" CACHE STRING "libsndfile git repository url" FORCE) -set(LIBSNDFILE_GIT_TAG c11deaa04ec84161996824061f6d705970972e2e CACHE STRING "libsndfile git tag" FORCE) +set(LIBSNDFILE_GIT_REPO "https://github.com/libsndfile/libsndfile.git" CACHE STRING "libsndfile git repository url" FORCE) +set(LIBSNDFILE_GIT_TAG 1.0.31 CACHE STRING "libsndfile git tag" FORCE) FetchContent_Declare(libsndfile GIT_REPOSITORY ${LIBSNDFILE_GIT_REPO} @@ -48,7 +48,7 @@ function(libsndfile_build) # finally we include libsndfile itself add_subdirectory(${libsndfile_SOURCE_DIR} ${libsndfile_BINARY_DIR} EXCLUDE_FROM_ALL) # copying .hh for c++ support - file(COPY "${libsndfile_SOURCE_DIR}/src/sndfile.hh" DESTINATION ${LIBSNDFILE_INCLUDE_DIR}) + #file(COPY "${libsndfile_SOURCE_DIR}/src/sndfile.hh" DESTINATION ${LIBSNDFILE_INCLUDE_DIR}) endfunction() libsndfile_build() diff --git a/speechx/cmake/external/openblas.cmake b/speechx/cmake/external/openblas.cmake index 141860fef..14e171952 100644 --- a/speechx/cmake/external/openblas.cmake +++ b/speechx/cmake/external/openblas.cmake @@ -1,26 +1,8 @@ include(FetchContent) -# set(OpenBLAS_INSTALL_PREFIX ${fc_patch}/openblas-install) -# set(OpenBLAS_INSTALL_PREFIX ${fc_patch}/OpenBLAS) - set(OpenBLAS_SOURCE_DIR ${fc_patch}/OpenBLAS-src) set(OpenBLAS_PREFIX ${fc_patch}/OpenBLAS-prefix) -# ExternalProject_Add( -# OpenBLAS -# GIT_REPOSITORY https://github.com/xianyi/OpenBLAS -# GIT_TAG 1ef97c470ccf23d06d3bb0597c52df4a2e9093b9 -# GIT_SHALLOW TRUE -# GIT_PROGRESS TRUE -# PREFIX ${OpenBLAS_PREFIX} -# SOURCE_DIR ${OpenBLAS_SOURCE_DIR} -# BUILD_IN_SOURCE TRUE -# CONFIGURE_COMMAND "" -# BUILD_COMMAND make -# INSTALL_COMMAND make PREFIX=${OpenBLAS_INSTALL_PREFIX} install -# UPDATE_DISCONNECTED TRUE -# ) - # ###################################################################################################################### # OPENBLAS https://github.com/lattice/quda/blob/develop/CMakeLists.txt#L575 # ######################################################################################################################