diff --git a/Makefile b/Makefile index dabe2f8b..999ec864 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ linux_x64_openvino: linux_x64_vulkan: rm -rf build/linux-x64-vulkan echo "Path is: `$(PATH)`" - cmake -S . -B build/linux-x64-vulkan -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_VULKAN=ON -DVulkan_INCLUDE_DIR="$(VULKAN_SDK)/include" -DVulkan_LIBRARY="$(VULKAN_SDK)/lib/libvulkan.so" $(AVX_SUPPORT) + cmake -S . -B build/linux-x64-vulkan -DGGML_VULKAN=ON -DVulkan_INCLUDE_DIR="$(VULKAN_SDK)/include" -DVulkan_LIBRARY="$(VULKAN_SDK)/lib/libvulkan.so" -DGGML_VULKAN_COOPMAT_GLSLC_SUPPORT=ON $(AVX_SUPPORT) cmake --build build/linux-x64-vulkan --config $(BUILD_TYPE) mkdir -p runtimes/Whisper.net.Runtime.Vulkan/linux-x64 echo 'LDD VERSION' diff --git a/Whisper.net/Logger/WhisperLogLevel.cs b/Whisper.net/Logger/WhisperLogLevel.cs index 88729ea3..a480e3d3 100644 --- a/Whisper.net/Logger/WhisperLogLevel.cs +++ b/Whisper.net/Logger/WhisperLogLevel.cs @@ -4,9 +4,9 @@ namespace Whisper.net.Logger; public enum WhisperLogLevel { None = 0, - Info = 1, + Error = 1, Warning = 2, - Error = 3, - Debug = 4, - Cont = 5 + Info = 3, + Cont = 4, + Debug = 5 } diff --git a/Whisper.net/Whisper.net.csproj b/Whisper.net/Whisper.net.csproj index 26ff7e2b..759bb12a 100755 --- a/Whisper.net/Whisper.net.csproj +++ b/Whisper.net/Whisper.net.csproj @@ -4,7 +4,7 @@ enable enable 13 - 1.7.5-preview1 + 1.8.0-preview1 Sandro Hanea Cross-platform dotnet bindings for Whisper. https://github.com/sandrohanea/whisper.net diff --git a/readme.md b/readme.md index cee0698a..196d513a 100644 --- a/readme.md +++ b/readme.md @@ -188,9 +188,11 @@ RuntimeOptions.RuntimeLibraryOrder = ## Versioning -Each version of Whisper.net is tied to a specific version of Whisper.cpp. The version of Whisper.net is the same as the version of Whisper it is based on. For example, Whisper.net 1.2.0 is based on Whisper.cpp 1.2.0. +Whisper.net follows semantic versioning. -However, the patch version is not tied to Whisper.cpp. For example, Whisper.net 1.2.1 is based on Whisper.cpp 1.2.0 and Whisper.net 1.7.0 is based on Whisper.cpp 1.7.1. +Starting from version `1.8.0`, Whisper.net does not follow the same versioning scheme as `whisper.cpp`, which creates releases based on specific commits in their `master` branch (e.g., b2254, b2255). + +To track the `whisper.cpp` version used in a specific Whisper.net release, you can check the `whisper.cpp` submodule. The commit hash for the tag associated with the release will indicate the corresponding `whisper.cpp` version. ## Ggml Models diff --git a/whisper.cpp b/whisper.cpp index 2ab2eb51..6e7629b1 160000 --- a/whisper.cpp +++ b/whisper.cpp @@ -1 +1 @@ -Subproject commit 2ab2eb5110018a1efd2744b7d4465209cf243e4c +Subproject commit 6e7629b14680e6c958fef96cdea602306c0f7433 diff --git a/windows-scripts.ps1 b/windows-scripts.ps1 index a6e2e7cf..7f9f3cb1 100644 --- a/windows-scripts.ps1 +++ b/windows-scripts.ps1 @@ -73,6 +73,11 @@ function BuildWindows() { # Add AVX flags $options += $avxOptions + + if ($platform -eq "Win32") + { + $options += "-DGGML_BMI2=OFF"; + } } $runtimePath = "./runtimes/Whisper.net.Runtime" @@ -85,6 +90,7 @@ function BuildWindows() { if ($Vulkan) { $options += "-DGGML_VULKAN=1" + $options += "-DGGML_VULKAN_COOPMAT_GLSLC_SUPPORT=ON" $buildDirectory += "-vulkan" $runtimePath += ".Vulkan" }