Various fixes

sandrohanea · Jun 30, 2024 · 9dce1c1 · 9dce1c1
1 parent 9ec95f8
commit 9dce1c1
Show file tree

Hide file tree

Showing 22 changed files with 236 additions and 88 deletions.
diff --git a/.github/workflows/android-native-build.yaml b/.github/workflows/android-native-build.yaml
@@ -4,8 +4,8 @@ name: Android Native build
 on:
   push:
     branches: [ "main" ]
-  #pull_request:
-  #  branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 
 jobs:

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -6,8 +6,8 @@ name: CI
 on:
   push:
     branches: [ "main" ]
-  # pull_request:
-  #   branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 jobs:
   build:

diff --git a/.github/workflows/linux-native-build.yml b/.github/workflows/linux-native-build.yml
@@ -3,8 +3,8 @@ name: Linux Native build
 on:
   push:
     branches: [ "main" ]
-  #pull_request:
-  #  branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 
 jobs:

diff --git a/.github/workflows/wasm-native-build.yaml b/.github/workflows/wasm-native-build.yaml
@@ -4,8 +4,8 @@ name: Wasm Native build
 on:
   push:
     branches: [ "main" ]
-  #pull_request:
-  #  branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 jobs:
   build:

diff --git a/.github/workflows/windows-arm-native-build.yml b/.github/workflows/windows-arm-native-build.yml
@@ -3,8 +3,8 @@ name: Windows ARM native build
 on:
   push:
     branches: [ "main" ]
-  #pull_request:
-  #  branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 
 jobs:

diff --git a/.github/workflows/windows-native-build.yml b/.github/workflows/windows-native-build.yml
@@ -3,8 +3,8 @@ name: Windows native build
 on:
   push:
     branches: [ "main" ]
-  #pull_request:
-  #  branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 
 jobs:

diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ nuget:
 	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 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.Cuda.nuspec -Version $(VERSION) -OutputDirectory ./nupkgs
 
 clean:
 	rm -rf nupkgs
@@ -34,7 +34,7 @@ apple_arm: macos_arm64 ios maccatalyst_arm64  ios_simulator_arm64  tvos_simulato
 apple_coreml_x64: copy_metal_coreml macos_x64_coreml
 apple_coreml_arm: macos_arm64_coreml ios_coreml  maccatalyst_arm64_coreml ios_simulator_coreml tvos_simulator_coreml tvos_coreml
 
-linux: linux_x64_cublas linux_x64 linux_arm64 linux_arm 
+linux: linux_x64_cuda linux_x64 linux_arm64 linux_arm 
 
 copy_metal:
 	cp whisper.cpp/ggml/src/ggml-metal.m Whisper.net.Runtime/ggml-metal.metal
@@ -70,14 +70,14 @@ linux_arm:
 	cp build/linux-arm/whisper.cpp/src/libwhisper.so ./Whisper.net.Runtime/linux-arm/libwhisper.so
 	cp build/linux-arm/whisper.cpp/ggml/src/libggml.so ./Whisper.net.Runtime/linux-arm/libggml.so
 
-linux_x64_cublas:
-	rm -rf build/linux-x64-cublas
-	cmake -S . -B build/linux-x64-cublas -DCMAKE_C_COMPILER=x86_64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=x86_64-linux-gnu-g++ -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DGGML_CUDA=ON
-	cmake --build build/linux-x64-cublas --config $(BUILD_TYPE)
+linux_x64_cuda:
+	rm -rf build/linux-x64-cuda
+	cmake -S . -B build/linux-x64-cuda -DCMAKE_C_COMPILER=x86_64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=x86_64-linux-gnu-g++ -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DGGML_CUDA=ON
+	cmake --build build/linux-x64-cuda --config $(BUILD_TYPE)
 	find . -name "libwhisper.so"
 	find . -name "libggml.so"
