From 61664c7bd2a8afe2622fc101bba06a3667fb60ee Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Tue, 17 Oct 2023 15:53:32 +0800 Subject: [PATCH] Update kaldi native fbank (#273) --- CMakeLists.txt | 2 +- cmake/kaldi-native-fbank.cmake | 17 ++++++++--------- pack-for-embedded-systems.sh | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68d53c6d..f99ea66c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR) project(sherpa-ncnn) -set(SHERPA_NCNN_VERSION "2.1.3") +set(SHERPA_NCNN_VERSION "2.1.4") # Disable warning about # diff --git a/cmake/kaldi-native-fbank.cmake b/cmake/kaldi-native-fbank.cmake index 6c7332da..345515de 100644 --- a/cmake/kaldi-native-fbank.cmake +++ b/cmake/kaldi-native-fbank.cmake @@ -2,19 +2,18 @@ function(download_kaldi_native_fbank) include(FetchContent) # Please also change ../pack-for-embedded-systems.sh - set(kaldi_native_fbank_URL "https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.14.tar.gz") - set(kaldi_native_fbank_URL2 "https://huggingface.co/csukuangfj/sherpa-ncnn-cmake-deps/resolve/main/kaldi-native-fbank-1.14.tar.gz") - set(kaldi_native_fbank_HASH "SHA256=6a66638a111d3ce21fe6f29cbf9ab3dbcae2331c77391bf825927df5cbf2babe") - + set(kaldi_native_fbank_URL "https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.18.5.tar.gz") + set(kaldi_native_fbank_URL2 "https://huggingface.co/csukuangfj/sherpa-ncnn-cmake-deps/resolve/main/kaldi-native-fbank-1.18.5.tar.gz") + set(kaldi_native_fbank_HASH "SHA256=dce0cb3bc6fece5d8053d8780cb4ce22da57cb57ebec332641661521a0425283") # If you don't have access to the Internet, please download it to your # local drive and modify the following line according to your needs. set(possible_file_locations - $ENV{HOME}/Downloads/kaldi-native-fbank-1.14.tar.gz - $ENV{HOME}/asr/kaldi-native-fbank-1.14.tar.gz - ${PROJECT_SOURCE_DIR}/kaldi-native-fbank-1.14.tar.gz - ${PROJECT_BINARY_DIR}/kaldi-native-fbank-1.14.tar.gz - /tmp/kaldi-native-fbank-1.14.tar.gz + $ENV{HOME}/Downloads/kaldi-native-fbank-1.18.5.tar.gz + $ENV{HOME}/asr/kaldi-native-fbank-1.18.5.tar.gz + ${PROJECT_SOURCE_DIR}/kaldi-native-fbank-1.18.5.tar.gz + ${PROJECT_BINARY_DIR}/kaldi-native-fbank-1.18.5.tar.gz + /tmp/kaldi-native-fbank-1.18.5.tar.gz ) foreach(f IN LISTS possible_file_locations) diff --git a/pack-for-embedded-systems.sh b/pack-for-embedded-systems.sh index 2f0cd259..d70de574 100755 --- a/pack-for-embedded-systems.sh +++ b/pack-for-embedded-systems.sh @@ -25,8 +25,8 @@ rm -v sherpa-ncnn-${SHERPA_NCNN_VERSION}.tar.gz # Please also change ./build-m3axpi.sh wget \ - -O kaldi-native-fbank-1.14.tar.gz \ - https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.14.tar.gz + -O kaldi-native-fbank-1.18.5.tar.gz \ + https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.18.5.tar.gz wget \ -O ncnn-sherpa-1.1.tar.gz \ @@ -47,7 +47,7 @@ It should print something like below: ls -lh \$HOME/asr total 24368 --rw-r--r-- 1 fangjun staff 59K Feb 2 17:01 kaldi-native-fbank-1.14.tar.gz +-rw-r--r-- 1 fangjun staff 59K Feb 2 17:01 kaldi-native-fbank-1.18.5.tar.gz -rw-r--r-- 1 fangjun staff 12M Feb 2 17:01 sherpa-1.1.tar.gz drwxr-xr-x 29 fangjun staff 928B Feb 2 16:05 sherpa-ncnn-${SHERPA_NCNN_VERSION}