8000 Check for reverse prompt by characters instead of tokens (#292) by tjohnman · Pull Request #330 · ggml-org/llama.cpp · GitHub
[go: up one dir, main page]
Skip to content

Check for reverse prompt by characters instead of tokens (#292) #330

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
merged 5 commits into from
Mar 21, 2023
Merged

Check for reverse prompt by characters instead of tokens (#292) #330

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b646ffa
Check for reverse prompt by characters instead of tokens (#292)
Mar 20, 2023
e9f7747
Update main.cpp
tjohnman Mar 20, 2023
6242d1c
Cleanup.
Mar 20, 2023
1228080
Remove unnecessary use of std::stringstream.
Mar 20, 2023
c8e940e
Merge branch 'master' into bugfix-292
ggerganov Mar 21, 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
Next Next commit
Check for reverse prompt by characters instead of tokens (#292)
  • Loading branch information
Johnman committed Mar 20, 2023
commit b646ffa1b16cf5423e33d437bed32462daf2efef
39 changes: 19 additions & 20 deletions main.cpp
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <map>
#include <string>
#include <vector>
#include <sstream>

#if defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
#include <signal.h>
Expand Down Expand Up @@ -877,16 +878,9 @@ int main(int argc, char ** argv) {
params.interactive = true;
params.antiprompt.push_back("### Instruction:\n\n");
}

// tokenize the reverse prompt
std::vector<std::vector<gpt_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
if (antipromptv_inp.size() != 0) {
if (params.antiprompt.size() != 0) {
params.interactive = true;
}

Expand All @@ -910,15 +904,9 @@ int main(int argc, char ** argv) {

fprintf(stderr, "%s: interactive mode on.\n", __func__);

if(antipromptv_inp.size()) {
for (size_t apindex = 0; apindex < antipromptv_inp.size(); ++apindex) {
auto antiprompt_inp = antipromptv_inp.at(apindex);
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");
if(params.antiprompt.size()) {
for (auto antiprompt : params.antiprompt) {
fprintf(stderr, "Antiprompt: %s\n", antiprompt);
}
}
}
Expand Down Expand Up @@ -1035,12 +1023,23 @@ int main(int argc, char ** argv) {
// check if we should prompt the user for more
if (params.interactive && embd_inp.size() <= input_consumed) {
// check for reverse prompt
for (auto antiprompt_inp : antipromptv_inp) {
if (antiprompt_inp.size() && std::equal(antiprompt_inp.rbegin(), antiprompt_inp.rend(), last_n_tokens.rbegin())) {
// reverse prompt found

std::stringstream last_output_ss;
for (auto id : last_n_tokens) {
last_output_ss << vocab.id_to_token[id];
}
std::string last_output = last_output_ss.str();

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;
break;
}
/*if (antiprompt_inp.size() && std::equal(antiprompt_inp.rbegin(), antiprompt_inp.rend(), last_n_tokens.rbegin())) {
// reverse prompt found
is_interacting = true;
break;
}*/
}
if (is_interacting) {
if (params.instruct) {
Expand Down
0