diff --git a/CHANGELOG.md b/CHANGELOG.md index 09bbb012..326925f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +## 1.10.46 + +# Fix kokoro lexicon. (#1886) +# speaker-identification-with-vad-non-streaming-asr.py Lack of support for sense_voice. (#1884) +# Fix generating Chinese lexicon for Kokoro TTS 1.0 (#1888) +# Reduce vad-whisper-c-api example code. (#1891) +# JNI Exception Handling (#1452) +# Fix #1901: UnicodeEncodeError running export_bpe_vocab.py (#1902) +# Fix publishing pre-built windows libraries (#1905) +# Fixing Whisper Model Token Normalization (#1904) +# feat: add mic example for better compatibility (#1909) +# Add onnxruntime 1.18.1 for Linux aarch64 GPU (#1914) +# Add C++ API for streaming zipformer ASR on RK NPU (#1908) +# change [1<<28] to [1<<10], to fix build issues on GOARCH=386 that [1<<28] too large (#1916) +# Flutter Config toJson/fromJson (#1893) +# Fix publishing linux pre-built artifacts (#1919) +# go.mod set to use go 1.17, and use unsafe.Slice to optimize the code (#1920) +# fix: AddPunct panic for Go(#1921) +# Fix publishing macos pre-built artifacts (#1922) +# Minor fixes for rknn (#1925) +# Build wheels for rknn linux aarch64 (#1928) + ## 1.10.45 * [update] fixed bug: create golang instance succeed while the c struct create failed (#1860) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49e0e77a..402ed450 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project(sherpa-onnx) # Remember to update # ./CHANGELOG.md # ./new-release.sh -set(SHERPA_ONNX_VERSION "1.10.45") +set(SHERPA_ONNX_VERSION "1.10.46") # Disable warning about # diff --git a/android/SherpaOnnxAar/README.md b/android/SherpaOnnxAar/README.md index b6983b96..93f1c3da 100644 --- a/android/SherpaOnnxAar/README.md +++ b/android/SherpaOnnxAar/README.md @@ -4,8 +4,8 @@ git clone https://github.com/k2-fsa/sherpa-onnx cd sherpa-onnx -wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-v1.10.45-android.tar.bz2 -tar xvf sherpa-onnx-v1.10.45-android.tar.bz2 +wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-v1.10.46-android.tar.bz2 +tar xvf sherpa-onnx-v1.10.46-android.tar.bz2 cp -v jniLibs/arm64-v8a/* android/SherpaOnnxAar/sherpa_onnx/src/main/jniLibs/arm64-v8a/ cp -v jniLibs/armeabi-v7a/* android/SherpaOnnxAar/sherpa_onnx/src/main/jniLibs/armeabi-v7a/ @@ -16,5 +16,5 @@ cd android/SherpaOnnxAar ./gradlew :sherpa_onnx:assembleRelease ls -lh ./sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar -cp ./sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar ../../sherpa-onnx-1.10.45.aar +cp ./sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar ../../sherpa-onnx-1.10.46.aar ``` diff --git a/android/SherpaOnnxJavaDemo/app/build.gradle b/android/SherpaOnnxJavaDemo/app/build.gradle index 1606d3dc..d7e614c4 100644 --- a/android/SherpaOnnxJavaDemo/app/build.gradle +++ b/android/SherpaOnnxJavaDemo/app/build.gradle @@ -34,5 +34,5 @@ dependencies { implementation 'pub.devrel:easypermissions:3.0.0' implementation 'androidx.core:core-ktx:1.7.0' // implementation files('/Users/fangjun/open-source/sherpa-onnx/android/SherpaOnnxAar/sherpa_onnx/build/outputs/aar/sherpa_onnx-release.aar') - implementation 'com.github.k2-fsa:sherpa-onnx:v1.10.45' + implementation 'com.github.k2-fsa:sherpa-onnx:v1.10.46' } diff --git a/build-ios-shared.sh b/build-ios-shared.sh index 62c26d6a..acb6f645 100755 --- a/build-ios-shared.sh +++ b/build-ios-shared.sh @@ -242,7 +242,7 @@ for d in ios-arm64_x86_64-simulator ios-arm64; do CFBundlePackageType FMWK CFBundleShortVersionString - 1.10.45 + 1.10.46 CFBundleSupportedPlatforms iPhoneOS diff --git a/dart-api-examples/add-punctuations/pubspec.yaml b/dart-api-examples/add-punctuations/pubspec.yaml index 4b44d108..63c9ec92 100644 --- a/dart-api-examples/add-punctuations/pubspec.yaml +++ b/dart-api-examples/add-punctuations/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/audio-tagging/pubspec.yaml b/dart-api-examples/audio-tagging/pubspec.yaml index f0c3220c..772009ae 100644 --- a/dart-api-examples/audio-tagging/pubspec.yaml +++ b/dart-api-examples/audio-tagging/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/keyword-spotter/pubspec.yaml b/dart-api-examples/keyword-spotter/pubspec.yaml index eee8250f..2a5ee7ec 100644 --- a/dart-api-examples/keyword-spotter/pubspec.yaml +++ b/dart-api-examples/keyword-spotter/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 # sherpa_onnx: # path: ../../flutter/sherpa_onnx path: ^1.9.0 diff --git a/dart-api-examples/non-streaming-asr/pubspec.yaml b/dart-api-examples/non-streaming-asr/pubspec.yaml index a1786767..8e992e62 100644 --- a/dart-api-examples/non-streaming-asr/pubspec.yaml +++ b/dart-api-examples/non-streaming-asr/pubspec.yaml @@ -10,7 +10,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/speaker-diarization/pubspec.yaml b/dart-api-examples/speaker-diarization/pubspec.yaml index 09a6ad9f..aa20bf63 100644 --- a/dart-api-examples/speaker-diarization/pubspec.yaml +++ b/dart-api-examples/speaker-diarization/pubspec.yaml @@ -8,7 +8,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 # sherpa_onnx: # path: ../../flutter/sherpa_onnx path: ^1.9.0 diff --git a/dart-api-examples/speaker-identification/pubspec.yaml b/dart-api-examples/speaker-identification/pubspec.yaml index 50bf6de4..32d551d3 100644 --- a/dart-api-examples/speaker-identification/pubspec.yaml +++ b/dart-api-examples/speaker-identification/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/streaming-asr/pubspec.yaml b/dart-api-examples/streaming-asr/pubspec.yaml index 43ad1a77..b8554ed5 100644 --- a/dart-api-examples/streaming-asr/pubspec.yaml +++ b/dart-api-examples/streaming-asr/pubspec.yaml @@ -11,7 +11,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/tts/pubspec.yaml b/dart-api-examples/tts/pubspec.yaml index 582884b2..38ba05e6 100644 --- a/dart-api-examples/tts/pubspec.yaml +++ b/dart-api-examples/tts/pubspec.yaml @@ -8,7 +8,7 @@ environment: # Add regular dependencies here. dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml b/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml index f2e68b8e..7804209e 100644 --- a/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml +++ b/dart-api-examples/vad-with-non-streaming-asr/pubspec.yaml @@ -10,7 +10,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/dart-api-examples/vad/pubspec.yaml b/dart-api-examples/vad/pubspec.yaml index abb77fb0..ad3a2895 100644 --- a/dart-api-examples/vad/pubspec.yaml +++ b/dart-api-examples/vad/pubspec.yaml @@ -9,7 +9,7 @@ environment: sdk: ">=3.0.0 <4.0.0" dependencies: - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 path: ^1.9.0 args: ^2.5.0 diff --git a/flutter-examples/streaming_asr/pubspec.yaml b/flutter-examples/streaming_asr/pubspec.yaml index 2fb0c466..ba33ccb0 100644 --- a/flutter-examples/streaming_asr/pubspec.yaml +++ b/flutter-examples/streaming_asr/pubspec.yaml @@ -5,7 +5,7 @@ description: > publish_to: 'none' -version: 1.10.45 +version: 1.10.46 topics: - speech-recognition @@ -31,7 +31,7 @@ dependencies: record: ^5.1.0 url_launcher: ^6.2.6 - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 # sherpa_onnx: # path: ../../flutter/sherpa_onnx diff --git a/flutter-examples/tts/pubspec.yaml b/flutter-examples/tts/pubspec.yaml index 93602afe..80ff1bdf 100644 --- a/flutter-examples/tts/pubspec.yaml +++ b/flutter-examples/tts/pubspec.yaml @@ -5,7 +5,7 @@ description: > publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.10.45 +version: 1.10.46 environment: sdk: ">=2.17.0 <4.0.0" @@ -18,7 +18,7 @@ dependencies: cupertino_icons: ^1.0.6 path_provider: ^2.1.3 path: ^1.9.0 - sherpa_onnx: ^1.10.45 + sherpa_onnx: ^1.10.46 # sherpa_onnx: # path: ../../flutter/sherpa_onnx url_launcher: 6.2.6 diff --git a/flutter/sherpa_onnx/pubspec.yaml b/flutter/sherpa_onnx/pubspec.yaml index 4d9e5880..3cf0b8e5 100644 --- a/flutter/sherpa_onnx/pubspec.yaml +++ b/flutter/sherpa_onnx/pubspec.yaml @@ -17,7 +17,7 @@ topics: - voice-activity-detection # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec -version: 1.10.45 +version: 1.10.46 homepage: https://github.com/k2-fsa/sherpa-onnx @@ -30,23 +30,23 @@ dependencies: flutter: sdk: flutter - sherpa_onnx_android: ^1.10.45 + sherpa_onnx_android: ^1.10.46 # sherpa_onnx_android: # path: ../sherpa_onnx_android - sherpa_onnx_macos: ^1.10.45 + sherpa_onnx_macos: ^1.10.46 # sherpa_onnx_macos: # path: ../sherpa_onnx_macos - sherpa_onnx_linux: ^1.10.45 + sherpa_onnx_linux: ^1.10.46 # sherpa_onnx_linux: # path: ../sherpa_onnx_linux - sherpa_onnx_windows: ^1.10.45 + sherpa_onnx_windows: ^1.10.46 # sherpa_onnx_windows: # path: ../sherpa_onnx_windows - sherpa_onnx_ios: ^1.10.45 + sherpa_onnx_ios: ^1.10.46 # sherpa_onnx_ios: # path: ../sherpa_onnx_ios diff --git a/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec b/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec index 09cb9953..30d29c97 100644 --- a/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec +++ b/flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec @@ -7,7 +7,7 @@ # https://groups.google.com/g/dart-ffi/c/nUATMBy7r0c Pod::Spec.new do |s| s.name = 'sherpa_onnx_ios' - s.version = '1.10.45' + s.version = '1.10.46' s.summary = 'A new Flutter FFI plugin project.' s.description = <<-DESC A new Flutter FFI plugin project. diff --git a/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec b/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec index e99bb2d7..b2b5af65 100644 --- a/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec +++ b/flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'sherpa_onnx_macos' - s.version = '1.10.45' + s.version = '1.10.46' s.summary = 'sherpa-onnx Flutter FFI plugin project.' s.description = <<-DESC sherpa-onnx Flutter FFI plugin project. diff --git a/harmony-os/SherpaOnnxHar/sherpa_onnx/README.md b/harmony-os/SherpaOnnxHar/sherpa_onnx/README.md index 61926350..75c42d77 100644 --- a/harmony-os/SherpaOnnxHar/sherpa_onnx/README.md +++ b/harmony-os/SherpaOnnxHar/sherpa_onnx/README.md @@ -23,7 +23,7 @@ or update your `oh-package.json5` to include the following: ``` "dependencies": { - "sherpa_onnx": "1.10.45", + "sherpa_onnx": "1.10.46", }, ``` diff --git a/harmony-os/SherpaOnnxHar/sherpa_onnx/oh-package.json5 b/harmony-os/SherpaOnnxHar/sherpa_onnx/oh-package.json5 index 1b7398dc..0a1ce48f 100644 --- a/harmony-os/SherpaOnnxHar/sherpa_onnx/oh-package.json5 +++ b/harmony-os/SherpaOnnxHar/sherpa_onnx/oh-package.json5 @@ -1,6 +1,6 @@ { "name": "sherpa_onnx", - "version": "1.10.45", + "version": "1.10.46", "description": "On-device speech-to-text, text-to-speech, and speaker diarization using Next-gen Kaldi without Internet connection", "main": "Index.ets", "author": "The next-gen Kaldi team", diff --git a/harmony-os/SherpaOnnxSpeakerDiarization/entry/oh-package.json5 b/harmony-os/SherpaOnnxSpeakerDiarization/entry/oh-package.json5 index 56031cf2..7bda1149 100644 --- a/harmony-os/SherpaOnnxSpeakerDiarization/entry/oh-package.json5 +++ b/harmony-os/SherpaOnnxSpeakerDiarization/entry/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "", "dependencies": { - "sherpa_onnx": "1.10.45" + "sherpa_onnx": "1.10.46" } } diff --git a/harmony-os/SherpaOnnxSpeakerIdentification/entry/oh-package.json5 b/harmony-os/SherpaOnnxSpeakerIdentification/entry/oh-package.json5 index 13102056..497aa86a 100644 --- a/harmony-os/SherpaOnnxSpeakerIdentification/entry/oh-package.json5 +++ b/harmony-os/SherpaOnnxSpeakerIdentification/entry/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "", "dependencies": { - "sherpa_onnx": "1.10.45", + "sherpa_onnx": "1.10.46", } } diff --git a/harmony-os/SherpaOnnxStreamingAsr/entry/oh-package.json5 b/harmony-os/SherpaOnnxStreamingAsr/entry/oh-package.json5 index 13102056..497aa86a 100644 --- a/harmony-os/SherpaOnnxStreamingAsr/entry/oh-package.json5 +++ b/harmony-os/SherpaOnnxStreamingAsr/entry/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "", "dependencies": { - "sherpa_onnx": "1.10.45", + "sherpa_onnx": "1.10.46", } } diff --git a/harmony-os/SherpaOnnxTts/entry/oh-package.json5 b/harmony-os/SherpaOnnxTts/entry/oh-package.json5 index 13102056..497aa86a 100644 --- a/harmony-os/SherpaOnnxTts/entry/oh-package.json5 +++ b/harmony-os/SherpaOnnxTts/entry/oh-package.json5 @@ -6,7 +6,7 @@ "author": "", "license": "", "dependencies": { - "sherpa_onnx": "1.10.45", + "sherpa_onnx": "1.10.46", } } diff --git a/harmony-os/SherpaOnnxVadAsr/entry/README.md b/harmony-os/SherpaOnnxVadAsr/entry/README.md index 621c6d55..419bd7c8 100644 --- a/harmony-os/SherpaOnnxVadAsr/entry/README.md +++ b/harmony-os/SherpaOnnxVadAsr/entry/README.md @@ -1,6 +1,6 @@ # Introduction -Please download ./sherpa_onnx-v1.10.45.har +Please download ./sherpa_onnx-v1.10.46.har from Hint: For users who have no access to huggingface, please use diff --git a/harmony-os/SherpaOnnxVadAsr/entry/oh-package.json5 b/harmony-os/SherpaOnnxVadAsr/entry/oh-package.json5 index f232c3f3..3abd45cd 100644 --- a/harmony-os/SherpaOnnxVadAsr/entry/oh-package.json5 +++ b/harmony-os/SherpaOnnxVadAsr/entry/oh-package.json5 @@ -7,7 +7,7 @@ "license": "", "dependencies": { // please see https://ohpm.openharmony.cn/#/cn/detail/sherpa_onnx - "sherpa_onnx": "1.10.45", + "sherpa_onnx": "1.10.46", } } diff --git a/jitpack.yml b/jitpack.yml index 1e40d784..da5fa244 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -2,8 +2,8 @@ jdk: - openjdk17 before_install: - - wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-1.10.45.aar + - wget https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-1.10.46.aar install: - - FILE="-Dfile=sherpa-onnx-1.10.45.aar" - - mvn install:install-file $FILE -DgroupId=com.k2fsa.sherpa.onnx -DartifactId=sherpa-onnx -Dversion=1.10.45 -Dpackaging=aar -DgeneratePom=true + - FILE="-Dfile=sherpa-onnx-1.10.46.aar" + - mvn install:install-file $FILE -DgroupId=com.k2fsa.sherpa.onnx -DartifactId=sherpa-onnx -Dversion=1.10.46 -Dpackaging=aar -DgeneratePom=true diff --git a/mfc-examples/README.md b/mfc-examples/README.md index f2357337..6b4d7824 100644 --- a/mfc-examples/README.md +++ b/mfc-examples/README.md @@ -5,9 +5,9 @@ for speech recognition. |Directory| Pre-built exe (x64)|Pre-built exe (x86)| Description| |---------|--------------------|-------------------|------------| -|[./NonStreamingSpeechRecognition](./NonStreamingSpeechRecognition)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-non-streaming-asr-x64-v1.10.45.exe)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-non-streaming-asr-x86-v1.10.45.exe)| Non-streaming speech recognition| -|[./StreamingSpeechRecognition](./StreamingSpeechRecognition)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-streaming-asr-x64-v1.10.45.exe)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-streaming-asr-x86-v1.10.45.exe)| Streaming speech recognition| -|[./NonStreamingTextToSpeech](./NonStreamingTextToSpeech)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-non-streaming-tts-x64-v1.10.45.exe)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.45/sherpa-onnx-non-streaming-tts-x86-v1.10.45.exe)| Non-streaming text to speech| +|[./NonStreamingSpeechRecognition](./NonStreamingSpeechRecognition)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-non-streaming-asr-x64-v1.10.46.exe)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-non-streaming-asr-x86-v1.10.46.exe)| Non-streaming speech recognition| +|[./StreamingSpeechRecognition](./StreamingSpeechRecognition)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-streaming-asr-x64-v1.10.46.exe)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-streaming-asr-x86-v1.10.46.exe)| Streaming speech recognition| +|[./NonStreamingTextToSpeech](./NonStreamingTextToSpeech)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-non-streaming-tts-x64-v1.10.46.exe)|[URL](https://github.com/k2-fsa/sherpa-onnx/releases/download/v1.10.46/sherpa-onnx-non-streaming-tts-x86-v1.10.46.exe)| Non-streaming text to speech| Caution: You need to use Windows and install Visual Studio 2022 in order to compile it. diff --git a/new-release.sh b/new-release.sh index 9c6f9d5b..85328300 100755 --- a/new-release.sh +++ b/new-release.sh @@ -2,23 +2,23 @@ set -ex -sed -i.bak 's/1\.10\.44/1\.10\.45/g' ./build-ios-shared.sh -sed -i.bak 's/1\.10\.44/1\.10\.45/g' ./pom.xml -sed -i.bak 's/1\.10\.44/1\.10\.45/g' ./jitpack.yml -sed -i.bak 's/1\.10\.44/1\.10\.45/g' ./android/SherpaOnnxAar/README.md +sed -i.bak 's/1\.10\.45/1\.10\.46/g' ./build-ios-shared.sh +sed -i.bak 's/1\.10\.45/1\.10\.46/g' ./pom.xml +sed -i.bak 's/1\.10\.45/1\.10\.46/g' ./jitpack.yml +sed -i.bak 's/1\.10\.45/1\.10\.46/g' ./android/SherpaOnnxAar/README.md -find android -name build.gradle -type f -exec sed -i.bak 's/sherpa-onnx:v1\.10\.44/sherpa-onnx:v1\.10\.45/g' {} \; +find android -name build.gradle -type f -exec sed -i.bak 's/sherpa-onnx:v1\.10\.45/sherpa-onnx:v1\.10\.46/g' {} \; -find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; -find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; -find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; -find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; -find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; -find nodejs-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; +find flutter -name *.yaml -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; +find dart-api-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; +find flutter-examples -name *.yaml -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; +find flutter -name *.podspec -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; +find nodejs-addon-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; +find nodejs-examples -name package.json -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; -find harmony-os -name "README.md" -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; -find harmony-os -name oh-package.json5 -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; +find harmony-os -name "README.md" -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; +find harmony-os -name oh-package.json5 -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; -find mfc-examples -name "README.md" -type f -exec sed -i.bak 's/1\.10\.44/1\.10\.45/g' {} \; +find mfc-examples -name "README.md" -type f -exec sed -i.bak 's/1\.10\.45/1\.10\.46/g' {} \; find . -name "*.bak" -exec rm {} \; diff --git a/nodejs-addon-examples/package.json b/nodejs-addon-examples/package.json index da8b3858..c4e0cbe5 100644 --- a/nodejs-addon-examples/package.json +++ b/nodejs-addon-examples/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "sherpa-onnx-node": "^1.10.45" + "sherpa-onnx-node": "^1.10.46" } } diff --git a/nodejs-examples/package.json b/nodejs-examples/package.json index 97dbb34b..ef2213d0 100644 --- a/nodejs-examples/package.json +++ b/nodejs-examples/package.json @@ -2,7 +2,7 @@ "dependencies": { "mic": "^2.1.2", "naudiodon2": "^2.4.0", - "sherpa-onnx": "^1.10.45", + "sherpa-onnx": "^1.10.46", "wav": "^1.0.2" } } diff --git a/pom.xml b/pom.xml index cd57430b..8a707b8e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.k2fsa.sherpa.onnx sherpa-onnx-android - 1.10.45 + 1.10.46 https://github.com/k2-fsa/sherpa-onnx pom First Android Library diff --git a/sherpa-onnx/csrc/audio-tagging-label-file.cc b/sherpa-onnx/csrc/audio-tagging-label-file.cc index bd71bcb1..705a170d 100644 --- a/sherpa-onnx/csrc/audio-tagging-label-file.cc +++ b/sherpa-onnx/csrc/audio-tagging-label-file.cc @@ -15,8 +15,8 @@ #include "android/asset_manager_jni.h" #endif +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/macros.h" -#include "sherpa-onnx/csrc/onnx-utils.h" #include "sherpa-onnx/csrc/text-utils.h" namespace sherpa_onnx { diff --git a/sherpa-onnx/csrc/file-utils.cc b/sherpa-onnx/csrc/file-utils.cc index bc7881f2..1bd8e584 100644 --- a/sherpa-onnx/csrc/file-utils.cc +++ b/sherpa-onnx/csrc/file-utils.cc @@ -6,6 +6,7 @@ #include #include +#include #include #include "sherpa-onnx/csrc/macros.h" diff --git a/sherpa-onnx/csrc/lexicon.cc b/sherpa-onnx/csrc/lexicon.cc index 505ea37a..87a86a9e 100644 --- a/sherpa-onnx/csrc/lexicon.cc +++ b/sherpa-onnx/csrc/lexicon.cc @@ -22,8 +22,8 @@ #include "rawfile/raw_file_manager.h" #endif +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/macros.h" -#include "sherpa-onnx/csrc/onnx-utils.h" #include "sherpa-onnx/csrc/symbol-table.h" #include "sherpa-onnx/csrc/text-utils.h" diff --git a/sherpa-onnx/csrc/offline-tts-character-frontend.cc b/sherpa-onnx/csrc/offline-tts-character-frontend.cc index 0806a9fa..968e287c 100644 --- a/sherpa-onnx/csrc/offline-tts-character-frontend.cc +++ b/sherpa-onnx/csrc/offline-tts-character-frontend.cc @@ -20,9 +20,9 @@ #include "rawfile/raw_file_manager.h" #endif +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/macros.h" #include "sherpa-onnx/csrc/offline-tts-character-frontend.h" -#include "sherpa-onnx/csrc/onnx-utils.h" namespace sherpa_onnx { diff --git a/sherpa-onnx/csrc/offline-tts-kokoro-impl.h b/sherpa-onnx/csrc/offline-tts-kokoro-impl.h index d74cb80d..276e9423 100644 --- a/sherpa-onnx/csrc/offline-tts-kokoro-impl.h +++ b/sherpa-onnx/csrc/offline-tts-kokoro-impl.h @@ -15,13 +15,13 @@ #include "fst/extensions/far/far.h" #include "kaldifst/csrc/kaldi-fst-io.h" #include "kaldifst/csrc/text-normalizer.h" +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/kokoro-multi-lang-lexicon.h" #include "sherpa-onnx/csrc/lexicon.h" #include "sherpa-onnx/csrc/macros.h" #include "sherpa-onnx/csrc/offline-tts-frontend.h" #include "sherpa-onnx/csrc/offline-tts-impl.h" #include "sherpa-onnx/csrc/offline-tts-kokoro-model.h" -#include "sherpa-onnx/csrc/onnx-utils.h" #include "sherpa-onnx/csrc/piper-phonemize-lexicon.h" #include "sherpa-onnx/csrc/text-utils.h" diff --git a/sherpa-onnx/csrc/offline-tts-vits-impl.h b/sherpa-onnx/csrc/offline-tts-vits-impl.h index a8de6200..3f12035f 100644 --- a/sherpa-onnx/csrc/offline-tts-vits-impl.h +++ b/sherpa-onnx/csrc/offline-tts-vits-impl.h @@ -13,6 +13,7 @@ #include "fst/extensions/far/far.h" #include "kaldifst/csrc/kaldi-fst-io.h" #include "kaldifst/csrc/text-normalizer.h" +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/jieba-lexicon.h" #include "sherpa-onnx/csrc/lexicon.h" #include "sherpa-onnx/csrc/macros.h" @@ -21,7 +22,6 @@ #include "sherpa-onnx/csrc/offline-tts-frontend.h" #include "sherpa-onnx/csrc/offline-tts-impl.h" #include "sherpa-onnx/csrc/offline-tts-vits-model.h" -#include "sherpa-onnx/csrc/onnx-utils.h" #include "sherpa-onnx/csrc/piper-phonemize-lexicon.h" #include "sherpa-onnx/csrc/text-utils.h" diff --git a/sherpa-onnx/csrc/online-punctuation-cnn-bilstm-impl.h b/sherpa-onnx/csrc/online-punctuation-cnn-bilstm-impl.h index e586ccd0..c6ebbdf2 100644 --- a/sherpa-onnx/csrc/online-punctuation-cnn-bilstm-impl.h +++ b/sherpa-onnx/csrc/online-punctuation-cnn-bilstm-impl.h @@ -20,13 +20,13 @@ #include // NOLINT +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/macros.h" #include "sherpa-onnx/csrc/math.h" #include "sherpa-onnx/csrc/online-cnn-bilstm-model-meta-data.h" #include "sherpa-onnx/csrc/online-cnn-bilstm-model.h" #include "sherpa-onnx/csrc/online-punctuation-impl.h" #include "sherpa-onnx/csrc/online-punctuation.h" -#include "sherpa-onnx/csrc/onnx-utils.h" #include "sherpa-onnx/csrc/text-utils.h" #include "ssentencepiece/csrc/ssentencepiece.h" diff --git a/sherpa-onnx/csrc/piper-phonemize-lexicon.cc b/sherpa-onnx/csrc/piper-phonemize-lexicon.cc index 608a1ccd..c7890a93 100644 --- a/sherpa-onnx/csrc/piper-phonemize-lexicon.cc +++ b/sherpa-onnx/csrc/piper-phonemize-lexicon.cc @@ -27,8 +27,8 @@ #include "espeak-ng/speak_lib.h" #include "phoneme_ids.hpp" #include "phonemize.hpp" +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/macros.h" -#include "sherpa-onnx/csrc/onnx-utils.h" namespace sherpa_onnx { diff --git a/sherpa-onnx/csrc/symbol-table.cc b/sherpa-onnx/csrc/symbol-table.cc index 8456cf77..0ff24ec6 100644 --- a/sherpa-onnx/csrc/symbol-table.cc +++ b/sherpa-onnx/csrc/symbol-table.cc @@ -25,8 +25,8 @@ #include "sherpa-onnx/csrc/base64-decode.h" #include "sherpa-onnx/csrc/bbpe.h" +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/lexicon.h" -#include "sherpa-onnx/csrc/onnx-utils.h" #include "sherpa-onnx/csrc/text-utils.h" namespace sherpa_onnx { diff --git a/sherpa-onnx/jni/offline-tts.cc b/sherpa-onnx/jni/offline-tts.cc index 57969fee..e3441525 100644 --- a/sherpa-onnx/jni/offline-tts.cc +++ b/sherpa-onnx/jni/offline-tts.cc @@ -220,17 +220,20 @@ JNIEXPORT jlong JNICALL Java_com_k2fsa_sherpa_onnx_OfflineTts_newFromAsset( SHERPA_ONNX_EXTERN_C JNIEXPORT jlong JNICALL Java_com_k2fsa_sherpa_onnx_OfflineTts_newFromFile( JNIEnv *env, jobject /*obj*/, jobject _config) { - return SafeJNI(env, "OfflineTts_newFromFile", [&] -> jlong { - auto config = sherpa_onnx::GetOfflineTtsConfig(env, _config); - SHERPA_ONNX_LOGE("config:\n%s", config.ToString().c_str()); + return SafeJNI( + env, "OfflineTts_newFromFile", + [&]() -> jlong { + auto config = sherpa_onnx::GetOfflineTtsConfig(env, _config); + SHERPA_ONNX_LOGE("config:\n%s", config.ToString().c_str()); - if (!config.Validate()) { - SHERPA_ONNX_LOGE("Errors found in config!"); - } + if (!config.Validate()) { + SHERPA_ONNX_LOGE("Errors found in config!"); + } - auto tts = new sherpa_onnx::OfflineTts(config); - return reinterpret_cast(tts); - }, 0L); + auto tts = new sherpa_onnx::OfflineTts(config); + return reinterpret_cast(tts); + }, + 0L); } SHERPA_ONNX_EXTERN_C diff --git a/sherpa-onnx/jni/wave-reader.cc b/sherpa-onnx/jni/wave-reader.cc index 41608c6e..ebed51b0 100644 --- a/sherpa-onnx/jni/wave-reader.cc +++ b/sherpa-onnx/jni/wave-reader.cc @@ -5,8 +5,8 @@ #include +#include "sherpa-onnx/csrc/file-utils.h" #include "sherpa-onnx/csrc/macros.h" -#include "sherpa-onnx/csrc/onnx-utils.h" #include "sherpa-onnx/jni/common.h" static jobjectArray ReadWaveImpl(JNIEnv *env, std::istream &is,