Skip to content
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

Jump to bottom

server.cpp: add dtw #2044

Merged
merged 2 commits into from
Apr 15, 2024
Merged

server.cpp: add dtw #2044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff5a9c
server.cpp: add dtw
eschmidbauer Apr 12, 2024
02bf9f3
Update examples/server/server.cpp
ggerganov Apr 15, 2024
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
48 changes: 48 additions & 0 deletions examples/server/server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ struct whisper_params {
std::string tdrz_speaker_turn = " [SPEAKER_TURN]"; // TODO: set from command line

std::string openvino_encode_device = "CPU";

std::string dtw = "";
};

void whisper_print_usage(int /*argc*/, char ** argv, const whisper_params & params, const server_params& sparams) {
Expand Down Expand Up @@ -126,6 +128,7 @@ void whisper_print_usage(int /*argc*/, char ** argv, const whisper_params & para
fprintf(stderr, " -m FNAME, --model FNAME [%-7s] model path\n", params.model.c_str());
fprintf(stderr, " -oved D, --ov-e-device DNAME [%-7s] the OpenVINO device used for encode inference\n", params.openvino_encode_device.c_str());
// server params
fprintf(stderr, " -dtw MODEL --dtw MODEL [%-7s] compute token-level timestamps\n", params.dtw.c_str());
fprintf(stderr, " --host HOST, [%-7s] Hostname/ip-adress for the server\n", sparams.hostname.c_str());
fprintf(stderr, " --port PORT, [%-7d] Port number for the server\n", sparams.port);
fprintf(stderr, " --public PATH, [%-7s] Path to the public folder\n", sparams.public_path.c_str());
Expand Down Expand Up @@ -173,6 +176,7 @@ bool whisper_params_parse(int argc, char ** argv, whisper_params & params, serve
else if ( arg == "--prompt") { params.prompt = argv[++i]; }
else if (arg == "-m" || arg == "--model") { params.model = argv[++i]; }
else if (arg == "-oved" || arg == "--ov-e-device") { params.openvino_encode_device = argv[++i]; }
else if (arg == "-dtw" || arg == "--dtw") { params.dtw = argv[++i]; }
else if (arg == "-ng" || arg == "--no-gpu") { params.use_gpu = false; }
// server params
else if ( arg == "--port") { sparams.port = std::stoi(argv[++i]); }
Expand Down Expand Up @@ -499,6 +503,49 @@ int main(int argc, char ** argv) {
// whisper init
struct whisper_context_params cparams = whisper_context_default_params();
cparams.use_gpu = params.use_gpu;
if (!params.dtw.empty()) {
cparams.dtw_token_timestamps = true;
cparams.dtw_aheads_preset = WHISPER_AHEADS_NONE;

if (params.dtw == "tiny") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_TINY;
}
if (params.dtw == "tiny.en") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_TINY_EN;
}
if (params.dtw == "base") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_BASE;
}
if (params.dtw == "base.en") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_BASE_EN;
}
if (params.dtw == "small") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_SMALL;
}
if (params.dtw == "small.en") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_SMALL_EN;
}
if (params.dtw == "medium") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_MEDIUM;
}
if (params.dtw == "medium.en") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_MEDIUM_EN;
}
if (params.dtw == "large.v1") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_LARGE_V1;
}
if (params.dtw == "large.v2") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_LARGE_V2;
}
if (params.dtw == "large.v3") {
cparams.dtw_aheads_preset = WHISPER_AHEADS_LARGE_V3;
}

if (cparams.dtw_aheads_preset == WHISPER_AHEADS_NONE) {
fprintf(stderr, "error: unknown DTW preset '%s'\n", params.dtw.c_str());
return 3;
}
}

struct whisper_context * ctx = whisper_init_from_file_with_params(params.model.c_str(), cparams);

Expand Down Expand Up @@ -865,6 +912,7 @@ int main(int argc, char ** argv) {
if (!params.no_timestamps) {
word["start"] = token.t0 * 0.01;
word["end"] = token.t1 * 0.01;
word["t_dtw"] = token.t_dtw;
}
word["probability"] = token.p;
total_logprob += token.plog;
Expand Down
Loading