CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-10-31 08:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat hf.co/ prefix the same as hf:// (#11350)

Browse Source 
ollama uses hf.co/ to specify huggingface prefix, like RamaLama
uses hf://

Treat them similarly.

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
This commit is contained in:
Eric Curtin
2025-01-23 10:38:20 +00:00
committed by GitHub
parent 955a6c2d91
commit f211d1dc10
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/run/run.cpp
View File

@@ -634,20 +634,20 @@ class LlamaData {
return path.substr(pos + 1); return path.substr(pos + 1);
} }
int remove_proto(std::string & model_) { int rm_until_substring(std::string & model_, const std::string & substring) {
const std::string::size_type pos = model_.find("://"); const std::string::size_type pos = model_.find(substring);
if (pos == std::string::npos) { if (pos == std::string::npos) {
return 1; return 1;
} }
model_ = model_.substr(pos + 3); // Skip past "://" model_ = model_.substr(pos + substring.size()); // Skip past the substring
return 0; return 0;
} }
int resolve_model(std::string & model_) { int resolve_model(std::string & model_) {
int ret = 0; int ret = 0;
if (string_starts_with(model_, "file://") || std::filesystem::exists(model_)) { if (string_starts_with(model_, "file://") || std::filesystem::exists(model_)) {
remove_proto(model_); rm_until_substring(model_, "://");
return ret; return ret;
} }
@@ -656,13 +656,16 @@ class LlamaData {
const std::vector<std::string> headers = { "--header", const std::vector<std::string> headers = { "--header",
"Accept: application/vnd.docker.distribution.manifest.v2+json" }; "Accept: application/vnd.docker.distribution.manifest.v2+json" };
if (string_starts_with(model_, "hf://") || string_starts_with(model_, "huggingface://")) { if (string_starts_with(model_, "hf://") || string_starts_with(model_, "huggingface://")) {
remove_proto(model_); rm_until_substring(model_, "://");
ret = huggingface_dl(model_, headers, bn);
} else if (string_starts_with(model_, "hf.co/")) {
rm_until_substring(model_, "hf.co/");
ret = huggingface_dl(model_, headers, bn); ret = huggingface_dl(model_, headers, bn);
} else if (string_starts_with(model_, "ollama://")) { } else if (string_starts_with(model_, "ollama://")) {
remove_proto(model_); rm_until_substring(model_, "://");
ret = ollama_dl(model_, headers, bn); ret = ollama_dl(model_, headers, bn);
} else if (string_starts_with(model_, "https://")) { } else if (string_starts_with(model_, "https://")) {
download(model_, headers, bn, true); ret = download(model_, headers, bn, true);
} else { } else {
ret = ollama_dl(model_, headers, bn); ret = ollama_dl(model_, headers, bn);
} }