vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-09 16:44:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit '34b7c0439e' into concedo_experimental

Browse source 
# Conflicts:
#	ggml/CMakeLists.txt
#	ggml/src/ggml-cpu/CMakeLists.txt
#	ggml/src/ggml-sycl/element_wise.cpp
#	ggml/src/ggml-sycl/element_wise.hpp
#	ggml/src/ggml-sycl/ggml-sycl.cpp
#	scripts/sync-ggml.last
#	src/CMakeLists.txt
#	tools/mtmd/clip.cpp
This commit is contained in:
Concedo 2025-05-31 12:27:45 +08:00
commit 0c108f6054
19 changed files with 1641 additions and 791 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gpttype_adapter.cpp
View file

@ -2412,10 +2412,11 @@ 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_init(mmproj_filename.c_str(), clip_context_params{
clip_init_result cres = clip_init(mmproj_filename.c_str(), clip_context_params{
/* use_gpu */ true,
/* verbosity */ static_cast<ggml_log_level>(1),
});
clp_ctx = cres.ctx_v;
if(clp_ctx == nullptr) {
fprintf(stderr, "%s: error: failed to load mmproj model!\n", __func__);
return ModelLoadResult::FAIL;