From d7aeb98b70e7b88ee777666f0484d70ce01e3797 Mon Sep 17 00:00:00 2001 From: Raivis Dejus Date: Mon, 2 Jun 2025 08:23:23 +0300 Subject: [PATCH] Build adjustments --- Buzz.spec | 4 +++- Makefile | 16 ++++++++++------ buzz/transcriber/whisper_cpp.py | 2 ++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Buzz.spec b/Buzz.spec index ae8ecbbc..53d3c155 100644 --- a/Buzz.spec +++ b/Buzz.spec @@ -48,9 +48,11 @@ binaries = [ (shutil.which("ffprobe"), "."), ] -if platform.system() != "Windows": +if platform.system() == "Linux": binaries.append(("buzz/whisper_cpp/*.so", "buzz/whisper_cpp")) binaries.append(("buzz/whisper_cpp_vulkan/*.so", "buzz/whisper_cpp_vulkan")) + +if platform.system() == "Darwin" binaries.append(("buzz/whisper_cpp/*.dylib", "buzz/whisper_cpp")) binaries.append(("buzz/whisper_cpp_vulkan/*.dylib", "buzz/whisper_cpp_vulkan")) diff --git a/Makefile b/Makefile index 954cfc33..f5027576 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,14 @@ endif clean: ifeq ($(OS), Windows_NT) - -rmdir /s /q buzz\whisper_cpp 2> nul - -rmdir /s /q buzz\whisper_cpp_vulkan 2> nul - -rmdir /s /q whisper.cpp\build 2> nul - -rmdir /s /q dist 2> nul + rmdir /s /q buzz\whisper_cpp 2> nul + rmdir /s /q buzz\whisper_cpp_vulkan 2> nul + rmdir /s /q whisper.cpp\build 2> nul + rmdir /s /q dist 2> nul + Remove-Item -Recurse -Force buzz\whisper_cpp + Remove-Item -Recurse -Force buzz\whisper_cpp_vulkan + Remove-Item -Recurse -Force whisper.cpp\build + Remove-Item -Recurse -Force dist\* rm -rf buzz/whisper_cpp || true rm -fr buzz/whisper_cpp_vulkan || true rm -rf whisper.cpp/build || true @@ -67,7 +71,7 @@ ifeq ($(OS), Windows_NT) cmake -S whisper.cpp -B whisper.cpp/build/ -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_RPATH='$$ORIGIN' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON cmake --build whisper.cpp/build -j --config Release --verbose - mkdir buzz\whisper_cpp || true + mkdir buzz/whisper_cpp cp dll_backup/SDL2.dll buzz/whisper_cpp cp whisper.cpp/build/bin/Release/whisper.dll buzz/whisper_cpp cp whisper.cpp/build/bin/Release/ggml.dll buzz/whisper_cpp @@ -78,7 +82,7 @@ ifeq ($(OS), Windows_NT) cmake -S whisper.cpp -B whisper.cpp/build/ -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_RPATH='$$ORIGIN' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DGGML_VULKAN=1 cmake --build whisper.cpp/build -j --config Release --verbose - mkdir buzz\whisper_cpp_vulkan || true + mkdir buzz/whisper_cpp_vulkan cp dll_backup/SDL2.dll buzz/whisper_cpp_vulkan cp whisper.cpp/build/bin/Release/whisper.dll buzz/whisper_cpp_vulkan/whisper-vulkan.dll cp whisper.cpp/build/bin/Release/ggml.dll buzz/whisper_cpp_vulkan diff --git a/buzz/transcriber/whisper_cpp.py b/buzz/transcriber/whisper_cpp.py index 6a7b9eb6..59157997 100644 --- a/buzz/transcriber/whisper_cpp.py +++ b/buzz/transcriber/whisper_cpp.py @@ -11,6 +11,8 @@ from buzz.model_loader import LOADED_WHISPER_CPP_BINARY from buzz.transcriber.transcriber import Segment, Task, TranscriptionOptions +# TODO - Test and maybe refactor to https://github.com/fann1993814/whisper.cpy + IS_COREML_SUPPORTED = False if platform.system() == "Darwin" and platform.machine() == "arm64": try: