mirror of
https://github.com/ggerganov/llama.cpp.git
synced 2024-12-25 10:54:36 +00:00
* Check for reverse prompt by characters instead of tokens (#292) * Update main.cpp Wording. * Cleanup. * Remove unnecessary use of std::stringstream. --------- Co-authored-by: Johnman <tjohnman@github> Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
This commit is contained in:
parent
3bfa3b43b7
commit
d5f56a5e5a
32
main.cpp
32
main.cpp
@ -885,15 +885,8 @@ int main(int argc, char ** argv) {
|
|||||||
params.antiprompt.push_back("### Instruction:\n\n");
|
params.antiprompt.push_back("### Instruction:\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
// tokenize the reverse prompt
|
|
||||||
std::vector<std::vector<llama_vocab::id>> antipromptv_inp;
|
|
||||||
|
|
||||||
for (auto antiprompt : params.antiprompt) {
|
|
||||||
antipromptv_inp.push_back(::llama_tokenize(vocab, antiprompt, false));
|
|
||||||
}
|
|
||||||
|
|
||||||
// enable interactive mode if reverse prompt is specified
|
// enable interactive mode if reverse prompt is specified
|
||||||
if (antipromptv_inp.size() != 0) {
|
if (params.antiprompt.size() != 0) {
|
||||||
params.interactive = true;
|
params.interactive = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -917,15 +910,9 @@ int main(int argc, char ** argv) {
|
|||||||
|
|
||||||
fprintf(stderr, "%s: interactive mode on.\n", __func__);
|
fprintf(stderr, "%s: interactive mode on.\n", __func__);
|
||||||
|
|
||||||
if(antipromptv_inp.size()) {
|
if(params.antiprompt.size()) {
|
||||||
for (size_t apindex = 0; apindex < antipromptv_inp.size(); ++apindex) {
|
for (auto antiprompt : params.antiprompt) {
|
||||||
auto antiprompt_inp = antipromptv_inp.at(apindex);
|
fprintf(stderr, "Reverse prompt: '%s'\n", antiprompt.c_str());
|
||||||
fprintf(stderr, "%s: reverse prompt: '%s'\n", __func__, params.antiprompt.at(apindex).c_str());
|
|
||||||
fprintf(stderr, "%s: number of tokens in reverse prompt = %zu\n", __func__, antiprompt_inp.size());
|
|
||||||
for (int i = 0; i < (int) antiprompt_inp.size(); i++) {
|
|
||||||
fprintf(stderr, "%6d -> '%s'\n", antiprompt_inp[i], vocab.id_to_token.at(antiprompt_inp[i]).c_str());
|
|
||||||
}
|
|
||||||
fprintf(stderr, "\n");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1042,9 +1029,14 @@ int main(int argc, char ** argv) {
|
|||||||
// check if we should prompt the user for more
|
// check if we should prompt the user for more
|
||||||
if (params.interactive && (int) embd_inp.size() <= input_consumed) {
|
if (params.interactive && (int) embd_inp.size() <= input_consumed) {
|
||||||
// check for reverse prompt
|
// check for reverse prompt
|
||||||
for (auto antiprompt_inp : antipromptv_inp) {
|
std::string last_output;
|
||||||
if (antiprompt_inp.size() && std::equal(antiprompt_inp.rbegin(), antiprompt_inp.rend(), last_n_tokens.rbegin())) {
|
for (auto id : last_n_tokens) {
|
||||||
// reverse prompt found
|
last_output += vocab.id_to_token[id];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if each of the reverse prompts appears at the end of the output.
|
||||||
|
for (std::string antiprompt : params.antiprompt) {
|
||||||
|
if (last_output.find(antiprompt.c_str(), last_output.length() - antiprompt.length(), antiprompt.length()) != std::string::npos) {
|
||||||
is_interacting = true;
|
is_interacting = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user