From 9d2d7fe77c59db782f255b9341f85832d5c553aa Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Mon, 15 Aug 2022 18:13:05 +0800 Subject: [PATCH] minor fixes --- .github/workflows/build_conda_ubuntu_cpu.yml | 3 --- .github/workflows/build_conda_windows_cpu.yml | 3 --- kaldifeat/csrc/CMakeLists.txt | 10 ++++++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_conda_ubuntu_cpu.yml b/.github/workflows/build_conda_ubuntu_cpu.yml index ae8e74b..3b48560 100644 --- a/.github/workflows/build_conda_ubuntu_cpu.yml +++ b/.github/workflows/build_conda_ubuntu_cpu.yml @@ -20,9 +20,6 @@ name: build_conda_ubuntu_cpu on: push: - branches: - - master - - conda tags: - '*' diff --git a/.github/workflows/build_conda_windows_cpu.yml b/.github/workflows/build_conda_windows_cpu.yml index af17161..b2204ca 100644 --- a/.github/workflows/build_conda_windows_cpu.yml +++ b/.github/workflows/build_conda_windows_cpu.yml @@ -20,9 +20,6 @@ name: build_conda_windows_cpu on: push: - branches: - - master - - conda tags: - '*' diff --git a/kaldifeat/csrc/CMakeLists.txt b/kaldifeat/csrc/CMakeLists.txt index 7a52a7d..2e140a6 100644 --- a/kaldifeat/csrc/CMakeLists.txt +++ b/kaldifeat/csrc/CMakeLists.txt @@ -18,6 +18,16 @@ target_link_libraries(kaldifeat_core PUBLIC ${TORCH_LIBRARIES}) target_compile_definitions(kaldifeat_core PUBLIC KALDIFEAT_TORCH_VERSION_MAJOR=${KALDIFEAT_TORCH_VERSION_MAJOR}) target_compile_definitions(kaldifeat_core PUBLIC KALDIFEAT_TORCH_VERSION_MINOR=${KALDIFEAT_TORCH_VERSION_MINOR}) +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_core PUBLIC "-L ${PYTHON_SITE_PACKAGE_DIR}/../..") +endif() + add_executable(test_kaldifeat test_kaldifeat.cc) target_link_libraries(test_kaldifeat PRIVATE kaldifeat_core)