root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-27 20:04:35 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

some ci fixes

Browse Source
This commit is contained in:
FSSRepo 2023-10-15 18:46:01 -04:00
parent 9035978aae
commit ce961a304b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/server/server.cpp
View File

@ -78,7 +78,7 @@ std::vector<uint8_t> base64_decode(std::string const& encoded_string) {
int i = 0; int i = 0;
int j = 0; int j = 0;
int in_ = 0; int in_ = 0;
unsigned char char_array_4[4], char_array_3[3]; uint8_t char_array_4[4], char_array_3[3];
std::vector<uint8_t> ret; std::vector<uint8_t> ret;
while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) { while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
char_array_4[i++] = encoded_string[in_]; in_++; char_array_4[i++] = encoded_string[in_]; in_++;
@ -884,7 +884,7 @@ struct llama_server_context
// append prefix of next image // append prefix of next image
batch.n_tokens = 0; batch.n_tokens = 0;
const auto json_prompt = (image_idx >= slot.images.size()) ? const auto json_prompt = (image_idx >= slot.images.size()) ?
slot.params.input_suffix : // no more images, then process suffix prompt slot.params.input_suffix : // no more images, then process suffix prompt
(json)(slot.images[image_idx].prefix_prompt); (json)(slot.images[image_idx].prefix_prompt);
std::vector<llama_token> append_tokens = tokenize(json_prompt, true); // has next image std::vector<llama_token> append_tokens = tokenize(json_prompt, true); // has next image
@ -1818,7 +1818,7 @@ static void parse_options_completion(const json &body, llama_client_slot* slot,
slot->images.push_back(img_sl); slot->images.push_back(img_sl);
} }
// process prompt // process prompt
// example: system prompt <img-102> user <img-103> describe <img-134> -> [{id: 102, prefix: 'system prompt '}, {id: 103, prefix: ' user '}, {id: 134, prefix: ' describe '}]} // example: system prompt [img-102] user [img-103] describe [img-134] -> [{id: 102, prefix: 'system prompt '}, {id: 103, prefix: ' user '}, {id: 134, prefix: ' describe '}]}
if(slot->images.size() > 0 && !slot->prompt.is_array()) { if(slot->images.size() > 0 && !slot->prompt.is_array()) {
std::string prompt = slot->prompt.get<std::string>(); std::string prompt = slot->prompt.get<std::string>();
size_t pos = 0, begin_prefix = 0; size_t pos = 0, begin_prefix = 0;