From d4b1161b92412eaa2d08f17f16100f09d07bc7a9 Mon Sep 17 00:00:00 2001 From: YangZhou Date: Thu, 5 Jan 2023 14:12:05 +0800 Subject: [PATCH] fix mac --- audio/paddleaudio/CMakeLists.txt | 10 ---------- audio/paddleaudio/src/CMakeLists.txt | 16 ---------------- .../src/pybind/kaldi/kaldi_feature_wrapper.cc | 3 ++- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/audio/paddleaudio/CMakeLists.txt b/audio/paddleaudio/CMakeLists.txt index 5e46adeec..c6b43c780 100644 --- a/audio/paddleaudio/CMakeLists.txt +++ b/audio/paddleaudio/CMakeLists.txt @@ -1,13 +1,3 @@ add_subdirectory(third_party) add_subdirectory(src) - -if (APPLE) -# file(COPY ${GFORTRAN_LIBRARIES_DIR}/libgcc_s.1.1.dylib -# DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/lib) -endif(APPLE) - -if (UNIX AND NOT APPLE) -# file(COPY ${GFORTRAN_LIBRARIES_DIR}/libgcc_s.so.1 -# DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/lib FOLLOW_SYMLINK_CHAIN) -endif() diff --git a/audio/paddleaudio/src/CMakeLists.txt b/audio/paddleaudio/src/CMakeLists.txt index e0a708a19..21e0f170d 100644 --- a/audio/paddleaudio/src/CMakeLists.txt +++ b/audio/paddleaudio/src/CMakeLists.txt @@ -92,14 +92,6 @@ define_library( "${LIBPADDLEAUDIO_COMPILE_DEFINITIONS}" ) -if (APPLE) - add_custom_command(TARGET libpaddleaudio POST_BUILD COMMAND install_name_tool -change "${GFORTRAN_LIBRARIES_DIR}/libgcc_s.1.1.dylib" "@loader_path/libgcc_s.1.1.dylib" libpaddleaudio.so) -endif(APPLE) - -#if (UNIX AND NOT APPLE) -# set_target_properties(libpaddleaudio PROPERTIES INSTALL_RPATH "$ORIGIN") -#endif() - if (APPLE) set(AUDIO_LIBRARY libpaddleaudio CACHE INTERNAL "") else() @@ -207,11 +199,3 @@ define_extension( # ) # endif() endif() - -if (APPLE) - add_custom_command(TARGET _paddleaudio POST_BUILD COMMAND install_name_tool -change "${GFORTRAN_LIBRARIES_DIR}/libgcc_s.1.1.dylib" "@loader_path/lib/libgcc_s.1.1.dylib" _paddleaudio.so) -endif(APPLE) - -#if (UNIX AND NOT APPLE) -# set_target_properties(_paddleaudio PROPERTIES INSTALL_RPATH "$ORIGIN/lib") -#endif() diff --git a/audio/paddleaudio/src/pybind/kaldi/kaldi_feature_wrapper.cc b/audio/paddleaudio/src/pybind/kaldi/kaldi_feature_wrapper.cc index f79818ff4..3072c4070 100644 --- a/audio/paddleaudio/src/pybind/kaldi/kaldi_feature_wrapper.cc +++ b/audio/paddleaudio/src/pybind/kaldi/kaldi_feature_wrapper.cc @@ -43,7 +43,8 @@ py::array_t KaldiFeatureWrapper::ComputeFbank( *res_ptr = feats[idx]; res_ptr++; } - std::vector shape{feats.size() / Dim(), Dim()}; + std::vector shape{static_cast(feats.size() / Dim()), + static_cast(Dim())}; return result.reshape(shape); }