Use tencent/ncnn master. (#320)

k2-fsa · Mar 5, 2024 · 884ce6d · 884ce6d
1 parent ca9c19f
commit 884ce6d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/cmake/kaldi-native-fbank.cmake b/cmake/kaldi-native-fbank.cmake
@@ -2,18 +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.18.6.tar.gz")
-  set(kaldi_native_fbank_URL2  "https://hub.nuaa.cf/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.18.6.tar.gz")
-  set(kaldi_native_fbank_HASH "SHA256=6202a00cd06ba8ff89beb7b6f85cda34e073e94f25fc29e37c519bff0706bf19")
+  set(kaldi_native_fbank_URL  "https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.18.7.tar.gz")
+  set(kaldi_native_fbank_URL2 "https://hub.nuaa.cf/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.18.7.tar.gz")
+  set(kaldi_native_fbank_HASH "SHA256=e78fd9d481d83d7d6d1be0012752e6531cb614e030558a3491e3c033cb8e0e4e")
 
   # 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.18.6.tar.gz
-    $ENV{HOME}/asr/kaldi-native-fbank-1.18.6.tar.gz
-    ${PROJECT_SOURCE_DIR}/kaldi-native-fbank-1.18.6.tar.gz
-    ${PROJECT_BINARY_DIR}/kaldi-native-fbank-1.18.6.tar.gz
-    /tmp/kaldi-native-fbank-1.18.6.tar.gz
+    $ENV{HOME}/Downloads/kaldi-native-fbank-1.18.7.tar.gz
+    $ENV{HOME}/asr/kaldi-native-fbank-1.18.7.tar.gz
+    ${PROJECT_SOURCE_DIR}/kaldi-native-fbank-1.18.7.tar.gz
+    ${PROJECT_BINARY_DIR}/kaldi-native-fbank-1.18.7.tar.gz
+    /tmp/kaldi-native-fbank-1.18.7.tar.gz
   )
 
   foreach(f IN LISTS possible_file_locations)

diff --git a/cmake/ncnn.cmake b/cmake/ncnn.cmake
@@ -6,18 +6,20 @@ 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.1.tar.gz")
-  set(ncnn_URL2 "https://hub.nuaa.cf/csukuangfj/ncnn/archive/refs/tags/sherpa-1.1.tar.gz")
-  set(ncnn_HASH "SHA256=254aaedf8ad3e6baaa63bcd5d23e9673e3973d7cb2154c18e5c7743d45b4e160")
+
+  # the latest master as of 2024.03.05
+  set(ncnn_URL  "https://github.com/Tencent/ncnn/archive/964ed7a56a573c5046cc177a6cd95580ecddcddf.zip")
+  set(ncnn_URL2 "https://hub.nuaa.cf/Tencent/ncnn/archive/964ed7a56a573c5046cc177a6cd95580ecddcddf.zip")
+  set(ncnn_HASH "SHA256=7a02ca37bc4137862efca0627430884db21f0c7491f8f7b98f909cf4a404792e")
 
   # 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.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
+    $ENV{HOME}/Downloads/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
+    $ENV{HOME}/asr/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
+    ${PROJECT_SOURCE_DIR}/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
+    ${PROJECT_BINARY_DIR}/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
+    /tmp/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
   )
 
   foreach(f IN LISTS possible_file_locations)
@@ -160,15 +162,19 @@ function(download_ncnn)
     DeconvolutionDepthWise3D
     Einsum
     DeformableConv2D
-    RelPositionalEncoding
-    MakePadMask
-    RelShift
     # GLU
     Fold
     Unfold
     GridSample
     CumulativeSum
     CopyTo
+    Erf
+    Diag
+    CELU
+    Shrink
+    RelPositionalEncoding
+    MakePadMask
+    RelShift
   )
 
   foreach(layer IN LISTS disabled_layers)

diff --git a/pack-for-embedded-systems.sh b/pack-for-embedded-systems.sh
@@ -26,7 +26,7 @@ rm -v sherpa-ncnn-${SHERPA_NCNN_VERSION}.tar.gz
 # Please also change ./build-m3axpi.sh
 wget \
   -O kaldi-native-fbank-1.18.5.tar.gz \
-  https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.18.5.tar.gz
+  https://github.com/csukuangfj/kaldi-native-fbank/archive/refs/tags/v1.18.7.tar.gz
 
 wget \
   -O ncnn-sherpa-1.1.tar.gz \