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

Update common.cpp - trim all trailing whitespace

Browse source
This commit is contained in:
Brian 2024-05-10 02:02:33 +10:00 • committed by GitHub
parent c010ce5274
commit 9f6f44d75f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/common.cpp
View file

@ -1884,7 +1884,7 @@ static int shard_progress_callback(void* clientp, double dltotal, double dlnow,
(void) ultotal; (void) ultotal;
(void) ulnow; (void) ulnow;
char* url = static_cast<char*>(clientp); char* url = static_cast<char*>(clientp);
std::lock_guard<std::mutex> lock(progress_mutex); std::lock_guard<std::mutex> lock(progress_mutex);
shard_file_progress& progress = progress_table[url]; shard_file_progress& progress = progress_table[url];
@ -1893,7 +1893,7 @@ static int shard_progress_callback(void* clientp, double dltotal, double dlnow,
std::string url_string = static_cast<std::string>(url); std::string url_string = static_cast<std::string>(url);
progress.filename = url_string.substr(url_string.find_last_of('/') + 1); progress.filename = url_string.substr(url_string.find_last_of('/') + 1);
return 0; return 0;
} }
@ -2084,7 +2084,7 @@ static bool llama_download_file(CURL * curl, const char * url, const char * path
// display download progress // display download progress
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
// custom progress callback on sharded download // custom progress callback on sharded download
if (is_shard) { if (is_shard) {
curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, shard_progress_callback); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, shard_progress_callback);
@ -2250,7 +2250,7 @@ struct llama_model * llama_load_model_from_url(
return res; return res;
}, idx)); }, idx));
} }
bool first_progress = true; bool first_progress = true;
while (true) { while (true) {
// Print the progress table periodically // Print the progress table periodically