Merge commit '71bdbdb587' into concedo_experimental

# Conflicts:
#	ggml/src/ggml-cpu/CMakeLists.txt
#	tools/batched-bench/batched-bench.cpp
#	tools/mtmd/clip.h
This commit is contained in:
Concedo 2025-05-16 15:25:15 +08:00
commit 6cafc0e73e
9 changed files with 61 additions and 744 deletions

View file

@ -2391,7 +2391,10 @@ ModelLoadResult gpttype_load_model(const load_model_inputs inputs, FileFormat in
set_clip_uses_gpu(false);
printf("Clip forced to use CPU!\n");
}
clp_ctx = clip_model_load(mmproj_filename.c_str(), /*verbosity=*/ 1);
clp_ctx = clip_init(mmproj_filename.c_str(), clip_context_params{
/* use_gpu */ true,
/* verbosity */ static_cast<ggml_log_level>(1),
});
if(clp_ctx == nullptr) {
fprintf(stderr, "%s: error: failed to load mmproj model!\n", __func__);
return ModelLoadResult::FAIL;