Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use tencent/ncnn master. #320

Merged
merged 2 commits into from
Mar 5, 2024
Merged

Use tencent/ncnn master. #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1b1aa2
Use tencent/ncnn master.
csukuangfj Mar 5, 2024
8cca3d4
small fixes
csukuangfj Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cmake/kaldi-native-fbank.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
28 changes: 17 additions & 11 deletions cmake/ncnn.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pack-for-embedded-systems.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading