Lumpiasty/llama.cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arg: prevent duplicate spec model downloads (#25527)

Browse Source
This commit is contained in:
Xuan-Son Nguyen
2026-07-10 16:53:26 +02:00
committed by GitHub
parent 3e706dd55f
commit 22b69b6e92
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/arg.cpp
+17 -11
View File
@@ -488,12 +488,15 @@ void common_models_handler_apply(common_models_handler & handler, common_params
task.opts = opts; task.opts = opts;
tasks.push_back(task); tasks.push_back(task);
} }
bool had_spec_url = false;
if (!params.speculative.draft.mparams.url.empty()) { if (!params.speculative.draft.mparams.url.empty()) {
common_download_task task; common_download_task task;
task.url = params.speculative.draft.mparams.url; task.url = params.speculative.draft.mparams.url;
task.local_path = params.speculative.draft.mparams.path; task.local_path = params.speculative.draft.mparams.path;
task.opts = opts; task.opts = opts;
tasks.push_back(task); tasks.push_back(task);
had_spec_url = true;
} }
// handle hf_plan tasks // handle hf_plan tasks
@@ -513,6 +516,18 @@ void common_models_handler_apply(common_models_handler & handler, common_params
}); });
} }
}; };
// handle plan_spec (e.g. --spec-draft-hf)
if (!plan_spec.model_files.empty() && !had_spec_url) {
add_tasks(plan_spec.model_files, plan_spec.primary, params.speculative.draft.mparams);
had_spec_url = true;
}
// handle vocoder plan (e.g. --hf-repo-v)
if (!plan_voc.model_files.empty()) {
add_tasks(plan_voc.model_files, plan_voc.primary, params.vocoder.model);
}
if (!plan.model_files.empty()) { if (!plan.model_files.empty()) {
add_tasks(plan.model_files, plan.primary, params.model); add_tasks(plan.model_files, plan.primary, params.model);
} }
@@ -521,7 +536,7 @@ void common_models_handler_apply(common_models_handler & handler, common_params
params.mmproj.path = hf_cache::finalize_file(plan.mmproj); params.mmproj.path = hf_cache::finalize_file(plan.mmproj);
}); });
} }
if (!plan.mtp.local_path.empty()) { if (!plan.mtp.local_path.empty() && !had_spec_url) {
tasks.emplace_back(plan.mtp, opts, [&]() { tasks.emplace_back(plan.mtp, opts, [&]() {
// only fall back to the discovered MTP head when no draft was explicitly provided // only fall back to the discovered MTP head when no draft was explicitly provided
if (params.speculative.draft.mparams.empty()) { if (params.speculative.draft.mparams.empty()) {
@@ -540,16 +555,6 @@ void common_models_handler_apply(common_models_handler & handler, common_params
}); });
} }
// handle plan_spec (e.g. --spec-draft-hf)
if (!plan_spec.model_files.empty()) {
add_tasks(plan_spec.model_files, plan_spec.primary, params.speculative.draft.mparams);
}
// handle vocoder plan (e.g. --hf-repo-v)
if (!plan_voc.model_files.empty()) {
add_tasks(plan_voc.model_files, plan_voc.primary, params.vocoder.model);
}
// run all tasks in parallel // run all tasks in parallel
if (!params.offline) { if (!params.offline) {
// if duplicated files are found, only download once (but still call on_done for each task) // if duplicated files are found, only download once (but still call on_done for each task)
@@ -562,6 +567,7 @@ void common_models_handler_apply(common_models_handler & handler, common_params
} }
std::vector<common_download_task> unique_tasks_vec; std::vector<common_download_task> unique_tasks_vec;
for (auto & pair : unique_tasks) { for (auto & pair : unique_tasks) {
LOG_DBG("download task: %s -> %s\n", pair.second->url.c_str(), pair.second->local_path.c_str());
unique_tasks_vec.push_back(*pair.second); unique_tasks_vec.push_back(*pair.second);
} }
common_download_run_tasks(unique_tasks_vec); common_download_run_tasks(unique_tasks_vec);