Skip to content

OpenVINO support #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggerganov merged 10 commits into from
Jul 4, 2023
Merged

OpenVINO support #1037

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c352893
openvino: use OpenVINO encoder inference
RyanMetcalfeInt8 Jun 21, 2023
93b8be4
openvino: add python script for OpenVINO model generation
RyanMetcalfeInt8 Jun 21, 2023
58eae32
whisper: Fix 'unused' warnings when OpenVINO isn't enabled in build
RyanMetcalfeInt8 Jun 22, 2023
4bc1ebc
Apply suggestions from code review
RyanMetcalfeInt8 Jun 28, 2023
6bfa371
whisper: Fix compilation error
RyanMetcalfeInt8 Jun 28, 2023
df77368
whisper: revert whisper_get_openvino_path_encoder & whisper_get_openv…
RyanMetcalfeInt8 Jun 28, 2023
76c4186
cmake: Add openvino-encoder as separate object target
RyanMetcalfeInt8 Jun 28, 2023
bc5746e
whisper : minor style fixes
ggerganov Jul 4, 2023
0ed471c
Merge branch 'master' into openvino_integration
ggerganov Jul 4, 2023
df98287
minor : indentation fixes
ggerganov Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
whisper : minor style fixes
  • Loading branch information
@ggerganov
ggerganov authored Jul 4, 2023
commit bc5746e877474ca25a07c1e2c443ac8a77699365
7 changes: 4 additions & 3 deletions whisper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ struct whisper_state {
#endif

#ifdef WHISPER_USE_OPENVINO
whisper_openvino_context* ctx_openvino = nullptr;
whisper_openvino_context * ctx_openvino = nullptr;
#endif

// [EXPERIMENTAL] token-level timestamps data
Expand Down Expand Up @@ -1776,7 +1776,7 @@ static bool whisper_encode_internal(
}
}
#ifdef WHISPER_USE_COREML
else if(use_coreml) {
else if (use_coreml) {
wstate.use_buf(ctx0, -1);

cur = ggml_new_tensor_2d(ctx0, GGML_TYPE_F32, n_state, n_ctx);
Expand All @@ -1790,8 +1790,9 @@ static bool whisper_encode_internal(

cur = ggml_new_tensor_2d(ctx0, GGML_TYPE_F32, n_state, n_ctx);

if (!whisper_openvino_encode(wstate.ctx_openvino, mel, cur))
if (!whisper_openvino_encode(wstate.ctx_openvino, mel, cur)) {
return false;
}
}
#endif

Expand Down