-	cp build/linux-x64-cublas/whisper.cpp/src/libwhisper.so ./Whisper.net.Runtime.Cublas/linux-x64/libwhisper.so
-	cp build/linux-x64-cublas/whisper.cpp/ggml/src/libggml.so ./Whisper.net.Runtime.Cublas/linux-x64/libggml.so
+	cp build/linux-x64-cuda/whisper.cpp/src/libwhisper.so ./Whisper.net.Runtime.Cuda/linux-x64/libwhisper.so
+	cp build/linux-x64-cuda/whisper.cpp/ggml/src/libggml.so ./Whisper.net.Runtime.Cuda/linux-x64/libggml.so
 
 macos_x64:
 	rm -rf build/macos-x64

diff --git a/Whisper.net.Demo/Program.cs b/Whisper.net.Demo/Program.cs
@@ -52,7 +52,7 @@ void LanguageIdentification(Options opt)
 
     var samples = wave.GetAvgSamples();
 
-    var language = processor.DetectLanguage(samples, speedUp: true);
+    var language = processor.DetectLanguage(samples);
     Console.WriteLine("Language is " + language);
 }
 

diff --git a/Whisper.net.Runtime.CoreML/Whisper.net.Runtime.CoreML.targets b/Whisper.net.Runtime.CoreML/Whisper.net.Runtime.CoreML.targets
@@ -14,6 +14,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libwhisper.coreml.dylib</TargetPath>
     </None>
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)ios-simulator\libggml.dylib">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>libggml.dylib</TargetPath>
+    </None>
   </ItemGroup>
   <ItemGroup
     Condition="(('$(Platform)' == 'iPhone') OR ('$(RuntimeIdentifier)' == 'ios') OR $(RuntimeIdentifier.StartsWith('ios-')) OR $(RuntimeIdentifier.StartsWith('ios.')))">
@@ -23,6 +29,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libwhisper.dylib</TargetPath>
     </None>
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)ios-device\libggml.dylib">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>libggml.dylib</TargetPath>
+    </None>
     <None Visible="false" Include="$(MSBuildThisFileDirectory)ios-device\libwhisper.coreml.dylib">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
@@ -37,21 +49,13 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>runtimes/maccatalyst/libwhisper.dylib</TargetPath>
     </None>
-    <None Visible="false" Include="$(MSBuildThisFileDirectory)maccatalyst\libwhisper.coreml.dylib">
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)maccatalyst\libggml.dylib">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>libwhisper.coreml.dylib</TargetPath>
-    </None>
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.Contains('-macos')) == true ">
-    <None Visible="false" Include="$(MSBuildThisFileDirectory)macos\libwhisper.dylib">
-      <Pack>true</Pack>
-      <PackageCopyToOutput>true</PackageCopyToOutput>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>runtimes/maccatalyst/libwhisper.dylib</TargetPath>
+      <TargetPath>runtimes/maccatalyst/libggml.dylib</TargetPath>
     </None>
-    <None Visible="false" Include="$(MSBuildThisFileDirectory)macos\libwhisper.coreml.dylib">
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)maccatalyst\libwhisper.coreml.dylib">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -65,6 +69,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libwhisper.dylib</TargetPath>
     </None>
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)tvos-device\libggml.dylib">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>libggml.dylib</TargetPath>
+    </None>
     <None Visible="false" Include="$(MSBuildThisFileDirectory)tvos-device\libwhisper.coreml.dylib">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
@@ -79,6 +89,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libwhisper.dylib</TargetPath>
     </None>
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)tvos-simulator\libggml.dylib">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>libggml.dylib</TargetPath>
+    </None>
     <None Visible="false"
       Include="$(MSBuildThisFileDirectory)tvos-simulator\libwhisper.coreml.dylib">
       <Pack>true</Pack>
@@ -96,13 +112,18 @@
     </None>
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-')) == false ">
-    <!-- If using default runtime, include the split macOS libs rather that the lipoed version -->
     <None Visible="false" Include="$(MSBuildThisFileDirectory)macos-x64\libwhisper.dylib">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>runtimes/macos-x64/libwhisper.dylib</TargetPath>
     </None>
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)macos-x64\libggml.dylib">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>runtimes/macos-x64/libggml.dylib</TargetPath>
+    </None>
     <None Visible="false" Include="$(MSBuildThisFileDirectory)macos-x64\libwhisper.coreml.dylib">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
