Bumped version to 1.4.7 (#107)

* Bumped version to 1.4.7 * Switched back to dotnet 7 in build pipeline * Bumped ios, tvos, android and maccatalyst to net7 * Added CoreML 1.4.7 * small refactor for coreml example during test
sandrohanea · Sep 2, 2023 · 4f9a238 · 4f9a238
1 parent b927e36
commit 4f9a238
Show file tree

Hide file tree

Showing 54 changed files with 35 additions and 37 deletions.
diff --git 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
@@ -3,7 +3,7 @@
   <metadata>
     <id>Whisper.net.Runtime.Clblast</id>
     <title>Whisper.Net.Runtime.Clblast</title>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <authors>Sandro Hanea</authors>
     <owners>Sandro Hanea</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/Whisper.net.Runtime.Clblast/win-x64/whisper.dll b/Whisper.net.Runtime.Clblast/win-x64/whisper.dll
diff --git a/Whisper.net.Runtime.CoreML.nuspec b/Whisper.net.Runtime.CoreML.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Whisper.net.Runtime.CoreML</id>
     <title>Whisper.Net.Runtime.CoreML</title>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <authors>Sandro Hanea</authors>
     <owners>Sandro Hanea</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/Whisper.net.Runtime.CoreML/ios-device/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/ios-device/libwhisper.coreml.dylib
diff --git a/Whisper.net.Runtime.CoreML/ios-device/libwhisper.dylib b/Whisper.net.Runtime.CoreML/ios-device/libwhisper.dylib
diff --git a/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.coreml.dylib
diff --git a/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.dylib b/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.dylib
diff --git a/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.coreml.dylib
diff --git a/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.dylib b/Whisper.net.Runtime.CoreML/maccatalyst/libwhisper.dylib
diff --git a/Whisper.net.Runtime.CoreML/macos/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/macos/libwhisper.coreml.dylib
diff --git a/Whisper.net.Runtime.CoreML/macos/libwhisper.dylib b/Whisper.net.Runtime.CoreML/macos/libwhisper.dylib
diff --git a/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.coreml.dylib
diff --git a/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.dylib b/Whisper.net.Runtime.CoreML/tvos-device/libwhisper.dylib
diff --git a/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.coreml.dylib b/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.coreml.dylib
diff --git a/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.dylib b/Whisper.net.Runtime.CoreML/tvos-simulator/libwhisper.dylib
diff --git a/Whisper.net.Runtime.Cublas.nuspec b/Whisper.net.Runtime.Cublas.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Whisper.net.Runtime.Cublas</id>
     <title>Whisper.Net.Runtime.Cublas</title>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <authors>Sandro Hanea</authors>
     <owners>Sandro Hanea</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/Whisper.net.Runtime.Cublas/win-x64/whisper.dll b/Whisper.net.Runtime.Cublas/win-x64/whisper.dll
diff --git a/Whisper.net.Runtime.Wasm.nuspec b/Whisper.net.Runtime.Wasm.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Whisper.net.Runtime.Wasm</id>
     <title>Whisper.Net.Runtime.Wasm</title>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <authors>Sandro Hanea</authors>
     <owners>Sandro Hanea</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/Whisper.net.Runtime.Wasm/whisper.a b/Whisper.net.Runtime.Wasm/whisper.a
diff --git a/Whisper.net.Runtime.nuspec b/Whisper.net.Runtime.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Whisper.net.Runtime</id>
     <title>Whisper.Net.Runtime</title>
-    <version>1.4.6</version>
+    <version>1.4.7</version>
     <authors>Sandro Hanea</authors>
     <owners>Sandro Hanea</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/Whisper.net.Runtime/android-arm64-v8a/libwhisper.so b/Whisper.net.Runtime/android-arm64-v8a/libwhisper.so
diff --git a/Whisper.net.Runtime/android-x86/libwhisper.so b/Whisper.net.Runtime/android-x86/libwhisper.so
diff --git a/Whisper.net.Runtime/android-x86_64/libwhisper.so b/Whisper.net.Runtime/android-x86_64/libwhisper.so
diff --git a/Whisper.net.Runtime/ios-device/libwhisper.dylib b/Whisper.net.Runtime/ios-device/libwhisper.dylib
diff --git a/Whisper.net.Runtime/ios-simulator/libwhisper.dylib b/Whisper.net.Runtime/ios-simulator/libwhisper.dylib
diff --git a/Whisper.net.Runtime/linux-arm/whisper.so b/Whisper.net.Runtime/linux-arm/whisper.so
diff --git a/Whisper.net.Runtime/linux-arm64/whisper.so b/Whisper.net.Runtime/linux-arm64/whisper.so
diff --git a/Whisper.net.Runtime/linux-x64/whisper.so b/Whisper.net.Runtime/linux-x64/whisper.so
diff --git a/Whisper.net.Runtime/maccatalyst/libwhisper.dylib b/Whisper.net.Runtime/maccatalyst/libwhisper.dylib
diff --git a/Whisper.net.Runtime/macos/libwhisper.dylib b/Whisper.net.Runtime/macos/libwhisper.dylib
diff --git a/Whisper.net.Runtime/osx-arm64/whisper.dylib b/Whisper.net.Runtime/osx-arm64/whisper.dylib
diff --git a/Whisper.net.Runtime/osx-x64/whisper.dylib b/Whisper.net.Runtime/osx-x64/whisper.dylib
diff --git a/Whisper.net.Runtime/tvos-device/libwhisper.dylib b/Whisper.net.Runtime/tvos-device/libwhisper.dylib
diff --git a/Whisper.net.Runtime/tvos-simulator/libwhisper.dylib b/Whisper.net.Runtime/tvos-simulator/libwhisper.dylib
diff --git a/Whisper.net.Runtime/win-arm/whisper.dll b/Whisper.net.Runtime/win-arm/whisper.dll
diff --git a/Whisper.net.Runtime/win-arm64/whisper.dll b/Whisper.net.Runtime/win-arm64/whisper.dll
diff --git a/Whisper.net.Runtime/win-x64/whisper.dll b/Whisper.net.Runtime/win-x64/whisper.dll
diff --git a/Whisper.net.Runtime/win-x86/whisper.dll b/Whisper.net.Runtime/win-x86/whisper.dll
diff --git 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
@@ -4,7 +4,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<LangVersion>10</LangVersion>
-		<Version>1.4.6</Version>
+		<Version>1.4.7</Version>
 		<Authors>Sandro Hanea</Authors>
 		<Description>Cross-platform dotnet bindings for Whisper.</Description>
 		<PackageProjectUrl>https://github.com/sandrohanea/whisper.net</PackageProjectUrl>
@@ -26,7 +26,7 @@
 
 	<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX')) Or $([MSBuild]::IsOSPlatform('Windows'))">
 		<TargetFrameworks>
-			net6.0;netstandard2.0;netstandard2.1;net6.0-ios;net6.0-tvos;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
+			net6.0;netstandard2.0;netstandard2.1;net7.0-ios;net7.0-tvos;net7.0-maccatalyst;net7.0-android</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

diff --git a/examples/BlazorWasm/BlazorWasm.csproj b/examples/BlazorWasm/BlazorWasm.csproj
@@ -10,8 +10,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" PrivateAssets="all" />
-    <PackageReference Include="Whisper.net.Runtime.Wasm" Version="1.4.6" />
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime.Wasm" Version="1.4.7" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/ClblastGpu/ClblastGpu.csproj b/examples/ClblastGpu/ClblastGpu.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whisper.net.Runtime.Clblast" Version="1.4.6" />
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime.Clblast" Version="1.4.7" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/ContinuousRecognition/ContinuousRecognition.csproj b/examples/ContinuousRecognition/ContinuousRecognition.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.7" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/CoreML/CoreML.csproj b/examples/CoreML/CoreML.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
-    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
+    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whisper.net.Runtime.Cublas" Version="1.4.6" />
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime.Cublas" Version="1.4.7" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Diarization/Diarization.csproj b/examples/Diarization/Diarization.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/NAudioMp3/NAudioMp3.csproj b/examples/NAudioMp3/NAudioMp3.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="NAudio" Version="2.2.0" />
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/NAudioResampleWav/NAudioResampleWav.csproj b/examples/NAudioResampleWav/NAudioResampleWav.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="NAudio" Version="2.2.0" />
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/Simple/Simple.csproj b/examples/Simple/Simple.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.7" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/SimpleSync/SimpleSync.csproj b/examples/SimpleSync/SimpleSync.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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:
 
 ```
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.7" />
 ```
 
 ## 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,
 
 ```
-    <PackageReference Include="Whisper.net" Version="1.4.6" />
-    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.7" />
+    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.7" />
 ```
 
 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
+29 −26		.github/workflows/build.yml
+1 −1		examples/whisper.android/app/build.gradle
+30 −21		examples/whisper.android/app/src/main/jni/whisper/CMakeLists.txt
+10 −3		ggml.c
+9 −2		whisper.cpp