pull/2799/head
YangZhou 3 years ago
parent 21ffb8d1f3
commit d4b1161b92

@ -1,13 +1,3 @@
add_subdirectory(third_party) add_subdirectory(third_party)
add_subdirectory(src) 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()

@ -92,14 +92,6 @@ define_library(
"${LIBPADDLEAUDIO_COMPILE_DEFINITIONS}" "${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) if (APPLE)
set(AUDIO_LIBRARY libpaddleaudio CACHE INTERNAL "") set(AUDIO_LIBRARY libpaddleaudio CACHE INTERNAL "")
else() else()
@ -207,11 +199,3 @@ define_extension(
# ) # )
# endif() # endif()
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()

@ -43,7 +43,8 @@ py::array_t<float> KaldiFeatureWrapper::ComputeFbank(
*res_ptr = feats[idx]; *res_ptr = feats[idx];
res_ptr++; res_ptr++;
} }
std::vector<int> shape{feats.size() / Dim(), Dim()}; std::vector<int> shape{static_cast<int>(feats.size() / Dim()),
static_cast<int>(Dim())};
return result.reshape(shape); return result.reshape(shape);
} }

Loading…
Cancel
Save