@@ -115,6 +136,12 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>runtimes/macos-arm64/libwhisper.dylib</TargetPath>
     </None>
+    <None Visible="false" Include="$(MSBuildThisFileDirectory)macos-arm64\libggml.dylib">
+      <Pack>true</Pack>
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>runtimes/macos-arm64/libggml.dylib</TargetPath>
+    </None>
     <None Visible="false" Include="$(MSBuildThisFileDirectory)macos-arm64\libwhisper.coreml.dylib">
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>

diff --git a/Whisper.net.Runtime.Cublas.nuspec → Whisper.net.Runtime.Cuda.nuspec b/Whisper.net.Runtime.Cublas.nuspec → Whisper.net.Runtime.Cuda.nuspec
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>Whisper.net.Runtime.Cublas</id>
-    <title>Whisper.Net.Runtime.Cublas</title>
+    <id>Whisper.net.Runtime.Cuda</id>
+    <title>Whisper.Net.Runtime.Cuda</title>
     <version>1.5.0</version>
     <authors>Sandro Hanea</authors>
     <owners>Sandro Hanea</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>Web Assembly dotnet runtimes for Whisper.</summary>
-    <description>Whisper.net.Runtime.Cublas contains the native runtime libraries to enable Whisper on .NET with Whisper.net and GPU support (Cublas)</description>
+    <description>Whisper.net.Runtime.Cuda contains the native runtime libraries to enable Whisper on .NET with Whisper.net and GPU support (Cuda)</description>
     <tags>whisper;cuda;gpu;cublas;</tags>
     <projectUrl>https://github.com/sandrohanea/whisper.net</projectUrl>
     <license type="expression">MIT</license>
   </metadata>
   <files>
-    <file src="Whisper.net.Runtime.Cublas\**" target="build"/>
+    <file src="Whisper.net.Runtime.Cuda\**" target="build"/>
   </files>
 </package>
diff --git a/...Cublas/Whisper.net.Runtime.Cublas.targets → ...ime.Cuda/Whisper.net.Runtime.Cuda.targets b/...Cublas/Whisper.net.Runtime.Cublas.targets → ...ime.Cuda/Whisper.net.Runtime.Cuda.targets
@@ -5,13 +5,13 @@
             <Pack>true</Pack>
             <PackageCopyToOutput>true</PackageCopyToOutput>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <TargetPath>runtimes/win-x64/whisper.dll</TargetPath>
+            <TargetPath>runtimes/cuda/win-x64/whisper.dll</TargetPath>
         </None>
         <None Visible="false" Include="$(MSBuildThisFileDirectory)linux-x64\libwhisper.so">
             <Pack>true</Pack>
             <PackageCopyToOutput>true</PackageCopyToOutput>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <TargetPath>runtimes/linux-x64/libwhisper.so</TargetPath>
+            <TargetPath>runtimes/cuda/linux-x64/libwhisper.so</TargetPath>
         </None>
     </ItemGroup>
 </Project>
diff --git a/...r.net.Runtime.Cublas/linux-x64/libggml.so → ...per.net.Runtime.Cuda/linux-x64/libggml.so b/...r.net.Runtime.Cublas/linux-x64/libggml.so → ...per.net.Runtime.Cuda/linux-x64/libggml.so
diff --git a/...et.Runtime.Cublas/linux-x64/libwhisper.so → ....net.Runtime.Cuda/linux-x64/libwhisper.so b/...et.Runtime.Cublas/linux-x64/libwhisper.so → ....net.Runtime.Cuda/linux-x64/libwhisper.so
diff --git a/Whisper.net.Runtime.Cublas/win-x64/ggml.dll → Whisper.net.Runtime.Cuda/win-x64/ggml.dll b/Whisper.net.Runtime.Cublas/win-x64/ggml.dll → Whisper.net.Runtime.Cuda/win-x64/ggml.dll
diff --git a/...er.net.Runtime.Cublas/win-x64/whisper.dll → Whisper.net.Runtime.Cuda/win-x64/whisper.dll b/...er.net.Runtime.Cublas/win-x64/whisper.dll → Whisper.net.Runtime.Cuda/win-x64/whisper.dll