mirrors/kaldifeat
1
0
Fork 0
mirror of https://github.com/csukuangfj/kaldifeat.git synced 2025-08-19 06:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into nightly-test

Browse Source
This commit is contained in:
Fangjun Kuang 2022-06-02 08:51:56 +08:00
commit 469a108b5d
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -6,7 +6,7 @@ project(kaldifeat)
# remember to change the version in # remember to change the version in
# scripts/conda/kaldifeat/meta.yaml # scripts/conda/kaldifeat/meta.yaml
set(kaldifeat_VERSION "1.15") set(kaldifeat_VERSION "1.15.4")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

11
kaldifeat/python/csrc/CMakeLists.txt
View File

@ -10,6 +10,17 @@ pybind11_add_module(_kaldifeat
online-feature.cc online-feature.cc
utils.cc utils.cc
) )
if(APPLE)
execute_process(
COMMAND "${PYTHON_EXECUTABLE}" -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE PYTHON_SITE_PACKAGE_DIR
)
message(STATUS "PYTHON_SITE_PACKAGE_DIR: ${PYTHON_SITE_PACKAGE_DIR}")
target_link_libraries(_kaldifeat PRIVATE "-Wl,-rpath,${PYTHON_SITE_PACKAGE_DIR}")
endif()
target_link_libraries(_kaldifeat PRIVATE kaldifeat_core) target_link_libraries(_kaldifeat PRIVATE kaldifeat_core)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
target_link_libraries(_kaldifeat PUBLIC ${TORCH_DIR}/lib/libtorch_python.so) target_link_libraries(_kaldifeat PUBLIC ${TORCH_DIR}/lib/libtorch_python.so)

2
scripts/conda/kaldifeat/meta.yaml
View File

@ -1,6 +1,6 @@
package: package:
name: kaldifeat name: kaldifeat
version: "1.15" version: "1.15.4"
source: source:
path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}" path: "{{ environ.get('KALDIFEAT_ROOT_DIR') }}"