diff --git a/Makefile b/Makefile index 59f8c347..e076e546 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BUILD_TYPE=Release -VERSION=1.4.6 +VERSION=1.4.7 CMAKE_PARAMETERS=-DCMAKE_BUILD_TYPE=$(BUILD_TYPE) COREML_SUPPORT=$(CMAKE_PARAMETERS) -DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON NDK := diff --git a/Whisper.net.Runtime.Clblast.nuspec b/Whisper.net.Runtime.Clblast.nuspec index 11504b2b..c0fac9e5 100644 --- a/Whisper.net.Runtime.Clblast.nuspec +++ b/Whisper.net.Runtime.Clblast.nuspec @@ -3,7 +3,7 @@ Whisper.net.Runtime.Clblast Whisper.Net.Runtime.Clblast - 1.4.6 + 1.4.7 Sandro Hanea Sandro Hanea false diff --git a/Whisper.net.Runtime.Clblast/win-x64/whisper.dll b/Whisper.net.Runtime.Clblast/win-x64/whisper.dll index 39bee1aa..ac364845 100755 Binary files a/Whisper.net.Runtime.Clblast/win-x64/whisper.dll and b/Whisper.net.Runtime.Clblast/win-x64/whisper.dll differ diff --git a/Whisper.net.Runtime.CoreML.nuspec b/Whisper.net.Runtime.CoreML.nuspec index ed912b60..c2e1a418 100644 --- a/Whisper.net.Runtime.CoreML.nuspec +++ b/Whisper.net.Runtime.CoreML.nuspec @@ -3,7 +3,7 @@ Whisper.net.Runtime.CoreML Whisper.Net.Runtime.CoreML - 1.4.6 + 1.4.7 Sandro Hanea Sandro Hanea false diff --git a/Whisper.net.Runtime.CoreML/ios-device/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/ios-device/libwhisper.coreml.dylib index b77ec307..34552b2e 100755 Binary files a/Whisper.net.Runtime.CoreML/ios-device/libwhisper.coreml.dylib and b/Whisper.net.Runtime.CoreML/ios-device/libwhisper.coreml.dylib differ diff --git a/Whisper.net.Runtime.CoreML/ios-device/libwhisper.dylib b/Whisper.net.Runtime.CoreML/ios-device/libwhisper.dylib index d203c364..c39324e2 100755 Binary files a/Whisper.net.Runtime.CoreML/ios-device/libwhisper.dylib and b/Whisper.net.Runtime.CoreML/ios-device/libwhisper.dylib differ diff --git a/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.coreml.dylib index dbe3034c..14657f1f 100755 Binary files a/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.coreml.dylib and b/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.coreml.dylib differ diff --git a/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.dylib b/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.dylib index 925c4471..4ce607b8 100755 Binary files a/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.dylib and b/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.dylib differ diff --git a/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.coreml.dylib index a87a1002..312bfd37 100755 Binary files a/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.coreml.dylib and b/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.coreml.dylib differ diff --git a/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.dylib b/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.dylib index 7be29034..cf15c550 100755 Binary files a/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.dylib and b/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.dylib differ diff --git a/Whisper.net.Runtime.CoreML/macos/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/macos/libwhisper.coreml.dylib index 6f736b77..f122b33e 100755 Binary files a/Whisper.net.Runtime.CoreML/macos/libwhisper.coreml.dylib and b/Whisper.net.Runtime.CoreML/macos/libwhisper.coreml.dylib differ diff --git a/Whisper.net.Runtime.CoreML/macos/libwhisper.dylib b/Whisper.net.Runtime.CoreML/macos/libwhisper.dylib index 94e71ee3..cb8b62de 100755 Binary files a/Whisper.net.Runtime.CoreML/macos/libwhisper.dylib and b/Whisper.net.Runtime.CoreML/macos/libwhisper.dylib differ diff --git a/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.coreml.dylib index 2901cd40..d84272c3 100755 Binary files a/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.coreml.dylib and b/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.coreml.dylib differ diff --git a/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.dylib b/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.dylib index 7a8d7084..f057d03e 100755 Binary files a/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.dylib and b/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.dylib differ diff --git a/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.coreml.dylib index ec830757..204101ed 100755 Binary files a/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.coreml.dylib and b/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.coreml.dylib differ diff --git a/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.dylib b/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.dylib index a3a26341..31d4dd46 100755 Binary files a/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.dylib and b/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.dylib differ diff --git a/Whisper.net.Runtime.Cublas.nuspec b/Whisper.net.Runtime.Cublas.nuspec index e059fac1..f4c75621 100644 --- a/Whisper.net.Runtime.Cublas.nuspec +++ b/Whisper.net.Runtime.Cublas.nuspec @@ -3,7 +3,7 @@ Whisper.net.Runtime.Cublas Whisper.Net.Runtime.Cublas - 1.4.6 + 1.4.7 Sandro Hanea Sandro Hanea false diff --git a/Whisper.net.Runtime.Cublas/win-x64/whisper.dll b/Whisper.net.Runtime.Cublas/win-x64/whisper.dll index 33c78f16..43155dd4 100755 Binary files a/Whisper.net.Runtime.Cublas/win-x64/whisper.dll and b/Whisper.net.Runtime.Cublas/win-x64/whisper.dll differ diff --git a/Whisper.net.Runtime.Wasm.nuspec b/Whisper.net.Runtime.Wasm.nuspec index 9cc305f0..3a846dd2 100644 --- a/Whisper.net.Runtime.Wasm.nuspec +++ b/Whisper.net.Runtime.Wasm.nuspec @@ -3,7 +3,7 @@ Whisper.net.Runtime.Wasm Whisper.Net.Runtime.Wasm - 1.4.6 + 1.4.7 Sandro Hanea Sandro Hanea false diff --git a/Whisper.net.Runtime.Wasm/whisper.a b/Whisper.net.Runtime.Wasm/whisper.a index b7bdc958..9ae4f4a4 100644 Binary files a/Whisper.net.Runtime.Wasm/whisper.a and b/Whisper.net.Runtime.Wasm/whisper.a differ diff --git a/Whisper.net.Runtime.nuspec b/Whisper.net.Runtime.nuspec index 3d8cbc4c..d34946de 100644 --- a/Whisper.net.Runtime.nuspec +++ b/Whisper.net.Runtime.nuspec @@ -3,7 +3,7 @@ Whisper.net.Runtime Whisper.Net.Runtime - 1.4.6 + 1.4.7 Sandro Hanea Sandro Hanea false diff --git a/Whisper.net.Runtime/android-arm64-v8a/libwhisper.so b/Whisper.net.Runtime/android-arm64-v8a/libwhisper.so index 20c56c4b..9291fc9f 100755 Binary files a/Whisper.net.Runtime/android-arm64-v8a/libwhisper.so and b/Whisper.net.Runtime/android-arm64-v8a/libwhisper.so differ diff --git a/Whisper.net.Runtime/android-x86/libwhisper.so b/Whisper.net.Runtime/android-x86/libwhisper.so index fe543022..e9751f03 100755 Binary files a/Whisper.net.Runtime/android-x86/libwhisper.so and b/Whisper.net.Runtime/android-x86/libwhisper.so differ diff --git a/Whisper.net.Runtime/android-x86_64/libwhisper.so b/Whisper.net.Runtime/android-x86_64/libwhisper.so index 6976aba1..6b0be4e6 100755 Binary files a/Whisper.net.Runtime/android-x86_64/libwhisper.so and b/Whisper.net.Runtime/android-x86_64/libwhisper.so differ diff --git a/Whisper.net.Runtime/ios-device/libwhisper.dylib b/Whisper.net.Runtime/ios-device/libwhisper.dylib index b254dc5b..e060cdf1 100755 Binary files a/Whisper.net.Runtime/ios-device/libwhisper.dylib and b/Whisper.net.Runtime/ios-device/libwhisper.dylib differ diff --git a/Whisper.net.Runtime/ios-simulator/libwhisper.dylib b/Whisper.net.Runtime/ios-simulator/libwhisper.dylib index 2125393a..a9bc7738 100755 Binary files a/Whisper.net.Runtime/ios-simulator/libwhisper.dylib and b/Whisper.net.Runtime/ios-simulator/libwhisper.dylib differ diff --git a/Whisper.net.Runtime/linux-arm/whisper.so b/Whisper.net.Runtime/linux-arm/whisper.so index a4012d4e..578850f3 100755 Binary files a/Whisper.net.Runtime/linux-arm/whisper.so and b/Whisper.net.Runtime/linux-arm/whisper.so differ diff --git a/Whisper.net.Runtime/linux-arm64/whisper.so b/Whisper.net.Runtime/linux-arm64/whisper.so index df80f3c6..08839910 100755 Binary files a/Whisper.net.Runtime/linux-arm64/whisper.so and b/Whisper.net.Runtime/linux-arm64/whisper.so differ diff --git a/Whisper.net.Runtime/linux-x64/whisper.so b/Whisper.net.Runtime/linux-x64/whisper.so index db37c027..9a3eac30 100755 Binary files a/Whisper.net.Runtime/linux-x64/whisper.so and b/Whisper.net.Runtime/linux-x64/whisper.so differ diff --git a/Whisper.net.Runtime/maccatalyst/libwhisper.dylib b/Whisper.net.Runtime/maccatalyst/libwhisper.dylib index 7de66448..bd8e779c 100755 Binary files a/Whisper.net.Runtime/maccatalyst/libwhisper.dylib and b/Whisper.net.Runtime/maccatalyst/libwhisper.dylib differ diff --git a/Whisper.net.Runtime/macos/libwhisper.dylib b/Whisper.net.Runtime/macos/libwhisper.dylib index 7eea6de4..a337acc8 100755 Binary files a/Whisper.net.Runtime/macos/libwhisper.dylib and b/Whisper.net.Runtime/macos/libwhisper.dylib differ diff --git a/Whisper.net.Runtime/osx-arm64/whisper.dylib b/Whisper.net.Runtime/osx-arm64/whisper.dylib index cce1493b..ac97bd09 100755 Binary files a/Whisper.net.Runtime/osx-arm64/whisper.dylib and b/Whisper.net.Runtime/osx-arm64/whisper.dylib differ diff --git a/Whisper.net.Runtime/osx-x64/whisper.dylib b/Whisper.net.Runtime/osx-x64/whisper.dylib index bab7f1b4..185de47e 100644 Binary files a/Whisper.net.Runtime/osx-x64/whisper.dylib and b/Whisper.net.Runtime/osx-x64/whisper.dylib differ diff --git a/Whisper.net.Runtime/tvos-device/libwhisper.dylib b/Whisper.net.Runtime/tvos-device/libwhisper.dylib index b94e747e..25ce3d25 100755 Binary files a/Whisper.net.Runtime/tvos-device/libwhisper.dylib and b/Whisper.net.Runtime/tvos-device/libwhisper.dylib differ diff --git a/Whisper.net.Runtime/tvos-simulator/libwhisper.dylib b/Whisper.net.Runtime/tvos-simulator/libwhisper.dylib index 60c77944..b000a922 100755 Binary files a/Whisper.net.Runtime/tvos-simulator/libwhisper.dylib and b/Whisper.net.Runtime/tvos-simulator/libwhisper.dylib differ diff --git a/Whisper.net.Runtime/win-arm/whisper.dll b/Whisper.net.Runtime/win-arm/whisper.dll index 8a8725c0..c708191e 100755 Binary files a/Whisper.net.Runtime/win-arm/whisper.dll and b/Whisper.net.Runtime/win-arm/whisper.dll differ diff --git a/Whisper.net.Runtime/win-arm64/whisper.dll b/Whisper.net.Runtime/win-arm64/whisper.dll index cb39c7a7..2c1e2061 100755 Binary files a/Whisper.net.Runtime/win-arm64/whisper.dll and b/Whisper.net.Runtime/win-arm64/whisper.dll differ diff --git a/Whisper.net.Runtime/win-x64/whisper.dll b/Whisper.net.Runtime/win-x64/whisper.dll index b07bf84d..b1716434 100755 Binary files a/Whisper.net.Runtime/win-x64/whisper.dll and b/Whisper.net.Runtime/win-x64/whisper.dll differ diff --git a/Whisper.net.Runtime/win-x86/whisper.dll b/Whisper.net.Runtime/win-x86/whisper.dll index 2bbc6d89..d7270fc4 100755 Binary files a/Whisper.net.Runtime/win-x86/whisper.dll and b/Whisper.net.Runtime/win-x86/whisper.dll differ diff --git a/Whisper.net.Tests/ProcessFunctionalTests.cs b/Whisper.net.Tests/ProcessFunctionalTests.cs index 6eb4b1a5..a7b872d2 100644 --- a/Whisper.net.Tests/ProcessFunctionalTests.cs +++ b/Whisper.net.Tests/ProcessFunctionalTests.cs @@ -79,7 +79,7 @@ public async Task TestAutoDetectLanguageWithRomanian() segments.Add(segment); } segments.Should().HaveCountGreaterThan(0); - encoderBegins.Should().HaveCount(1); + encoderBegins.Should().HaveCountGreaterThanOrEqualTo(1); segments.Should().AllSatisfy(s => s.Language.Should().Be("ro")); segments.Should().Contain(segmentData => segmentData.Text.Contains("efectua")); } diff --git a/Whisper.net/Whisper.net.csproj b/Whisper.net/Whisper.net.csproj index 22d00365..37164a3d 100755 --- a/Whisper.net/Whisper.net.csproj +++ b/Whisper.net/Whisper.net.csproj @@ -4,7 +4,7 @@ enable enable 10 - 1.4.6 + 1.4.7 Sandro Hanea Cross-platform dotnet bindings for Whisper. https://github.com/sandrohanea/whisper.net @@ -26,7 +26,7 @@ - net6.0;netstandard2.0;netstandard2.1;net6.0-ios;net6.0-tvos;net6.0-maccatalyst;net6.0-android + net6.0;netstandard2.0;netstandard2.1;net7.0-ios;net7.0-tvos;net7.0-maccatalyst;net7.0-android diff --git a/examples/BlazorWasm/BlazorWasm.csproj b/examples/BlazorWasm/BlazorWasm.csproj index f7b41082..fe925e38 100644 --- a/examples/BlazorWasm/BlazorWasm.csproj +++ b/examples/BlazorWasm/BlazorWasm.csproj @@ -10,8 +10,8 @@ - - + + \ No newline at end of file diff --git a/examples/ClblastGpu/ClblastGpu.csproj b/examples/ClblastGpu/ClblastGpu.csproj index b1274972..6436595f 100644 --- a/examples/ClblastGpu/ClblastGpu.csproj +++ b/examples/ClblastGpu/ClblastGpu.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/ContinuousRecognition/ContinuousRecognition.csproj b/examples/ContinuousRecognition/ContinuousRecognition.csproj index c2fbc5ef..ab2e5fb0 100644 --- a/examples/ContinuousRecognition/ContinuousRecognition.csproj +++ b/examples/ContinuousRecognition/ContinuousRecognition.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/examples/CoreML/CoreML.csproj b/examples/CoreML/CoreML.csproj index 7506e949..75ecfc29 100644 --- a/examples/CoreML/CoreML.csproj +++ b/examples/CoreML/CoreML.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/CoreML/Program.cs b/examples/CoreML/Program.cs index 6e2dab0b..429978a9 100644 --- a/examples/CoreML/Program.cs +++ b/examples/CoreML/Program.cs @@ -2,8 +2,6 @@ using System; using System.IO; -using System.IO.Compression; -using System.Net.Http; using System.Threading.Tasks; using Whisper.net; using Whisper.net.Ggml; @@ -34,7 +32,7 @@ await WhisperGgmlDownloader.GetEncoderCoreMLModelAsync(ggmlType) } // This section creates the whisperFactory object which is used to create the processor object. - using var whisperFactory = WhisperFactory.FromPath("ggml-base.bin"); + using var whisperFactory = WhisperFactory.FromPath(modelFileName); // This section creates the processor object which is used to process the audio file, it uses language `auto` to detect the language of the audio file. using var processor = whisperFactory.CreateBuilder() diff --git a/examples/Cublas/Cublas.csproj b/examples/Cublas/Cublas.csproj index 0163c6ad..3cabe67a 100644 --- a/examples/Cublas/Cublas.csproj +++ b/examples/Cublas/Cublas.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/Diarization/Diarization.csproj b/examples/Diarization/Diarization.csproj index db815b11..46b7455d 100644 --- a/examples/Diarization/Diarization.csproj +++ b/examples/Diarization/Diarization.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/examples/NAudioMp3/NAudioMp3.csproj b/examples/NAudioMp3/NAudioMp3.csproj index d7917753..d3d8bcc7 100644 --- a/examples/NAudioMp3/NAudioMp3.csproj +++ b/examples/NAudioMp3/NAudioMp3.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/examples/NAudioResampleWav/NAudioResampleWav.csproj b/examples/NAudioResampleWav/NAudioResampleWav.csproj index b1cb3778..f25d9678 100644 --- a/examples/NAudioResampleWav/NAudioResampleWav.csproj +++ b/examples/NAudioResampleWav/NAudioResampleWav.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/examples/Simple/Simple.csproj b/examples/Simple/Simple.csproj index e16b3296..ae08c2d1 100644 --- a/examples/Simple/Simple.csproj +++ b/examples/Simple/Simple.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/examples/SimpleSync/SimpleSync.csproj b/examples/SimpleSync/SimpleSync.csproj index 994cf1a2..38d2e42a 100644 --- a/examples/SimpleSync/SimpleSync.csproj +++ b/examples/SimpleSync/SimpleSync.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/readme.md b/readme.md index 20ca0a66..c839bac2 100644 --- a/readme.md +++ b/readme.md @@ -14,8 +14,8 @@ To install Whisper.net, run the following command in the [Package Manager Consol or simply add a package reference in your csproj: ``` - - + + ``` ## TFL Community @@ -32,8 +32,8 @@ The runtime package, Whisper.net.Runtime, contains the native whisper.cpp librar Whisper.net.Runtime.CoreML contains the native whisper.cpp library with Apple CoreML support enabled. Using this on Apple hardware (macOS, iOS, etc.) can net performance improvements over the core runtimes. To use it, reference the `Whisper.net.Runtime.CoreML` nuget, ``` - - + + ``` Note that only the CoreML built libraries are available in this package and does not contain libraries for other platforms (Linux, Windows, etc). If you are creating a cross-platform application you can use conditional target frameworks to install the correct library package for each version. diff --git a/whisper.cpp b/whisper.cpp index 18e98894..2f52783a 160000 --- a/whisper.cpp +++ b/whisper.cpp @@ -1 +1 @@ -Subproject commit 18e9889418f9b94635bb68c28168269cbad1d63e +Subproject commit 2f52783a080e8955e80e4324fed73e2f906bb80c