Fix for whisper.dll (#834)

This commit is contained in:
Raivis Dejus 2024-07-10 22:33:53 +03:00 committed by GitHub
commit f0975e897f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 17 additions and 5 deletions

View file

@ -102,6 +102,7 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-python@v5
with:
python-version: "3.11.9"
@ -197,7 +198,7 @@ jobs:
path: |
dist/Buzz*-windows.exe
dist/Buzz*-mac.dmg
dist/buzz-*.deb
dist/buzz_*.whl
publish-pypi:
runs-on: ${{ matrix.os }}

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "whisper.cpp"]
path = whisper.cpp
url = https://github.com/chidiwilliams/whisper.cpp
url = https://github.com/ggerganov/whisper.cpp

View file

@ -86,7 +86,7 @@ Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
7. Enter repo folder `cd buzz`
8. Copy `whisper.dll` from the repo backup to `buzz` folder.
```
cp .\dll_backup\whisper.dll .\buzz\
cp .\dll_backup\*.dll .\buzz\
```
9. Activate the virtual environment `poetry shell`
10. Install the dependencies `poetry install`

View file

@ -61,15 +61,20 @@ ifeq ($(UNAME_S),Darwin)
endif
else
ifeq ($(OS), Windows_NT)
CMAKE_FLAGS += -DBUILD_SHARED_LIBS=ON
CMAKE_FLAGS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release
endif
endif
buzz/$(LIBWHISPER):
ifeq ($(OS),Windows_NT)
cp dll_backup/whisper.dll buzz || true
cp dll_backup/SDL2.dll buzz || true
else
cmake -S whisper.cpp -B whisper.cpp/build/ $(CMAKE_FLAGS)
cmake --build whisper.cpp/build --verbose
cp whisper.cpp/build/bin/Debug/$(LIBWHISPER) buzz || true
cp whisper.cpp/build/$(LIBWHISPER) buzz || true
endif
buzz/whisper_cpp.py: buzz/$(LIBWHISPER)
cd buzz && ctypesgen ../whisper.cpp/whisper.h -lwhisper -o whisper_cpp.py

6
dll_backup/Readme.md Normal file
View file

@ -0,0 +1,6 @@
DLLs extracted from whisper.cpp release v1.6.2
https://github.com/ggerganov/whisper.cpp/actions/runs/9251036100
https://github.com/ggerganov/whisper.cpp/commit/c7b6988678779901d02ceba1a8212d2c9908956e
whisper.cpp submodule commit version should match the commit where the
whisper.dll are extracted from to ensure compatibility.

BIN
dll_backup/SDL2.dll Normal file

Binary file not shown.

Binary file not shown.

@ -1 +1 @@
Subproject commit 3b8c2dff5729585f931a885fe9389f94253da71a
Subproject commit c7b6988678779901d02ceba1a8212d2c9908956e