Skip to content

Add single prompt option #5

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

Closed
wants to merge 1 commit into from
Closed

Add single prompt option #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions examples/control-vector-generator/control-vector-generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ struct ctrl_params {
/* pair of prompts to be used for generating final vector */
std::vector<std::string> positive_entries;
std::vector<std::string> negative_entries;

bool single_prompt = false;
};

struct tokenized_prompt {
Expand Down Expand Up @@ -310,6 +312,8 @@ static void print_usage(const char * executable) {
printf(" default: %s\n", defaults.negative_prompts_file.c_str());
printf(" -cf, --completions-file completions file\n");
printf(" default: %s\n", defaults.completions_file.c_str());
printf(" --single-prompt use whole file as the prompt (allows for a multiline prompt)\n");
printf(" default: use each line as a separate prompt\n");
printf(" -nc, --num-completions N number of lines of completions file to use\n");
printf(" default: %d\n", defaults.n_completions);
printf(" --batch-pca N batch size used for PCA. Larger batch runs faster, but uses more memory\n");
Expand Down Expand Up @@ -377,6 +381,10 @@ static int ctrlvec_params_parse_ex(int argc, char ** argv, ctrl_params & params)
throw std::invalid_argument("error: missing argument for " + arg);
}
}
if (arg == "--single-prompt") {
params.single_prompt = true;
skipme += 1;
}
if (arg == "--num-completions" || arg == "-nc") {
if (++arg_idx < argc && strncmp(argv[arg_idx], arg_prefix.c_str(), 2) != 0) {
try {
Expand Down Expand Up @@ -435,7 +443,7 @@ static int ctrlvec_params_parse(int argc, char ** argv, ctrl_params & params) {
return skipme;
}

static std::vector<std::string> ctrlvec_load_prompt_file(std::string path, bool skip_empty_lines = false) {
static std::vector<std::string> ctrlvec_load_prompt_file(std::string path, bool skip_empty_lines = false, bool single_prompt = false) {
std::vector<std::string> output;
std::ifstream file(path);
if (!file.is_open()) {
Expand All @@ -449,6 +457,14 @@ static std::vector<std::string> ctrlvec_load_prompt_file(std::string path, bool
}
}
file.close();
if (single_prompt) {
std::string single_prompt;
for (const auto & line : output) {
single_prompt += line + "\n";
}
output.clear();
output.push_back(single_prompt);
}
return output;
}

Expand Down Expand Up @@ -510,8 +526,8 @@ static void export_gguf(const std::vector<struct ggml_tensor *> & v_ctrl, const
*/
static int prepare_entries(ctrl_params & cparams) {
// load prompts
std::vector<std::string> positive_prompts = ctrlvec_load_prompt_file(cparams.positive_prompts_file);
std::vector<std::string> negative_prompts = ctrlvec_load_prompt_file(cparams.negative_prompts_file);
std::vector<std::string> positive_prompts = ctrlvec_load_prompt_file(cparams.positive_prompts_file, false, cparams.single_prompt);
std::vector<std::string> negative_prompts = ctrlvec_load_prompt_file(cparams.negative_prompts_file, false, cparams.single_prompt);
if (positive_prompts.size() != negative_prompts.size()) {
fprintf(stderr, "number of positive and negative prompts must be equal\n");
return 1;
Expand Down