Use latest master from tencent/ncnn (#215)

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(sherpa-ncnn)
 
-set(SHERPA_NCNN_VERSION "2.0.1")
+set(SHERPA_NCNN_VERSION "2.0.2")
 
 # Disable warning about
 #

cmake/ncnn.cmake

@@ -6,18 +6,18 @@ function(download_ncnn)
   # https://github.com/csukuangfj/ncnn/pull/7
 
   # Please also change ../pack-for-embedded-systems.sh
-  set(ncnn_URL  "https://github.com/csukuangfj/ncnn/archive/refs/tags/sherpa-1.0.tar.gz")
-  set(ncnn_URL2 "https://huggingface.co/csukuangfj/sherpa-ncnn-cmake-deps/resolve/main/ncnn-sherpa-1.0.tar.gz")
-  set(ncnn_HASH "SHA256=7c80c34c7bdfb5ce4ef3c7727f1b24d2217fca590fc87a69b1a185ed62e33c95")
+  set(ncnn_URL  "https://github.com/csukuangfj/ncnn/archive/refs/tags/sherpa-1.1.tar.gz")
+  set(ncnn_URL2 "https://huggingface.co/csukuangfj/sherpa-ncnn-cmake-deps/resolve/main/ncnn-sherpa-1.1.tar.gz")
+  set(ncnn_HASH "SHA256=254aaedf8ad3e6baaa63bcd5d23e9673e3973d7cb2154c18e5c7743d45b4e160")
 
   # 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/ncnn-sherpa-1.0.tar.gz
-    $ENV{HOME}/asr/ncnn-sherpa-1.0.tar.gz
-    ${PROJECT_SOURCE_DIR}/ncnn-sherpa-1.0.tar.gz
-    ${PROJECT_BINARY_DIR}/ncnn-sherpa-1.0.tar.gz
-    /tmp/ncnn-sherpa-1.0.tar.gz
+    $ENV{HOME}/Downloads/ncnn-sherpa-1.1.tar.gz
+    $ENV{HOME}/asr/ncnn-sherpa-1.1.tar.gz
+    ${PROJECT_SOURCE_DIR}/ncnn-sherpa-1.1.tar.gz
+    ${PROJECT_BINARY_DIR}/ncnn-sherpa-1.1.tar.gz
+    /tmp/ncnn-sherpa-1.1.tar.gz
   )
 
   foreach(f IN LISTS possible_file_locations)

pack-for-embedded-systems.sh

@@ -29,8 +29,8 @@ wget \
   https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.14.tar.gz
 
 wget \
-  -O ncnn-sherpa-1.0.tar.gz \
-  https://github.com/csukuangfj/ncnn/archive/refs/tags/sherpa-1.0.tar.gz
+  -O ncnn-sherpa-1.1.tar.gz \
+  https://github.com/csukuangfj/ncnn/archive/refs/tags/sherpa-1.1.tar.gz
 
 cat >README.md <<EOF
 Please put files from this folder to the directory \$HOME/asr/
@@ -48,7 +48,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    12M Feb  2 17:01 sherpa-1.0.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}
 
 # Note: It is OK if the versions of the above files are different.