vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

temporary refactor llama_vision_graph_builder

Browse source
This commit is contained in:
Xuan Son Nguyen 2025-01-22 14:40:35 +01:00
parent 32daa38333
commit 9716c7bff7
3 changed files with 173 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/vision/vision.cpp
View file

@ -50,7 +50,7 @@ static llama_vision_bitmap * load_image_from_file(const char * fname) {
}
// split string by a `std::string delim` instead of `char delim`
static std::vector<std::string> string_split(std::string s, const std::string & delimiter) {
static std::vector<std::string> string_split_str(std::string s, const std::string & delimiter) {
std::vector<std::string> tokens;
size_t pos = 0;
std::string token;
@ -76,7 +76,7 @@ static std::vector<tokenized_part> tokenize_with_img_placement(
const std::string & text,
bool add_special,
bool parse_special) {
std::vector<std::string> parts = string_split(text, IMG_PLACEMENT);
std::vector<std::string> parts = string_split_str(text, IMG_PLACEMENT);
std::vector<tokenized_part> output;
for (const auto & part : parts) {
//printf("tokenizing part: %s\n", part.c_str());
@ -114,6 +114,10 @@ int main(int argc, char ** argv) {
llama_context * ctx = llama_init.context.get();
const llama_model * model = llama_init.model.get();
const llama_vocab * vocab = llama_model_get_vocab(model);
if (!model) {
LOG_ERR("failed to load model\n");
return 1;
}
struct common_sampler * smpl = common_sampler_init(model, params.sampling);