|
@@ -941,11 +941,37 @@ struct ggml_threadpool_params ggml_threadpool_params_from_cpu_params(const cpu_p
|
|
|
|
|
|
|
|
#ifdef LLAMA_USE_CURL
|
|
#ifdef LLAMA_USE_CURL
|
|
|
|
|
|
|
|
|
|
+#define CURL_MAX_RETRY 3
|
|
|
|
|
+#define CURL_RETRY_DELAY_SECONDS 2
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
static bool starts_with(const std::string & str, const std::string & prefix) {
|
|
static bool starts_with(const std::string & str, const std::string & prefix) {
|
|
|
// While we wait for C++20's std::string::starts_with...
|
|
// While we wait for C++20's std::string::starts_with...
|
|
|
return str.rfind(prefix, 0) == 0;
|
|
return str.rfind(prefix, 0) == 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+static bool curl_perform_with_retry(const std::string& url, CURL* curl, int max_attempts, int retry_delay_seconds) {
|
|
|
|
|
+ int remaining_attempts = max_attempts;
|
|
|
|
|
+
|
|
|
|
|
+ while (remaining_attempts > 0) {
|
|
|
|
|
+ fprintf(stderr, "%s: Trying to download from %s (attempt %d of %d)...\n", __func__ , url.c_str(), max_attempts - remaining_attempts + 1, max_attempts);
|
|
|
|
|
+
|
|
|
|
|
+ CURLcode res = curl_easy_perform(curl);
|
|
|
|
|
+ if (res == CURLE_OK) {
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ int exponential_backoff_delay = std::pow(retry_delay_seconds, max_attempts - remaining_attempts) * 1000;
|
|
|
|
|
+ fprintf(stderr, "%s: curl_easy_perform() failed: %s, retrying after %d milliseconds...\n", __func__, curl_easy_strerror(res), exponential_backoff_delay);
|
|
|
|
|
+
|
|
|
|
|
+ remaining_attempts--;
|
|
|
|
|
+ std::this_thread::sleep_for(std::chrono::milliseconds(exponential_backoff_delay));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ fprintf(stderr, "%s: curl_easy_perform() failed after %d attempts\n", __func__, max_attempts);
|
|
|
|
|
+ return false;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
static bool llama_download_file(const std::string & url, const std::string & path, const std::string & hf_token) {
|
|
static bool llama_download_file(const std::string & url, const std::string & path, const std::string & hf_token) {
|
|
|
|
|
|
|
|
// Initialize libcurl
|
|
// Initialize libcurl
|
|
@@ -1049,9 +1075,8 @@ static bool llama_download_file(const std::string & url, const std::string & pat
|
|
|
curl_easy_setopt(curl.get(), CURLOPT_HEADERFUNCTION, static_cast<CURLOPT_HEADERFUNCTION_PTR>(header_callback));
|
|
curl_easy_setopt(curl.get(), CURLOPT_HEADERFUNCTION, static_cast<CURLOPT_HEADERFUNCTION_PTR>(header_callback));
|
|
|
curl_easy_setopt(curl.get(), CURLOPT_HEADERDATA, &headers);
|
|
curl_easy_setopt(curl.get(), CURLOPT_HEADERDATA, &headers);
|
|
|
|
|
|
|
|
- CURLcode res = curl_easy_perform(curl.get());
|
|
|
|
|
- if (res != CURLE_OK) {
|
|
|
|
|
- fprintf(stderr, "%s: curl_easy_perform() failed: %s\n", __func__, curl_easy_strerror(res));
|
|
|
|
|
|
|
+ bool was_perform_successful = curl_perform_with_retry(url, curl.get(), CURL_MAX_RETRY, CURL_RETRY_DELAY_SECONDS);
|
|
|
|
|
+ if (!was_perform_successful) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1126,11 +1151,10 @@ static bool llama_download_file(const std::string & url, const std::string & pat
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
// start the download
|
|
// start the download
|
|
|
- fprintf(stderr, "%s: downloading from %s to %s (server_etag:%s, server_last_modified:%s)...\n", __func__,
|
|
|
|
|
- llama_download_hide_password_in_url(url).c_str(), path.c_str(), headers.etag.c_str(), headers.last_modified.c_str());
|
|
|
|
|
- auto res = curl_easy_perform(curl.get());
|
|
|
|
|
- if (res != CURLE_OK) {
|
|
|
|
|
- fprintf(stderr, "%s: curl_easy_perform() failed: %s\n", __func__, curl_easy_strerror(res));
|
|
|
|
|
|
|
+ fprintf(stderr, "%s: trying to download model from %s to %s (server_etag:%s, server_last_modified:%s)...\n", __func__,
|
|
|
|
|
+ llama_download_hide_password_in_url(url).c_str(), path.c_str(), headers.etag.c_str(), headers.last_modified.c_str());
|
|
|
|
|
+ bool was_perform_successful = curl_perform_with_retry(url, curl.get(), CURL_MAX_RETRY, CURL_RETRY_DELAY_SECONDS);
|
|
|
|
|
+ if (!was_perform_successful) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|