Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	.github/workflows/build.yml
#	ggml/CMakeLists.txt
#	ggml/cmake/ggml-config.cmake.in
#	ggml/src/CMakeLists.txt
#	models/templates/README.md
#	tools/imatrix/imatrix.cpp
This commit is contained in:
Concedo 2025-08-05 19:24:29 +08:00
commit 7590a0ea39
22 changed files with 1122 additions and 421 deletions

View file

@ -10547,7 +10547,6 @@ Current version indicated by LITEVER below.
}
function update_oai_model_list(data, dropdown)
{
let isOpenrouter = (document.getElementById("customapidropdown").value==3);
var lastOption = dropdown.lastElementChild;
for (var i = dropdown.options.length - 1; i >= 0; i--) {
var option = dropdown.options[i];
@ -10565,7 +10564,7 @@ Current version indicated by LITEVER below.
var el = document.createElement("option");
el.textContent = sortedarr[i];
el.value = sortedarr[i];
if(isOpenrouter && sortedarr[i]=="mistralai/mistral-7b-instruct")
if(localsettings.prev_custom_endpoint_model && sortedarr[i]==localsettings.prev_custom_endpoint_model)
{
selidx = i;
}