Skip to content

Commit 006ec23

Browse files
authored
Enable vulkan whispercpp (#1763)
* Make vulkan be on by default * Resolve issues with cpp lint and cpp tests in whisper workflows
1 parent 755cfe9 commit 006ec23

4 files changed

Lines changed: 15 additions & 6 deletions

File tree

.github/workflows/cpp-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
- name: Generate build system
178178
id: bare_make_generate
179179
working-directory: ${{ env.WORKDIR }}
180-
run: bare-make generate
180+
run: bare-make generate -D ENABLE_VULKAN=OFF
181181

182182
- name: Check C++ files format
183183
id: cpp_files_fmt

packages/qvac-lib-infer-whispercpp/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased]
8+
## [0.6.4]
9+
10+
### Changed
11+
- Fixed bug that prevented Vulkan from being turned on by default on linux and windows
912

1013
## [0.6.3]
1114

packages/qvac-lib-infer-whispercpp/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ cmake_minimum_required(VERSION 3.25)
22

33
option(BUILD_TESTING "Build tests" OFF)
44

5-
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Windows")
5+
if(DEFINED CMAKE_SYSTEM_NAME)
6+
set(_qvac_whispercpp_target_os "${CMAKE_SYSTEM_NAME}")
7+
else()
8+
set(_qvac_whispercpp_target_os "${CMAKE_HOST_SYSTEM_NAME}")
9+
endif()
10+
11+
if(_qvac_whispercpp_target_os STREQUAL "Linux" OR _qvac_whispercpp_target_os STREQUAL "Android" OR _qvac_whispercpp_target_os STREQUAL "Windows")
612
option(ENABLE_VULKAN "Enable Vulkan GPU acceleration" ON)
713
else()
814
option(ENABLE_VULKAN "Enable Vulkan GPU acceleration" OFF)

packages/qvac-lib-infer-whispercpp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@qvac/transcription-whispercpp",
3-
"version": "0.6.3",
3+
"version": "0.6.4",
44
"description": "transcription addon for qvac",
55
"addon": true,
66
"engines": {
@@ -14,10 +14,10 @@
1414
"test:integration": "brittle-bare test/integration/addon.test.js",
1515
"test:benchmark:rtf": "brittle-bare test/benchmark/rtf-benchmark.test.js",
1616
"test:integration:long": "brittle-bare test/integration/**/longES.test.js",
17-
"test:cpp:build": "bare-make generate -D BUILD_TESTING=ON && bare-make build --target test-whisper-core && bare-make install",
17+
"test:cpp:build": "bare-make generate -D BUILD_TESTING=ON -D ENABLE_VULKAN=OFF && bare-make build --target test-whisper-core && bare-make install",
1818
"test:cpp:run": "cd build/addon/tests/ && LLVM_PROFILE_FILE=default.profraw ./test-whisper-core --gtest_output=xml:cpp-test-results.xml",
1919
"test:cpp": "npm run test:cpp:build && npm run test:cpp:run",
20-
"coverage:cpp:build": "bare-make generate -D BUILD_TESTING=ON -D ENABLE_COVERAGE=ON && bare-make build --target test-whisper-core",
20+
"coverage:cpp:build": "bare-make generate -D BUILD_TESTING=ON -D ENABLE_COVERAGE=ON -D ENABLE_VULKAN=OFF && bare-make build --target test-whisper-core",
2121
"coverage:cpp:summary": "cd build/addon/tests && llvm-cov-19 report ./test-whisper-core --instr-profile=coverage.profdata -ignore-filename-regex='(tests|build|node_modules|gtest|gmock|\\.vcpkg|/usr)/' > coverage-summary.txt",
2222
"coverage:cpp:report": "cd build/addon/tests/ && ls -lha && llvm-profdata-19 merge -sparse default.profraw -o coverage.profdata && llvm-cov-19 show ./test-whisper-core -instr-profile=coverage.profdata -format=html -output-dir=coverage-html -ignore-filename-regex='(tests|build|node_modules|gtest|gmock|\\.vcpkg|/usr)/' && llvm-cov-19 export ./test-whisper-core -instr-profile=coverage.profdata -format=lcov -ignore-filename-regex='(tests|build|node_modules|gtest|gmock|\\.vcpkg|/usr)/' > lcov.info && npm run coverage:cpp:summary",
2323
"coverage:cpp": "npm run coverage:cpp:build && npm run test:cpp:run && npm run coverage:cpp:report",

0 commit comments

Comments
 (0)