Use the latest master of ncnn from tencent (#372)

csukuangfj · web-flow · commit 33b287301893 · 2025-01-06T15:56:47.000+08:00
diff --git a/.github/workflows/aarch64-linux-gnu.yaml b/.github/workflows/aarch64-linux-gnu.yaml
@@ -41,7 +41,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/apk.yaml b/.github/workflows/apk.yaml
@@ -25,7 +25,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Display NDK HOME
@@ -45,7 +45,7 @@ jobs:
         run: |
           ls -lh ./apks/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           path: ./apks/*.apk
 
diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml
@@ -41,7 +41,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/build-wheels-armv7l.yaml b/.github/workflows/build-wheels-armv7l.yaml
@@ -26,7 +26,7 @@ jobs:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -83,7 +83,7 @@ jobs:
           ls -lh ./wheelhouse/
 
       - name: Upload wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sherpa_ncnn-${{ env.SHERPA_NCNN_VERSION }}-cp${{ env.PYTHON_VERSION }}-cp${{ env.PYTHON_VERSION }}-linux_armv7l.whl.zip
           path: ./wheelhouse/*.whl
diff --git a/.github/workflows/build-wheels-macos.yaml b/.github/workflows/build-wheels-macos.yaml
@@ -48,7 +48,7 @@ jobs:
 
           ls -lh ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
 
diff --git a/.github/workflows/build-wheels-win32.yaml b/.github/workflows/build-wheels-win32.yaml
@@ -24,7 +24,7 @@ jobs:
         python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # see https://cibuildwheel.readthedocs.io/en/stable/changelog/
       # for a list of versions
@@ -41,7 +41,7 @@ jobs:
         run: |
           ls -lh ./wheelhouse/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
 
diff --git a/.github/workflows/build-wheels-win64.yaml b/.github/workflows/build-wheels-win64.yaml
@@ -24,7 +24,7 @@ jobs:
         python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # see https://cibuildwheel.readthedocs.io/en/stable/changelog/
       # for a list of versions
@@ -69,7 +69,7 @@ jobs:
             git commit -m "add more wheels"
             git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-ncnn-wheels main
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
 
diff --git a/.github/workflows/dot-net.yaml b/.github/workflows/dot-net.yaml
@@ -23,7 +23,7 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       # see https://cibuildwheel.readthedocs.io/en/stable/changelog/
       # for a list of versions
       - name: Build wheels
@@ -40,7 +40,7 @@ jobs:
           ls -lh ./wheelhouse/*.whl
           unzip -l ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-wheels
           path: ./wheelhouse/*.whl
@@ -51,7 +51,7 @@ jobs:
     needs: build-libs
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Retrieve artifact from ubuntu-latest
         uses: actions/download-artifact@v2
@@ -121,7 +121,7 @@ jobs:
           ./run.sh
           ls -lh packages
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         name: upload nuget packages
         with:
           name: nuget-packages
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -34,7 +34,7 @@ jobs:
             arch: x86 # use 386 for GOARCH
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-go@v4
diff --git a/.github/workflows/jni.yaml b/.github/workflows/jni.yaml
@@ -40,7 +40,7 @@ jobs:
         os: [ubuntu-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -85,7 +85,7 @@ jobs:
           file bin/decode-file-c-api
 
       - name: Upload binary sherpa-ncnn and sherpa-ncnn-microphone
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: sherpa-ncnn-pre-built-binaries-os-${{ matrix.os }}
           path: ./build/bin
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
@@ -84,7 +84,7 @@ jobs:
           file bin/decode-file-c-api
 
       - name: Upload binary sherpa-ncnn and sherpa-ncnn-microphone
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: sherpa-ncnn-pre-built-binaries-os-${{ matrix.os }}
           path: ./build/bin
diff --git a/.github/workflows/mfc.yaml b/.github/workflows/mfc.yaml
@@ -53,7 +53,7 @@ jobs:
         arch: [x64, Win32]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -124,7 +124,7 @@ jobs:
           ls -lh $d/
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: sherpa-ncnn-${{ matrix.arch }}
           path: ./sherpa-ncnn*.exe
diff --git a/.github/workflows/release-go.yaml b/.github/workflows/release-go.yaml
@@ -34,7 +34,7 @@ jobs:
         arch: [x86_64, aarch64]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: SSH to GitHub
         run: |
@@ -76,7 +76,7 @@ jobs:
           ls -lh ./wheelhouse/*.whl
           unzip -l ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-wheels-for-go-${{ matrix.arch }}
           path: ./wheelhouse/*.whl
@@ -91,7 +91,7 @@ jobs:
         arch: [x86_64, arm64]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Configure CMake
         shell: bash
         run: |
@@ -111,7 +111,7 @@ jobs:
 
           file install/lib/lib*
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-for-${{ matrix.arch }}
           path: ./build/install/lib/
@@ -125,7 +125,7 @@ jobs:
         os: [windows-latest]
         arch: [x64, Win32]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -149,7 +149,7 @@ jobs:
           ls -lh install/bin
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: sherpa-ncnn-go-windows-${{ matrix.arch }}
           path: ./build/install/lib/
@@ -160,7 +160,7 @@ jobs:
     needs: [linux, macOS, windows]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Add SSH key
         run: |
@@ -170,37 +170,37 @@ jobs:
           ssh github.com || true
 
       - name: Retrieve artifact Linux x86_64
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ubuntu-latest-wheels-for-go-x86_64
           path: ./linux_x86_64
 
       - name: Retrieve artifact Linux aarch64
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ubuntu-latest-wheels-for-go-aarch64
           path: ./linux_aarch64
 
       - name: Retrieve artifact from macos-latest (x86_64)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: macos-latest-for-x86_64
           path: ./macos-x86_64
 
       - name: Retrieve artifact from macos-latest (arm64)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: macos-latest-for-arm64
           path: ./macos-arm64
 
       - name: Retrieve artifact from windows-latest (x64)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: sherpa-ncnn-go-windows-x64
           path: ./windows-x64
 
       - name: Retrieve artifact from windows-latest (Win32)
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: sherpa-ncnn-go-windows-Win32
           path: ./windows-win32
diff --git a/.github/workflows/swift-api-test.yaml b/.github/workflows/swift-api-test.yaml
@@ -42,7 +42,7 @@ jobs:
         os: [macos-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/test-dot-net.yaml b/.github/workflows/test-dot-net.yaml
@@ -42,7 +42,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/test-pip-install.yaml b/.github/workflows/test-pip-install.yaml
@@ -32,7 +32,7 @@ jobs:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/windows-x64.yaml b/.github/workflows/windows-x64.yaml
@@ -56,7 +56,7 @@ jobs:
             os: windows-2022
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/windows-x86.yaml b/.github/workflows/windows-x86.yaml
@@ -56,7 +56,7 @@ jobs:
             os: windows-2022
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/cmake/ncnn.cmake b/cmake/ncnn.cmake
@@ -7,19 +7,19 @@ function(download_ncnn)
 
   # Please also change ../pack-for-embedded-systems.sh
 
-  # 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")
+  # the latest master as of 2025.01.06
+  set(ncnn_URL  "https://github.com/Tencent/ncnn/archive/39cf4f6018a49d59deec1ae3133fabe602370131.zip")
+  set(ncnn_URL2 "https://huggingface.co/csukuangfj/sherpa-ncnn-cmake-deps/resolve/main/ncnn-39cf4f6018a49d59deec1ae3133fabe602370131.zip")
+  set(ncnn_HASH "SHA256=286c322ed888dfc973e16994a53466d037bc4dca2bebfafaaf005afbd2aeffa8")
 
   # 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-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
-    $ENV{HOME}/asr/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
-    ${PROJECT_SOURCE_DIR}/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
-    ${PROJECT_BINARY_DIR}/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
-    /tmp/ncnn-964ed7a56a573c5046cc177a6cd95580ecddcddf.zip
+    $ENV{HOME}/Downloads/ncnn-39cf4f6018a49d59deec1ae3133fabe602370131.zip
+    $ENV{HOME}/asr/ncnn-39cf4f6018a49d59deec1ae3133fabe602370131.zip
+    ${PROJECT_SOURCE_DIR}/ncnn-39cf4f6018a49d59deec1ae3133fabe602370131.zip
+    ${PROJECT_BINARY_DIR}/ncnn-39cf4f6018a49d59deec1ae3133fabe602370131.zip
+    /tmp/ncnn-39cf4f6018a49d59deec1ae3133fabe602370131.zip
   )
 
   foreach(f IN LISTS possible_file_locations)
