Skip to content

Update llava-cli.cpp to support comma-delimited image lists #6307

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
cpumaxx wants to merge 10 commits into from
Closed

Update llava-cli.cpp to support comma-delimited image lists #6307

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
41d7c5e
Update llava-cli.cpp to support comma-delimited image lists
cpumaxx Mar 25, 2024
2cc1b8c
Update llava-cli.cpp
cpumaxx Mar 26, 2024
55ef24a
Update common.cpp
cpumaxx Apr 5, 2024
0acc567
Update common.cpp
cpumaxx Apr 5, 2024
7e1b9e0
Update common.h
cpumaxx Apr 10, 2024
124e259
Update common.cpp
cpumaxx Apr 10, 2024
8c0a5b0
Update llava-cli.cpp
cpumaxx Apr 10, 2024
e441cc8
Update examples/llava/llava-cli.cpp
cpumaxx Apr 28, 2024
5e906de
Update llava-cli.cpp
cpumaxx Apr 28, 2024
9d6f198
Update llava-cli.cpp
cpumaxx Apr 28, 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
65 changes: 43 additions & 22 deletions examples/llava/llava-cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,26 +208,28 @@ static void process_prompt(struct llava_context * ctx_llava, struct llava_image_
}


static struct llava_context * llava_init(gpt_params * params) {
const char * clip_path = params->mmproj.c_str();

auto prompt = params->prompt;
if (prompt.empty()) {
prompt = "describe the image in detail.";
}

auto ctx_clip = clip_model_load(clip_path, /*verbosity=*/ 1);

static struct llama_model * llava_init(gpt_params * params) {
llama_backend_init();
llama_numa_init(params->numa);

llama_model_params model_params = llama_model_params_from_gpt_params(*params);

llama_model * model = llama_load_model_from_file(params->model.c_str(), model_params);
if (model == NULL) {
fprintf(stderr , "%s: error: unable to load model\n" , __func__);
return NULL;
}
return model;
}

static struct llava_context * llava_init_context(gpt_params * params, llama_model * model) {
const char * clip_path = params->mmproj.c_str();

auto prompt = params->prompt;
if (prompt.empty()) {
prompt = "describe the image in detail.";
}

auto ctx_clip = clip_model_load(clip_path, /*verbosity=*/ 1);

llama_context_params ctx_params = llama_context_params_from_gpt_params(*params);
ctx_params.n_ctx = params->n_ctx < 2048 ? 2048 : params->n_ctx; // we need a longer context size to process image embeddings
Expand Down Expand Up @@ -273,23 +275,42 @@ int main(int argc, char ** argv) {
return 1;
}

auto ctx_llava = llava_init(&params);
if (ctx_llava == NULL) {
fprintf(stderr, "%s: error: failed to init llava\n", __func__);
auto model = llava_init(&params);
if (model == NULL) {
fprintf(stderr, "%s: error: failed to init llava model\n", __func__);
return 1;
}

auto image_embed = load_image(ctx_llava, &params);
if (!image_embed) {
return 1;
std::stringstream ss(params.image);
std::vector<std::string> imagestack;

while( ss.good() )
{
std::string substr;
getline( ss, substr, ',' );
imagestack.push_back( substr );
}

// process the prompt
process_prompt(ctx_llava, image_embed, &params, params.prompt);
for (auto & image : imagestack) {

llama_print_timings(ctx_llava->ctx_llama);
auto ctx_llava = llava_init_context(&params, model);
params.image=image;

auto image_embed = load_image(ctx_llava, &params);
if (!image_embed) {
std::cerr << "error: failed to load image " << params.image << ". Terminating\n\n";
return 1;
}

llava_image_embed_free(image_embed);
llava_free(ctx_llava);
// process the prompt
process_prompt(ctx_llava, image_embed, &params, params.prompt);

llama_print_timings(ctx_llava->ctx_llama);

llava_image_embed_free(image_embed);
ctx_llava->model = NULL;
llava_free(ctx_llava);
}
llama_free_model(model);
return 0;
}