Skip to content

Commit

Permalink
Allow a regular expression to describe tokens to suppress.
Browse files Browse the repository at this point in the history
Example: --suppress-tokens-re "[,\.]|[ ]?[0-9]+" will suppress commas, periods, and numeric tokens.

Technique inspired by openai/whisper#1041

Co-authored-by: Georgi Gerganov <[email protected]>
  • Loading branch information
ulatekh and ggerganov committed Mar 26, 2024
1 parent 1558ec5 commit 4853a90
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 0 deletions.
7 changes: 7 additions & 0 deletions examples/command/command.cpp
Expand Up @@ -52,6 +52,9 @@ struct whisper_params {
std::string prompt;
std::string context;
std::string grammar;

// A regular expression that matches tokens to suppress
std::string suppress_regex;
};

void whisper_print_usage(int argc, char ** argv, const whisper_params & params);
Expand Down Expand Up @@ -85,6 +88,7 @@ bool whisper_params_parse(int argc, char ** argv, whisper_params & params) {
else if (arg == "-ctx" || arg == "--context") { params.context = argv[++i]; }
else if ( arg == "--grammar") { params.grammar = argv[++i]; }
else if ( arg == "--grammar-penalty") { params.grammar_penalty = std::stof(argv[++i]); }
else if ( arg == "--suppress-regex") { params.suppress_regex = argv[++i]; }
else {
fprintf(stderr, "error: unknown argument: %s\n", arg.c_str());
whisper_print_usage(argc, argv, params);
Expand Down Expand Up @@ -122,6 +126,7 @@ void whisper_print_usage(int /*argc*/, char ** argv, const whisper_params & para
fprintf(stderr, " -ctx, --context [%-7s] sample text to help the transcription\n", params.context.c_str());
fprintf(stderr, " --grammar GRAMMAR [%-7s] GBNF grammar to guide decoding\n", params.grammar.c_str());
fprintf(stderr, " --grammar-penalty N [%-7.1f] scales down logits of nongrammar tokens\n", params.grammar_penalty);
fprintf(stderr, " --suppress-regex REGEX [%-7s] regular expression matching tokens to suppress\n", params.suppress_regex.c_str());
fprintf(stderr, "\n");
}

Expand Down Expand Up @@ -167,6 +172,8 @@ std::string transcribe(

wparams.initial_prompt = params.context.data();

wparams.suppress_regex = params.suppress_regex.c_str();

const auto & grammar_parsed = params.grammar_parsed;
auto grammar_rules = grammar_parsed.c_rules();

Expand Down
8 changes: 8 additions & 0 deletions examples/main/main.cpp
Expand Up @@ -5,6 +5,7 @@
#include <cmath>
#include <fstream>
#include <cstdio>
#include <regex>
#include <string>
#include <thread>
#include <vector>
Expand Down Expand Up @@ -74,6 +75,9 @@ struct whisper_params {
// [TDRZ] speaker turn string
std::string tdrz_speaker_turn = " [SPEAKER_TURN]"; // TODO: set from command line

// A regular expression that matches tokens to suppress
std::string suppress_regex;

std::string openvino_encode_device = "CPU";

std::string dtw = "";
Expand Down Expand Up @@ -154,6 +158,7 @@ bool whisper_params_parse(int argc, char ** argv, whisper_params & params) {
else if (arg == "-dtw" || arg == "--dtw") { params.dtw = argv[++i]; }
else if (arg == "-ls" || arg == "--log-score") { params.log_score = true; }
else if (arg == "-ng" || arg == "--no-gpu") { params.use_gpu = false; }
else if ( arg == "--suppress-regex") { params.suppress_regex = argv[++i]; }
else {
fprintf(stderr, "error: unknown argument: %s\n", arg.c_str());
whisper_print_usage(argc, argv, params);
Expand Down Expand Up @@ -214,6 +219,7 @@ void whisper_print_usage(int /*argc*/, char ** argv, const whisper_params & para
fprintf(stderr, " -dtw MODEL --dtw MODEL [%-7s] compute token-level timestamps\n", params.dtw.c_str());
fprintf(stderr, " -ls, --log-score [%-7s] log best decoder scores of tokens\n", params.log_score?"true":"false");
fprintf(stderr, " -ng, --no-gpu [%-7s] disable GPU\n", params.use_gpu ? "false" : "true");
fprintf(stderr, " --suppress-regex REGEX [%-7s] regular expression matching tokens to suppress\n", params.suppress_regex.c_str());
fprintf(stderr, "\n");
}

Expand Down Expand Up @@ -997,6 +1003,8 @@ int main(int argc, char ** argv) {

wparams.tdrz_enable = params.tinydiarize; // [TDRZ]

wparams.suppress_regex = params.suppress_regex.c_str();

wparams.initial_prompt = params.prompt.c_str();

wparams.greedy.best_of = params.best_of;
Expand Down
13 changes: 13 additions & 0 deletions whisper.cpp
Expand Up @@ -4553,6 +4553,8 @@ struct whisper_full_params whisper_full_default_params(enum whisper_sampling_str

/*.tdrz_enable =*/ false,

/* suppress_regex =*/ nullptr,

/*.initial_prompt =*/ nullptr,
/*.prompt_tokens =*/ nullptr,
/*.prompt_n_tokens =*/ 0,
Expand Down Expand Up @@ -4796,6 +4798,17 @@ static void whisper_process_logits(
params.logits_filter_callback(&ctx, &state, tokens_cur.data(), tokens_cur.size(), logits.data(), params.logits_filter_callback_user_data);
}

// suppress any tokens matching a regular expression
// ref: https://github.com/openai/whisper/discussions/1041
if (params.suppress_regex != nullptr) {
std::regex re(params.suppress_regex);
for (std::pair<whisper_vocab::token, whisper_vocab::id> token_id : vocab.token_to_id) {
if (std::regex_match(token_id.first, re)) {
logits[token_id.second] = -INFINITY;
}
}
}

// suppress non-speech tokens
// ref: https://github.com/openai/whisper/blob/7858aa9c08d98f75575035ecd6481f462d66ca27/whisper/tokenizer.py#L224-L253
if (params.suppress_non_speech_tokens) {
Expand Down
3 changes: 3 additions & 0 deletions whisper.h
Expand Up @@ -505,6 +505,9 @@ extern "C" {
// [EXPERIMENTAL] [TDRZ] tinydiarize
bool tdrz_enable; // enable tinydiarize speaker turn detection

// A regular expression that matches tokens to suppress
const char * suppress_regex;

// tokens to provide to the whisper decoder as initial prompt
// these are prepended to any existing text context from a previous call
// use whisper_tokenize() to convert text to tokens
Expand Down

0 comments on commit 4853a90

Please sign in to comment.