Release/1.4.6 (#90)

* Released 1.4.6 * Fixed CoreML TODO
sandrohanea · Jul 2, 2023 · 88c65f1 · 88c65f1
1 parent 441433d
commit 88c65f1
Show file tree

Hide file tree

Showing 48 changed files with 40 additions and 46 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 BUILD_TYPE=Release
-VERSION=1.4.5
+VERSION=1.4.6
 CMAKE_PARAMETERS=-DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
 COREML_SUPPORT=$(CMAKE_PARAMETERS) -DWHISPER_COREML=ON -DWHISPER_COREML_ALLOW_FALLBACK=ON
 NDK :=
@@ -17,10 +17,10 @@ nuget:
 	mkdir -p nupkgs
 	nuget pack Whisper.net.Runtime.nuspec -Version $(VERSION) -OutputDirectory ./nupkgs
 	dotnet pack Whisper.net/Whisper.net.csproj -p:Version=$(VERSION) -o ./nupkgs -c $(BUILD_TYPE)
-
-nuget_coreml:
-	mkdir -p nupkgs
 	nuget pack Whisper.net.Runtime.CoreML.nuspec -Version $(VERSION) -OutputDirectory ./nupkgs
+	nuget pack Whisper.net.Runtime.Cublas.nuspec -Version $(VERSION) -OutputDirectory ./nupkgs
+	nuget pack Whisper.net.Runtime.Clblast.nuspec -Version $(VERSION) -OutputDirectory ./nupkgs
+	nuget pack Whisper.net.Runtime.Wasm.nuspec -Version $(VERSION) -OutputDirectory ./nupkgs
 
 clean:
 	rm -rf nupkgs

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.5</version>
+    <version>1.4.6</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.5</version>
+    <version>1.4.6</version>
     <authors>Sandro Hanea</authors>
     <owners>Sandro Hanea</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

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.dylib b/Whisper.net.Runtime.CoreML/ios-simulator/libwhisper.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.dylib b/Whisper.net.Runtime.CoreML/macos/libwhisper.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.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.5</version>
+    <version>1.4.6</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.5</version>
+    <version>1.4.6</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.5</version>
+    <version>1.4.6</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/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.5</Version>
+		<Version>1.4.6</Version>
 		<Authors>Sandro Hanea</Authors>
 		<Description>Cross-platform dotnet bindings for Whisper.</Description>
 		<PackageProjectUrl>https://github.com/sandrohanea/whisper.net</PackageProjectUrl>

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.7" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.7" PrivateAssets="all" />
-    <PackageReference Include="Whisper.net.Runtime.Wasm" Version="1.4.5" />
-    <PackageReference Include="Whisper.net" Version="1.4.5" />
+    <PackageReference Include="Whisper.net.Runtime.Wasm" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
   </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.5" />
-    <PackageReference Include="Whisper.net" Version="1.4.5" />
+    <PackageReference Include="Whisper.net.Runtime.Clblast" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
   </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.5" />
-    <PackageReference Include="Whisper.net" Version="1.4.5" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
   </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.5" />
-    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.5" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/examples/CoreML/Program.cs b/examples/CoreML/Program.cs
@@ -26,17 +26,11 @@ public static async Task Main(string[] args)
         }
 
         // This sections detects whether the modelc directory (used by CoreML) is in out project disk. If it doesn't, it downloads it and extract it to the current folder.
-        // TODO: Replace with WhisperGgmlDownloader.GetEncoderCoreMLModelAsync()
         if (!Directory.Exists(coreMlModelcName))
         {
-            using var httpClient = new HttpClient();
-            var url = $"https://huggingface.co/sandrohanea/whisper.net/resolve/v1/coreml/ggml-base-encoder.zip";
-
-            var request = new HttpRequestMessage(HttpMethod.Get, url);
-            var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-            response.EnsureSuccessStatusCode();
-            using var zipArchive = new ZipArchive(await response.Content.ReadAsStreamAsync());
-            zipArchive.ExtractToDirectory(".");
+            // Note: The modelc directory needs to be extracted at the same level as the "ggml-base.bin" file (and the current executable).
+            await WhisperGgmlDownloader.GetEncoderCoreMLModelAsync(ggmlType)
+                                       .ExtractToPath(".");
         }
 
         // This section creates the whisperFactory object which is used to create the processor object.

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.5" />
-    <PackageReference Include="Whisper.net" Version="1.4.5" />
+    <PackageReference Include="Whisper.net.Runtime.Cublas" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
   </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.5" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.5" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
   </ItemGroup>
 
   <ItemGroup>

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

diff --git a/examples/NAudioResampleWav/NAudioResampleWav.csproj b/examples/NAudioResampleWav/NAudioResampleWav.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="NAudio" Version="2.1.0" />
-    <PackageReference Include="Whisper.net" Version="1.4.5" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.5" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
   </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.5" />
-    <PackageReference Include="Whisper.net" Version="1.4.5" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
   </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.5" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.5" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
   </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.5" />
-    <PackageReference Include="Whisper.net.Runtime" Version="1.4.5" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime" Version="1.4.6" />
 ```
 
 ## Runtime
@@ -27,8 +27,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.5" />
-    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.5" />
+    <PackageReference Include="Whisper.net" Version="1.4.6" />
+    <PackageReference Include="Whisper.net.Runtime.CoreML" Version="1.4.6" />
 ```
 
 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/scripts/build-osx.ps1 b/scripts/build-osx.ps1
@@ -60,5 +60,5 @@ function BuildWasm() {
 }
 
 BuildWasm
-#BuildOsxArm64
-#BuildOsxX64
+BuildOsxArm64
+BuildOsxX64
diff --git a/whisper.cpp b/whisper.cpp
+1 −1		CMakeLists.txt
+13 −6		Makefile
+3 −1		README.md
+1 −1		bindings/go/Makefile
+14 −6		bindings/go/pkg/whisper/context.go
+5 −1		bindings/go/pkg/whisper/interface.go
+53 −1		bindings/go/whisper.go
+1 −1		bindings/go/whisper_test.go
+11 −0		examples/common-ggml.cpp
+252 −40		examples/common.cpp
+32 −2		examples/common.h
+154 −81		examples/main/main.cpp
+18 −16		examples/quantize/quantize.cpp
+2 −2		examples/talk-llama/llama-util.h
+3 −3		examples/talk-llama/llama.cpp
+1 −1		examples/whisper.nvim/whisper.nvim
+36 −24		extra/quantize-all.sh
+4 −1		extra/sync-ggml.sh
+2,738 −613		ggml-cuda.cu
+15 −2		ggml-cuda.h
+67 −0		ggml-metal.h
+980 −0		ggml-metal.m
+1,829 −0		ggml-metal.metal
+0 −361		ggml-opencl.c
+1,861 −0		ggml-opencl.cpp
+11 −10		ggml-opencl.h
+4,641 −1,608		ggml.c
+427 −25		ggml.h
+28 −7		models/convert-pt-to-ggml.py
+1 −1		models/download-ggml-model.cmd
+1 −1		models/download-ggml-model.sh
+109 −0		models/ggml_to_pt.py
+8 −32		whisper.cpp